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/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,
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,
})
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy