rad

aslilac · aslilac · commit db51906c0c2e · 2024-09-11T18:38:24.000Z
diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go
@@ -14,6 +14,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/runtimeconfig"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 )
@@ -93,14 +94,12 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
 
 			// Legacy deployment settings will override empty settings.
 			if orgID == defaultOrgID && settings.Field == "" {
-				settings = &GroupSyncSettings{
-					GroupSyncSettings: codersdk.GroupSyncSettings{
-						Field:             s.Legacy.GroupField,
-						LegacyNameMapping: s.Legacy.GroupMapping,
-						RegexFilter:       s.Legacy.GroupFilter,
-						AutoCreateMissing: s.Legacy.CreateMissingGroups,
-					},
-				}
+				settings = ptr.Ref(GroupSyncSettings(codersdk.GroupSyncSettings{
+					Field:             s.Legacy.GroupField,
+					LegacyNameMapping: s.Legacy.GroupMapping,
+					RegexFilter:       s.Legacy.GroupFilter,
+					AutoCreateMissing: s.Legacy.CreateMissingGroups,
+				}))
 			}
 			orgSettings[orgID] = *settings
 		}
@@ -241,9 +240,7 @@ func (s AGPLIDPSync) ApplyGroupDifference(ctx context.Context, tx database.Store
 	return nil
 }
 
-type GroupSyncSettings struct {
-	codersdk.GroupSyncSettings
-}
+type GroupSyncSettings codersdk.GroupSyncSettings
 
 func (s *GroupSyncSettings) Set(v string) error {
 	return json.Unmarshal([]byte(v), s)
diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go
@@ -716,9 +716,14 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
 		require.NoError(t, err, "Everyone group for an org")
 	}
 
+	var settings idpsync.GroupSyncSettings
+	if def.Settings != nil {
+		settings = idpsync.GroupSyncSettings(*def.Settings)
+	}
+
 	manager := runtimeconfig.NewManager()
 	orgResolver := manager.OrganizationResolver(db, org.ID)
-	err = s.Group.SetRuntimeValue(context.Background(), orgResolver, &idpsync.GroupSyncSettings{GroupSyncSettings: *def.Settings})
+	err = s.Group.SetRuntimeValue(context.Background(), orgResolver, &settings)
 	require.NoError(t, err)
 
 	if !def.NotMember {
