cleanup

coder · Emyrk · Sep 11, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024
commit ec8092d25c3fe8c81edef30afb2af9790c9117a1
diff --git a/coderd/coderdtest/uuids_test.go b/coderd/coderdtest/uuids_test.go
@@ -26,7 +26,7 @@ func ExampleNewDeterministicUUIDGenerator() {
 
 	for _, tc := range testCases {
 		tc := tc
-		var _ = tc
+		_ = tc
 		// Do the test with CreateUsers as the setup, and the expected IDs
 		// will match.
 	}

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -3109,7 +3109,11 @@ func (q *querier) RemoveUserFromAllGroups(ctx context.Context, userID uuid.UUID)
 }
 
 func (q *querier) RemoveUserFromGroups(ctx context.Context, arg database.RemoveUserFromGroupsParams) ([]uuid.UUID, error) {
-	panic("not implemented")
+	// This is a system function to clear user groups in group sync.
+	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
+		return nil, err
+	}
+	return q.db.RemoveUserFromGroups(ctx, arg)
 }
 
 func (q *querier) RevokeDBCryptKey(ctx context.Context, activeKeyDigest string) error {

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7015,7 +7015,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 	return user, nil
 }
 
-func (q *FakeQuerier) InsertUserGroupsByID(ctx context.Context, arg database.InsertUserGroupsByIDParams) ([]uuid.UUID, error) {
+func (q *FakeQuerier) InsertUserGroupsByID(_ context.Context, arg database.InsertUserGroupsByIDParams) ([]uuid.UUID, error) {
 	err := validateDatabaseType(arg)
 	if err != nil {
 		return nil, err
@@ -7637,7 +7637,7 @@ func (q *FakeQuerier) RemoveUserFromAllGroups(_ context.Context, userID uuid.UUI
 	return nil
 }
 
-func (q *FakeQuerier) RemoveUserFromGroups(ctx context.Context, arg database.RemoveUserFromGroupsParams) ([]uuid.UUID, error) {
+func (q *FakeQuerier) RemoveUserFromGroups(_ context.Context, arg database.RemoveUserFromGroupsParams) ([]uuid.UUID, error) {
 	err := validateDatabaseType(arg)
 	if err != nil {
 		return nil, err

diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go
@@ -54,7 +54,7 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
 	// nolint:gocritic // all syncing is done as a system user
 	ctx = dbauthz.AsSystemRestricted(ctx)
 
-	db.InTx(func(tx database.Store) error {
+	err := db.InTx(func(tx database.Store) error {
 		userGroups, err := tx.GetGroups(ctx, database.GetGroupsParams{
 			HasMemberID: user.ID,
 		})
@@ -188,6 +188,10 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
 		return nil
 	}, nil)
 
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -208,13 +212,15 @@ type GroupSyncSettings struct {
 func (s *GroupSyncSettings) Set(v string) error {
 	return json.Unmarshal([]byte(v), s)
 }
+
 func (s *GroupSyncSettings) String() string {
 	v, err := json.Marshal(s)
 	if err != nil {
 		return "decode failed: " + err.Error()
 	}
 	return string(v)
 }
+
 func (s *GroupSyncSettings) Type() string {
 	return "GroupSyncSettings"
 }

diff --git a/coderd/idpsync/idpsync.go b/coderd/idpsync/idpsync.go
@@ -100,7 +100,6 @@ func FromDeploymentValues(dv *codersdk.DeploymentValues) DeploymentSyncSettings
 			CreateMissingGroups: dv.OIDC.GroupAutoCreate.Value(),
 		},
 	}
-
 }
 
 type SyncSettings struct {

diff --git a/enterprise/coderd/enidpsync/groups_test.go b/enterprise/coderd/enidpsync/groups_test.go
@@ -30,7 +30,7 @@ func TestEnterpriseParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := enidpsync.NewSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			entitlements.New(),
 			idpsync.DeploymentSyncSettings{})
 
@@ -46,7 +46,7 @@ func TestEnterpriseParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := enidpsync.NewSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			entitled,
 			idpsync.DeploymentSyncSettings{
 				GroupField: "groups",
@@ -74,7 +74,7 @@ func TestEnterpriseParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := enidpsync.NewSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			entitled,
 			idpsync.DeploymentSyncSettings{
 				GroupField: "groups",
-Original file line number
+Diff line change
@@ Expand Up @@
     			CreateMissingGroups: dv.OIDC.GroupAutoCreate.Value(),
     		},
     	}
     }
     type SyncSettings struct {
@@ Expand Down @@