opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(enterprise): avoid initial license reconfig if feature isn't enabled (#8586)

Browse Source
This commit is contained in:
Colin Adler
2023-07-19 10:32:29 -05:00
committed by GitHub
parent 0965a2de70
commit cc8d0af027
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/coderd/coderd.go
+17 -13
View File
@@ -395,19 +395,24 @@ func (api *API) updateEntitlements(ctx context.Context) error {
return nil return nil
} }
featureChanged := func(featureName codersdk.FeatureName) (changed bool, enabled bool) { featureChanged := func(featureName codersdk.FeatureName) (initial, changed, enabled bool) {
if api.entitlements.Features == nil { if api.entitlements.Features == nil {
return true, entitlements.Features[featureName].Enabled return true, false, entitlements.Features[featureName].Enabled
} }
oldFeature := api.entitlements.Features[featureName] oldFeature := api.entitlements.Features[featureName]
newFeature := entitlements.Features[featureName] newFeature := entitlements.Features[featureName]
if oldFeature.Enabled != newFeature.Enabled { if oldFeature.Enabled != newFeature.Enabled {
return true, newFeature.Enabled return false, true, newFeature.Enabled
} }
return false, newFeature.Enabled return false, false, newFeature.Enabled
} }
if changed, enabled := featureChanged(codersdk.FeatureAuditLog); changed { shouldUpdate := func(initial, changed, enabled bool) bool {
// Avoid an initial tick on startup unless the feature is enabled.
return changed || (initial && enabled)
}
if initial, changed, enabled := featureChanged(codersdk.FeatureAuditLog); shouldUpdate(initial, changed, enabled) {
auditor := agplaudit.NewNop() auditor := agplaudit.NewNop()
if enabled { if enabled {
auditor = api.AGPL.Options.Auditor auditor = api.AGPL.Options.Auditor
@@ -415,7 +420,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
api.AGPL.Auditor.Store(&auditor) api.AGPL.Auditor.Store(&auditor)
} }
if changed, enabled := featureChanged(codersdk.FeatureBrowserOnly); changed { if initial, changed, enabled := featureChanged(codersdk.FeatureBrowserOnly); shouldUpdate(initial, changed, enabled) {
var handler func(rw http.ResponseWriter) bool var handler func(rw http.ResponseWriter) bool
if enabled { if enabled {
handler = api.shouldBlockNonBrowserConnections handler = api.shouldBlockNonBrowserConnections
@@ -423,7 +428,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
api.AGPL.WorkspaceClientCoordinateOverride.Store(&handler) api.AGPL.WorkspaceClientCoordinateOverride.Store(&handler)
} }
if changed, enabled := featureChanged(codersdk.FeatureTemplateRBAC); changed { if initial, changed, enabled := featureChanged(codersdk.FeatureTemplateRBAC); shouldUpdate(initial, changed, enabled) {
if enabled { if enabled {
committer := committer{Database: api.Database} committer := committer{Database: api.Database}
ptr := proto.QuotaCommitter(&committer) ptr := proto.QuotaCommitter(&committer)
@@ -433,7 +438,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
} }
} }
if changed, enabled := featureChanged(codersdk.FeatureAdvancedTemplateScheduling); changed { if initial, changed, enabled := featureChanged(codersdk.FeatureAdvancedTemplateScheduling); shouldUpdate(initial, changed, enabled) {
if enabled { if enabled {
store := &EnterpriseTemplateScheduleStore{} store := &EnterpriseTemplateScheduleStore{}
ptr := schedule.TemplateScheduleStore(store) ptr := schedule.TemplateScheduleStore(store)
@@ -444,8 +449,8 @@ func (api *API) updateEntitlements(ctx context.Context) error {
} }
} }
if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed { if initial, changed, enabled := featureChanged(codersdk.FeatureHighAvailability); shouldUpdate(initial, changed, enabled) {
coordinator := agpltailnet.NewCoordinator(api.Logger) var coordinator agpltailnet.Coordinator
if enabled { if enabled {
var haCoordinator agpltailnet.Coordinator var haCoordinator agpltailnet.Coordinator
if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetHACoordinator) { if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetHACoordinator) {
@@ -457,9 +462,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err)) api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))
// If we try to setup the HA coordinator and it fails, nothing // If we try to setup the HA coordinator and it fails, nothing
// is actually changing. // is actually changing.
changed = false
} else { } else {
_ = coordinator.Close()
coordinator = haCoordinator coordinator = haCoordinator
} }
@@ -472,6 +475,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
_ = api.updateEntitlements(ctx) _ = api.updateEntitlements(ctx)
}) })
} else { } else {
coordinator = agpltailnet.NewCoordinator(api.Logger)
api.derpMesh.SetAddresses([]string{}, false) api.derpMesh.SetAddresses([]string{}, false)
api.replicaManager.SetCallback(func() { api.replicaManager.SetCallback(func() {
// If the amount of replicas change, so should our entitlements. // If the amount of replicas change, so should our entitlements.
@@ -481,7 +485,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
} }
// Recheck changed in case the HA coordinator failed to set up. // Recheck changed in case the HA coordinator failed to set up.
if changed { if coordinator != nil {
oldCoordinator := *api.AGPL.TailnetCoordinator.Swap(&coordinator) oldCoordinator := *api.AGPL.TailnetCoordinator.Swap(&coordinator)
err := oldCoordinator.Close() err := oldCoordinator.Close()
if err != nil { if err != nil {