From 5e4931efaf10488e2d9b1e2f91d62bd527a7baa3 Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Tue, 14 Feb 2023 19:40:08 -0600 Subject: [PATCH] chore: add comment that explains require_telemetry behavior (#6211) --- enterprise/coderd/coderd.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index 3d9d7a9b57..e6558a685b 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -242,15 +242,17 @@ func (api *API) updateEntitlements(ctx context.Context) error { api.entitlementsMu.Lock() defer api.entitlementsMu.Unlock() - entitlements, err := license.Entitlements(ctx, api.Database, api.Logger, len(api.replicaManager.All()), len(api.GitAuthConfigs), api.Keys, map[codersdk.FeatureName]bool{ - codersdk.FeatureAuditLog: api.AuditLogging, - codersdk.FeatureBrowserOnly: api.BrowserOnly, - codersdk.FeatureSCIM: len(api.SCIMAPIKey) != 0, - codersdk.FeatureHighAvailability: api.DERPServerRelayAddress != "", - codersdk.FeatureMultipleGitAuth: len(api.GitAuthConfigs) > 1, - codersdk.FeatureTemplateRBAC: api.RBAC, - codersdk.FeatureExternalProvisionerDaemons: true, - }) + entitlements, err := license.Entitlements( + ctx, api.Database, + api.Logger, len(api.replicaManager.All()), len(api.GitAuthConfigs), api.Keys, map[codersdk.FeatureName]bool{ + codersdk.FeatureAuditLog: api.AuditLogging, + codersdk.FeatureBrowserOnly: api.BrowserOnly, + codersdk.FeatureSCIM: len(api.SCIMAPIKey) != 0, + codersdk.FeatureHighAvailability: api.DERPServerRelayAddress != "", + codersdk.FeatureMultipleGitAuth: len(api.GitAuthConfigs) > 1, + codersdk.FeatureTemplateRBAC: api.RBAC, + codersdk.FeatureExternalProvisionerDaemons: true, + }) if err != nil { return err } @@ -258,6 +260,9 @@ func (api *API) updateEntitlements(ctx context.Context) error { if entitlements.RequireTelemetry && !api.DeploymentConfig.Telemetry.Enable.Value { // We can't fail because then the user couldn't remove the offending // license w/o a restart. + // + // We don't simply append to entitlement.Errors since we don't want any + // enterprise features enabled. api.entitlements.Errors = []string{ "License requires telemetry but telemetry is disabled", }