Commitfa715a9

committed

remove HasLicense field from Options and implement HasLicense method in Entitlements

1 parent1e0f0e5 commitfa715a9Copy full SHA for fa715a9

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,6 @@ type Options struct {`
`180`	`180`	`// Entitlements can come from the enterprise caller if enterprise code is`
`181`	`181`	`// included.`
`182`	`182`	`Entitlements*entitlements.Set`
`183`		`-// HasLicense indicates if a license is installed.`
`184`		`-HasLicensebool`
`185`	`183`	`// PostAuthAdditionalHeadersFunc is used to add additional headers to the response`
`186`	`184`	`// after a successful authentication.`
`187`	`185`	`// This is somewhat janky, but seemingly the only reasonable way to add a header`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,3 +161,9 @@ func (l *Set) Errors() []string {`
`161`	`161`	`deferl.entitlementsMu.RUnlock()`
`162`	`162`	`returnslices.Clone(l.entitlements.Errors)`
`163`	`163`	`}`
	`164`	`+`
	`165`	`+func (l*Set)HasLicense()bool {`
	`166`	`+l.entitlementsMu.RLock()`
	`167`	`+deferl.entitlementsMu.RUnlock()`
	`168`	`+returnl.entitlements.HasLicense`
	`169`	`+}`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -739,8 +739,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`739`	`739`	`return codersdk.Entitlements{},err`
`740`	`740`	`}`
`741`	`741`
`742`		`-api.HasLicense=reloadedEntitlements.HasLicense`
`743`		`-`
`744`	`742`	`ifreloadedEntitlements.RequireTelemetry&&!api.DeploymentValues.Telemetry.Enable.Value() {`
`745`	`743`	`api.Logger.Error(ctx,"license requires telemetry enabled")`
`746`	`744`	`return codersdk.Entitlements{},entitlements.ErrLicenseRequiresTelemetry`
`@@ -965,7 +963,7 @@ func (api *API) CheckBuildUsage(ctx context.Context, store database.Store, templ`
`965`	`963`	`// When unlicensed, we need to check that we haven't breached the managed agent`
`966`	`964`	`// limit.`
`967`	`965`	`// Unlicensed deployments are allowed to use unlimited managed agents.`
`968`		`-ifapi.HasLicense {`
	`966`	`+ifapi.Entitlements.HasLicense() {`
`969`	`967`	`managedAgentLimit,ok:=api.Entitlements.Feature(codersdk.FeatureManagedAgentLimit)`
`970`	`968`	`if!ok\|\|!managedAgentLimit.Enabled\|\|managedAgentLimit.Limit==nil\|\|managedAgentLimit.UsagePeriod==nil {`
`971`	`969`	`return wsbuilder.UsageCheckResponse{`

Comments

(0)