coder
diff --git a/‎coderd/audit/audit.go
Lines changed: 15 additions & 0 deletions b/‎coderd/audit/audit.go
Lines changed: 15 additions & 0 deletions
diff --git a/‎coderd/coderd.go
Lines changed: 1 addition & 1 deletion b/‎coderd/coderd.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/coderdtest/coderdtest.go
Lines changed: 8 additions & 0 deletions b/‎coderd/coderdtest/coderdtest.go
Lines changed: 8 additions & 0 deletions
diff --git a/‎coderd/features.go
Lines changed: 23 additions & 9 deletions b/‎coderd/features.go
Lines changed: 23 additions & 9 deletions
diff --git a/‎coderd/features_internal_test.go
Lines changed: 1 addition & 1 deletion b/‎coderd/features_internal_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/users_test.go
Lines changed: 17 additions & 5 deletions b/‎coderd/users_test.go
Lines changed: 17 additions & 5 deletions
@@ -22,3 +22,18 @@ func (nop) Export(context.Context, database.AuditLog) error {
 }
 
 func (nop) diff(any, any) Map { return Map{} }
+
+func NewMock() *MockAuditor {
+	return &MockAuditor{}
+}
+
+type MockAuditor struct {
+	AuditLogs []database.AuditLog
+}
+
+func (a *MockAuditor) Export(_ context.Context, alog database.AuditLog) error {
+	a.AuditLogs = append(a.AuditLogs, alog)
+	return nil
+}
+
+func (*MockAuditor) diff(any, any) Map { return Map{} }
@@ -114,7 +114,7 @@ func New(options *Options) *API {
 		options.LicenseHandler = licenses()
 	}
 	if options.FeaturesService == nil {
-		options.FeaturesService = featuresService{}
+		options.FeaturesService = &featuresService{}
 	}
 
 	siteCacheDir := options.CacheDir
 
@@ -43,6 +43,7 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/coderd"
+	"github.com/coder/coder/coderd/audit"
 	"github.com/coder/coder/coderd/autobuild/executor"
 	"github.com/coder/coder/coderd/awsidentity"
 	"github.com/coder/coder/coderd/database"
@@ -74,6 +75,7 @@ type Options struct {
 	AutoImportTemplates  []coderd.AutoImportTemplate
 	AutobuildTicker      <-chan time.Time
 	AutobuildStats       chan<- executor.Stats
+	Auditor              audit.Auditor
 
 	// IncludeProvisionerDaemon when true means to start an in-memory provisionerD
 	IncludeProvisionerDaemon    bool
@@ -197,6 +199,11 @@ func newWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 		_ = turnServer.Close()
 	})
 
+	features := coderd.DisabledImplementations
+	if options.Auditor != nil {
+		features.Auditor = options.Auditor
+	}
+
 	// We set the handler after server creation for the access URL.
 	coderAPI := options.APIBuilder(&coderd.Options{
 		AgentConnectionUpdateFrequency: 150 * time.Millisecond,
@@ -240,6 +247,7 @@ func newWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 		AutoImportTemplates:         options.AutoImportTemplates,
 		MetricsCacheRefreshInterval: options.MetricsCacheRefreshInterval,
 		AgentStatsRefreshInterval:   options.AgentStatsRefreshInterval,
+		FeaturesService:             coderd.NewMockFeaturesService(features),
 	})
 	t.Cleanup(func() {
 		_ = coderAPI.Close()
 
@@ -7,22 +7,31 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/coderd/audit"
+	"github.com/coder/coder/coderd/features"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/codersdk"
 )
 
-type featuresService struct{}
+func NewMockFeaturesService(feats FeatureInterfaces) features.Service {
+	return &featuresService{
+		feats: &feats,
+	}
 }
+
+type featuresService struct {
+	feats *FeatureInterfaces
+}
 
-func (featuresService) EntitlementsAPI(rw http.ResponseWriter, _ *http.Request) {
-	features := make(map[string]codersdk.Feature)
+func (*featuresService) EntitlementsAPI(rw http.ResponseWriter, _ *http.Request) {
+	feats := make(map[string]codersdk.Feature)
 	for _, f := range codersdk.FeatureNames {
-		features[f] = codersdk.Feature{
+		feats[f] = codersdk.Feature{
 			Entitlement: codersdk.EntitlementNotEntitled,
 			Enabled:     false,
 		}
 	}
 	httpapi.Write(rw, http.StatusOK, codersdk.Entitlements{
-		Features:   features,
+		Features:   feats,
 		Warnings:   []string{},
 		HasLicense: false,
 	})
@@ -32,7 +41,7 @@ func (featuresService) EntitlementsAPI(rw http.ResponseWriter, _ *http.Request)
 // struct type containing feature interfaces as fields.  The AGPL featureService always returns the
 // "disabled" version of the feature interface because it doesn't include any enterprise features
 // by definition.
-func (featuresService) Get(ps any) error {
+func (f *featuresService) Get(ps any) error {
 	if reflect.TypeOf(ps).Kind() != reflect.Pointer {
 		return xerrors.New("input must be pointer to struct")
 	}
@@ -46,7 +55,7 @@ func (featuresService) Get(ps any) error {
 		if tf.Kind() != reflect.Interface {
 			return xerrors.Errorf("fields of input struct must be interfaces: %s", tf.String())
 		}
-		err := setImplementation(vf, tf)
+		err := f.setImplementation(vf, tf)
 		if err != nil {
 			return err
 		}
@@ -56,11 +65,16 @@ func (featuresService) Get(ps any) error {
 
 // setImplementation finds the correct implementation for the field's type, and sets it on the
 // struct.  It returns an error if unsuccessful
-func setImplementation(vf reflect.Value, tf reflect.Type) error {
+func (f *featuresService) setImplementation(vf reflect.Value, tf reflect.Type) error {
+	feats := f.feats
+	if feats == nil {
+		feats = &DisabledImplementations
+	}
+
 	// when we get more than a few features it might make sense to have a data structure for finding
 	// the correct implementation that's faster than just a linear search, but for now just spin
 	// through the implementations we have.
-	vd := reflect.ValueOf(DisabledImplementations)
+	vd := reflect.ValueOf(*feats)
 	for j := 0; j < vd.NumField(); j++ {
 		vdf := vd.Field(j)
 		if vdf.Type() == tf {
 
@@ -19,7 +19,7 @@ func TestEntitlements(t *testing.T) {
 		t.Parallel()
 		r := httptest.NewRequest("GET", "https://example.com/api/v2/entitlements", nil)
 		rw := httptest.NewRecorder()
-		featuresService{}.EntitlementsAPI(rw, r)
+		(&featuresService{}).EntitlementsAPI(rw, r)
 		resp := rw.Result()
 		defer resp.Body.Close()
 		assert.Equal(t, http.StatusOK, resp.StatusCode)
 
@@ -10,10 +10,12 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/coder/coder/coderd"
+	"github.com/coder/coder/coderd/audit"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/codersdk"
@@ -374,7 +376,8 @@ func TestPostUsers(t *testing.T) {
 
 	t.Run("Create", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
 		user := coderdtest.CreateFirstUser(t, client)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
@@ -387,6 +390,7 @@ func TestPostUsers(t *testing.T) {
 			Password:       "testing",
 		})
 		require.NoError(t, err)
+		assert.Len(t, auditor.AuditLogs, 1)
 	})
 }
 
@@ -435,7 +439,8 @@ func TestUpdateUserProfile(t *testing.T) {
 
 	t.Run("UpdateUsername", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
 		coderdtest.CreateFirstUser(t, client)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
@@ -447,6 +452,7 @@ func TestUpdateUserProfile(t *testing.T) {
 		})
 		require.NoError(t, err)
 		require.Equal(t, userProfile.Username, "newusername")
+		assert.Len(t, auditor.AuditLogs, 1)
 	})
 }
 
@@ -496,7 +502,8 @@ func TestUpdateUserPassword(t *testing.T) {
 	})
 	t.Run("MemberCanUpdateOwnPassword", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
 		admin := coderdtest.CreateFirstUser(t, client)
 		member := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
 
@@ -508,6 +515,7 @@ func TestUpdateUserPassword(t *testing.T) {
 			Password:    "newpassword",
 		})
 		require.NoError(t, err, "member should be able to update own password")
+		assert.Len(t, auditor.AuditLogs, 1)
 	})
 	t.Run("MemberCantUpdateOwnPasswordWithoutOldPassword", func(t *testing.T) {
 		t.Parallel()
@@ -525,7 +533,8 @@ func TestUpdateUserPassword(t *testing.T) {
 	})
 	t.Run("AdminCanUpdateOwnPasswordWithoutOldPassword", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
 		_ = coderdtest.CreateFirstUser(t, client)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
@@ -535,6 +544,7 @@ func TestUpdateUserPassword(t *testing.T) {
 			Password: "newpassword",
 		})
 		require.NoError(t, err, "admin should be able to update own password without providing old password")
+		assert.Len(t, auditor.AuditLogs, 1)
 	})
 }
 
@@ -752,7 +762,8 @@ func TestPutUserSuspend(t *testing.T) {
 
 	t.Run("SuspendAnotherUser", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, nil)
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
 		me := coderdtest.CreateFirstUser(t, client)
 		_, user := coderdtest.CreateAnotherUserWithUser(t, client, me.OrganizationID)
 
@@ -762,6 +773,7 @@ func TestPutUserSuspend(t *testing.T) {
 		user, err := client.UpdateUserStatus(ctx, user.Username, codersdk.UserStatusSuspended)
 		require.NoError(t, err)
 		require.Equal(t, user.Status, codersdk.UserStatusSuspended)
+		assert.Len(t, auditor.AuditLogs, 1)
 	})
 
 	t.Run("SuspendItSelf", func(t *testing.T) {