@@ -242,22 +242,27 @@ func (api *API) updateEntitlements(ctx context.Context) error {
242
242
api .entitlementsMu .Lock ()
243
243
defer api .entitlementsMu .Unlock ()
244
244
245
- entitlements , err := license .Entitlements (ctx , api .Database , api .Logger , len (api .replicaManager .All ()), len (api .GitAuthConfigs ), api .Keys , map [codersdk.FeatureName ]bool {
246
- codersdk .FeatureAuditLog : api .AuditLogging ,
247
- codersdk .FeatureBrowserOnly : api .BrowserOnly ,
248
- codersdk .FeatureSCIM : len (api .SCIMAPIKey ) != 0 ,
249
- codersdk .FeatureHighAvailability : api .DERPServerRelayAddress != "" ,
250
- codersdk .FeatureMultipleGitAuth : len (api .GitAuthConfigs ) > 1 ,
251
- codersdk .FeatureTemplateRBAC : api .RBAC ,
252
- codersdk .FeatureExternalProvisionerDaemons : true ,
253
- })
245
+ entitlements , err := license .Entitlements (
246
+ ctx , api .Database ,
247
+ api .Logger , len (api .replicaManager .All ()), len (api .GitAuthConfigs ), api .Keys , map [codersdk.FeatureName ]bool {
248
+ codersdk .FeatureAuditLog : api .AuditLogging ,
249
+ codersdk .FeatureBrowserOnly : api .BrowserOnly ,
250
+ codersdk .FeatureSCIM : len (api .SCIMAPIKey ) != 0 ,
251
+ codersdk .FeatureHighAvailability : api .DERPServerRelayAddress != "" ,
252
+ codersdk .FeatureMultipleGitAuth : len (api .GitAuthConfigs ) > 1 ,
253
+ codersdk .FeatureTemplateRBAC : api .RBAC ,
254
+ codersdk .FeatureExternalProvisionerDaemons : true ,
255
+ })
254
256
if err != nil {
255
257
return err
256
258
}
257
259
258
260
if entitlements .RequireTelemetry && ! api .DeploymentConfig .Telemetry .Enable .Value {
259
261
// We can't fail because then the user couldn't remove the offending
260
262
// license w/o a restart.
263
+ //
264
+ // We don't simply append to entitlement.Errors since we don't want any
265
+ // enterprise features enabled.
261
266
api .entitlements .Errors = []string {
262
267
"License requires telemetry but telemetry is disabled" ,
263
268
}
0 commit comments