cleanup names

f0ssel · f0ssel · commit 347c83441f45 · 2022-09-29T18:40:32.000Z
diff --git a/enterprise/cli/features_test.go b/enterprise/cli/features_test.go
@@ -65,6 +65,8 @@ func TestFeaturesList(t *testing.T) {
 			entitlements.Features[codersdk.FeatureAuditLog].Entitlement)
 		assert.Equal(t, codersdk.EntitlementNotEntitled,
 			entitlements.Features[codersdk.FeatureBrowserOnly].Entitlement)
+		assert.Equal(t, codersdk.EntitlementNotEntitled,
+			entitlements.Features[codersdk.FeatureWorkspaceQuota].Entitlement)
 		assert.False(t, entitlements.HasLicense)
 	})
 }
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -15,17 +15,17 @@ import (
 
 func server() *cobra.Command {
 	var (
-		auditLogging   bool
-		browserOnly    bool
-		scimAuthHeader string
-		workspaceQuota int
+		auditLogging       bool
+		browserOnly        bool
+		scimAuthHeader     string
+		userWorkspaceQuota int
 	)
 	cmd := agpl.Server(func(ctx context.Context, options *agplcoderd.Options) (*agplcoderd.API, error) {
 		api, err := coderd.New(ctx, &coderd.Options{
 			AuditLogging:   auditLogging,
 			BrowserOnly:    browserOnly,
 			SCIMAPIKey:     []byte(scimAuthHeader),
-			WorkspaceQuota: workspaceQuota,
+			WorkspaceQuota: userWorkspaceQuota,
 			Options:        options,
 		})
 		if err != nil {
@@ -41,8 +41,8 @@ func server() *cobra.Command {
 		"Whether Coder only allows connections to workspaces via the browser. "+enterpriseOnly)
 	cliflag.StringVarP(cmd.Flags(), &scimAuthHeader, "scim-auth-header", "", "CODER_SCIM_API_KEY", "",
 		"Enables SCIM and sets the authentication header for the built-in SCIM server. New users are automatically created with OIDC authentication. "+enterpriseOnly)
-	cliflag.IntVarP(cmd.Flags(), &workspaceQuota, "workspace-quota", "", "CODER_WORKSPACE_QUOTA", 0,
-		"Whether Coder applies a limit on how many workspaces each user can create. "+enterpriseOnly)
+	cliflag.IntVarP(cmd.Flags(), &userWorkspaceQuota, "user-workspace-quota", "", "CODER_USER_WORKSPACE_QUOTA", 0,
+		"A positive number applies a limit on how many workspaces each user can create. "+enterpriseOnly)
 
 	return cmd
 }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ func TestFeaturesList(t *testing.T) {`
`65`	`65`	`entitlements.Features[codersdk.FeatureAuditLog].Entitlement)`
`66`	`66`	`assert.Equal(t, codersdk.EntitlementNotEntitled,`
`67`	`67`	`entitlements.Features[codersdk.FeatureBrowserOnly].Entitlement)`
	`68`	`+ assert.Equal(t, codersdk.EntitlementNotEntitled,`
	`69`	`+ entitlements.Features[codersdk.FeatureWorkspaceQuota].Entitlement)`
`68`	`70`	`assert.False(t, entitlements.HasLicense)`
`69`	`71`	`})`
`70`	`72`	`}`