Content-Length: 3545 | pFad | http://github.com/coder/coder/pull/19026.patch

thub.com From 470b402f1144798a4003a20d75c20993c4ec5652 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Thu, 24 Jul 2025 04:54:00 +0000 Subject: [PATCH 1/2] chore: fix TestManagedAgentLimit flake --- enterprise/coderd/coderd.go | 4 ++-- enterprise/coderd/license/license.go | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index 16ab9c77c7653..9583e14cd7fd3 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -830,7 +830,7 @@ func (api *API) updateEntitlements(ctx context.Context) error { } api.derpMesh.SetAddresses(addresses, false) } - _ = api.updateEntitlements(ctx) + _ = api.updateEntitlements(api.ctx) }) } else { coordinator = agpltailnet.NewCoordinator(api.Logger) @@ -840,7 +840,7 @@ func (api *API) updateEntitlements(ctx context.Context) error { api.replicaManager.SetCallback(func() { // If the amount of replicas change, so should our entitlements. // This is to display a warning in the UI if the user is unlicensed. - _ = api.updateEntitlements(ctx) + _ = api.updateEntitlements(api.ctx) }) } diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go index 6b31daa72a3f8..5ce5b76c5487c 100644 --- a/enterprise/coderd/license/license.go +++ b/enterprise/coderd/license/license.go @@ -432,7 +432,11 @@ func LicensesEntitlements( if featureArguments.ManagedAgentCountFn != nil { managedAgentCount, err = featureArguments.ManagedAgentCountFn(ctx, agentLimit.UsagePeriod.Start, agentLimit.UsagePeriod.End) } - if err != nil { + if xerrors.Is(err, context.Canceled) || xerrors.Is(err, context.DeadlineExceeded) { + // If the context is canceled, we want to bail the entire + // LicensesEntitlements call. + return entitlements, xerrors.Errorf("get managed agent count: %w", err) + } else if err != nil { entitlements.Errors = append(entitlements.Errors, fmt.Sprintf("Error getting managed agent count: %s", err.Error())) } else { From 23951e949728b81969cf66e4fb50a850fe1eeb95 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Thu, 24 Jul 2025 05:03:49 +0000 Subject: [PATCH 2/2] lint --- enterprise/coderd/license/license.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go index 5ce5b76c5487c..bc5c174d9fc3a 100644 --- a/enterprise/coderd/license/license.go +++ b/enterprise/coderd/license/license.go @@ -432,14 +432,15 @@ func LicensesEntitlements( if featureArguments.ManagedAgentCountFn != nil { managedAgentCount, err = featureArguments.ManagedAgentCountFn(ctx, agentLimit.UsagePeriod.Start, agentLimit.UsagePeriod.End) } - if xerrors.Is(err, context.Canceled) || xerrors.Is(err, context.DeadlineExceeded) { + switch { + case xerrors.Is(err, context.Canceled) || xerrors.Is(err, context.DeadlineExceeded): // If the context is canceled, we want to bail the entire // LicensesEntitlements call. return entitlements, xerrors.Errorf("get managed agent count: %w", err) - } else if err != nil { + case err != nil: entitlements.Errors = append(entitlements.Errors, fmt.Sprintf("Error getting managed agent count: %s", err.Error())) - } else { + default: agentLimit.Actual = &managedAgentCount entitlements.AddFeature(codersdk.FeatureManagedAgentLimit, agentLimit)

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!