Content-Length: 5007 | pFad | http://github.com/coder/coder/pull/18985.patch

thub.com From 16b2fa2155fd09a733bb1980c7cc81c4ec69a481 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Tue, 22 Jul 2025 05:41:32 +0000 Subject: [PATCH 1/2] fix: use system context for managed agent count query --- enterprise/coderd/coderd.go | 3 ++- enterprise/coderd/license/license.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index d6e47f4cfdf00..16ab9c77c7653 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -961,7 +961,8 @@ func (api *API) CheckBuildUsage(ctx context.Context, store database.Store, templ // This check is intentionally not committed to the database. It's fine if // it's not 100% accurate or allows for minor breaches due to build races. - managedAgentCount, err := store.GetManagedAgentCount(ctx, database.GetManagedAgentCountParams{ + // nolint:gocritic // Requires permission to read all workspaces to read managed agent count. + managedAgentCount, err := store.GetManagedAgentCount(agpldbauthz.AsSystemRestricted(ctx), database.GetManagedAgentCountParams{ StartTime: managedAgentLimit.UsagePeriod.Start, EndTime: managedAgentLimit.UsagePeriod.End, }) diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go index 7776557522f86..6b31daa72a3f8 100644 --- a/enterprise/coderd/license/license.go +++ b/enterprise/coderd/license/license.go @@ -99,7 +99,8 @@ func Entitlements( ReplicaCount: replicaCount, ExternalAuthCount: externalAuthCount, ManagedAgentCountFn: func(ctx context.Context, startTime time.Time, endTime time.Time) (int64, error) { - return db.GetManagedAgentCount(ctx, database.GetManagedAgentCountParams{ + // nolint:gocritic // Requires permission to read all workspaces to read managed agent count. + return db.GetManagedAgentCount(dbauthz.AsSystemRestricted(ctx), database.GetManagedAgentCountParams{ StartTime: startTime, EndTime: endTime, }) From ef5111e07102e52032ee3284cdfa6c2b95f4a990 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Tue, 22 Jul 2025 05:56:02 +0000 Subject: [PATCH 2/2] add test --- enterprise/coderd/coderd_test.go | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go index 42645a98b06c2..94d9e4fda20df 100644 --- a/enterprise/coderd/coderd_test.go +++ b/enterprise/coderd/coderd_test.go @@ -626,13 +626,38 @@ func TestSCIMDisabled(t *testing.T) { func TestManagedAgentLimit(t *testing.T) { t.Parallel() + ctx := testutil.Context(t, testutil.WaitLong) + cli, _ := coderdenttest.New(t, &coderdenttest.Options{ Options: &coderdtest.Options{ IncludeProvisionerDaemon: true, }, - LicenseOptions: (&coderdenttest.LicenseOptions{}).ManagedAgentLimit(1, 1), + LicenseOptions: (&coderdenttest.LicenseOptions{ + FeatureSet: codersdk.FeatureSetPremium, + // Make it expire in the distant future so it doesn't generate + // expiry warnings. + GraceAt: time.Now().Add(time.Hour * 24 * 60), + ExpiresAt: time.Now().Add(time.Hour * 24 * 90), + }).ManagedAgentLimit(1, 1), }) + // Get entitlements to check that the license is a-ok. + entitlements, err := cli.Entitlements(ctx) //nolint:gocritic // we're not testing authz on the entitlements endpoint, so using owner is fine + require.NoError(t, err) + require.True(t, entitlements.HasLicense) + agentLimit := entitlements.Features[codersdk.FeatureManagedAgentLimit] + require.True(t, agentLimit.Enabled) + require.NotNil(t, agentLimit.Limit) + require.EqualValues(t, 1, *agentLimit.Limit) + require.NotNil(t, agentLimit.SoftLimit) + require.EqualValues(t, 1, *agentLimit.SoftLimit) + require.Empty(t, entitlements.Errors) + // There should be a warning since we're really close to our agent limit. + require.Equal(t, entitlements.Warnings[0], "You are approaching the managed agent limit in your license. Please refer to the Deployment Licenses page for more information.") + + // Create a fake provision response that claims there are agents in the + // template and every built workspace. + // // It's fine that the app ID is only used in a single successful workspace // build. appID := uuid.NewString() @@ -693,7 +718,7 @@ func TestManagedAgentLimit(t *testing.T) { // Create a second AI workspace, which should fail. This needs to be done // manually because coderdtest.CreateWorkspace expects it to succeed. - _, err := cli.CreateUserWorkspace(context.Background(), codersdk.Me, codersdk.CreateWorkspaceRequest{ //nolint:gocritic // owners must still be subject to the limit + _, err = cli.CreateUserWorkspace(ctx, codersdk.Me, codersdk.CreateWorkspaceRequest{ //nolint:gocritic // owners must still be subject to the limit TemplateID: aiTemplate.ID, Name: coderdtest.RandomUsername(t), AutomaticUpdates: codersdk.AutomaticUpdatesNever,

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