options

f0ssel · f0ssel · commit 76db33918536 · 2022-09-29T18:40:32.000Z
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -21,12 +21,14 @@ func server() *cobra.Command {
 		userWorkspaceQuota int
 	)
 	cmd := agpl.Server(func(ctx context.Context, options *agplcoderd.Options) (*agplcoderd.API, error) {
+		coderd.NewEnforcer(userWorkspaceQuota)
+
 		api, err := coderd.New(ctx, &coderd.Options{
-			AuditLogging:   auditLogging,
-			BrowserOnly:    browserOnly,
-			SCIMAPIKey:     []byte(scimAuthHeader),
-			WorkspaceQuota: userWorkspaceQuota,
-			Options:        options,
+			AuditLogging:       auditLogging,
+			BrowserOnly:        browserOnly,
+			SCIMAPIKey:         []byte(scimAuthHeader),
+			UserWorkspaceQuota: userWorkspaceQuota,
+			Options:            options,
 		})
 		if err != nil {
 			return nil, err
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -15,10 +15,8 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/coderd"
-	agplaudit "github.com/coder/coder/coderd/audit"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
-	"github.com/coder/coder/coderd/workspacequota"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/audit"
 	"github.com/coder/coder/enterprise/audit/backends"
@@ -98,9 +96,9 @@ type Options struct {
 
 	AuditLogging bool
 	// Whether to block non-browser connections.
-	BrowserOnly    bool
-	SCIMAPIKey     []byte
-	WorkspaceQuota int
+	BrowserOnly        bool
+	SCIMAPIKey         []byte
+	UserWorkspaceQuota int
 
 	EntitlementsUpdateInterval time.Duration
 	Keys                       map[string]ed25519.PublicKey
@@ -193,17 +191,16 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 	}
 
 	if entitlements.auditLogs != api.entitlements.auditLogs {
-		auditor := agplaudit.NewNop()
 		// A flag could be added to the options that would allow disabling
 		// enhanced audit logging here!
 		if entitlements.auditLogs != codersdk.EntitlementNotEntitled && api.AuditLogging {
-			auditor = audit.NewAuditor(
+			auditor := audit.NewAuditor(
 				audit.DefaultFilter,
 				backends.NewPostgres(api.Database, true),
 				backends.NewSlog(api.Logger),
 			)
+			api.AGPL.Auditor.Store(&auditor)
 		}
-		api.AGPL.Auditor.Store(&auditor)
 	}
 
 	if entitlements.browserOnly != api.entitlements.browserOnly {
@@ -215,11 +212,10 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 	}
 
 	if entitlements.workspaceQuota != api.entitlements.workspaceQuota {
-		var enforcer workspacequota.Enforcer
-		if entitlements.workspaceQuota != codersdk.EntitlementNotEntitled && api.WorkspaceQuota > 0 {
-			enforcer = NewEnforcer(api.WorkspaceQuota)
+		if entitlements.workspaceQuota != codersdk.EntitlementNotEntitled && api.Options.UserWorkspaceQuota > 0 {
+			enforcer := NewEnforcer(api.Options.UserWorkspaceQuota)
+			api.AGPL.WorkspaceQuotaEnforcer.Store(&enforcer)
 		}
-		api.AGPL.WorkspaceQuotaEnforcer.Store(&enforcer)
 	}
 
 	api.entitlements = entitlements
@@ -279,9 +275,9 @@ func (api *API) serveEntitlements(rw http.ResponseWriter, r *http.Request) {
 
 	resp.Features[codersdk.FeatureWorkspaceQuota] = codersdk.Feature{
 		Entitlement: entitlements.workspaceQuota,
-		Enabled:     api.WorkspaceQuota > 0,
+		Enabled:     api.UserWorkspaceQuota > 0,
 	}
-	if entitlements.workspaceQuota == codersdk.EntitlementGracePeriod && api.WorkspaceQuota > 0 {
+	if entitlements.workspaceQuota == codersdk.EntitlementGracePeriod && api.UserWorkspaceQuota > 0 {
 		resp.Warnings = append(resp.Warnings,
 			"Workspace quotas are enabled but your license for this feature is expired.")
 	}
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -39,6 +39,7 @@ type Options struct {
 	BrowserOnly                bool
 	EntitlementsUpdateInterval time.Duration
 	SCIMAPIKey                 []byte
+	UserWorkspaceQuota         int
 }
 
 // New constructs a codersdk client connected to an in-memory Enterprise API instance.
@@ -59,6 +60,7 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 		AuditLogging:               true,
 		BrowserOnly:                options.BrowserOnly,
 		SCIMAPIKey:                 options.SCIMAPIKey,
+		UserWorkspaceQuota:         options.UserWorkspaceQuota,
 		Options:                    oop,
 		EntitlementsUpdateInterval: options.EntitlementsUpdateInterval,
 		Keys: map[string]ed25519.PublicKey{
