fixup compile issues from rebase

Emyrk · Emyrk · commit ae5315ff25c4 · 2024-09-06T10:42:46.000-05:00
diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go
@@ -29,7 +29,7 @@ func TestParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewStoreManager(),
+			runtimeconfig.NewManager(),
 			idpsync.DeploymentSyncSettings{})
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
@@ -45,7 +45,7 @@ func TestParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewStoreManager(),
+			runtimeconfig.NewManager(),
 			idpsync.DeploymentSyncSettings{
 				GroupField: "groups",
 				GroupAllowList: map[string]struct{}{
@@ -232,7 +232,7 @@ func TestGroupSyncTable(t *testing.T) {
 			t.Parallel()
 
 			db, _ := dbtestutil.NewDB(t)
-			manager := runtimeconfig.NewStoreManager()
+			manager := runtimeconfig.NewManager()
 			s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
 				manager,
 				idpsync.DeploymentSyncSettings{
@@ -264,7 +264,7 @@ func TestGroupSyncTable(t *testing.T) {
 		t.Parallel()
 
 		db, _ := dbtestutil.NewDB(t)
-		manager := runtimeconfig.NewStoreManager()
+		manager := runtimeconfig.NewManager()
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
 			manager,
 			// Also sync the default org!
@@ -444,7 +444,7 @@ func TestApplyGroupDifference(t *testing.T) {
 	for _, tc := range testCase {
 		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
-			mgr := runtimeconfig.NewStoreManager()
+			mgr := runtimeconfig.NewManager()
 			db, _ := dbtestutil.NewDB(t)
 
 			ctx := testutil.Context(t, testutil.WaitMedium)
@@ -505,7 +505,7 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
 		require.NoError(t, err, "Everyone group for an org")
 	}
 
-	manager := runtimeconfig.NewStoreManager()
+	manager := runtimeconfig.NewManager()
 	orgResolver := manager.OrganizationResolver(db, org.ID)
 	err = s.Group.SetRuntimeValue(context.Background(), orgResolver, def.Settings)
 	require.NoError(t, err)
diff --git a/coderd/idpsync/idpsync.go b/coderd/idpsync/idpsync.go
@@ -45,7 +45,7 @@ type IDPSync interface {
 // IDP. All related code to syncing user information should be in this package.
 type AGPLIDPSync struct {
 	Logger  slog.Logger
-	Manager runtimeconfig.Manager
+	Manager *runtimeconfig.Manager
 
 	SyncSettings
 }
@@ -108,7 +108,7 @@ type SyncSettings struct {
 	Group runtimeconfig.RuntimeEntry[*GroupSyncSettings]
 }
 
-func NewAGPLSync(logger slog.Logger, manager runtimeconfig.Manager, settings DeploymentSyncSettings) *AGPLIDPSync {
+func NewAGPLSync(logger slog.Logger, manager *runtimeconfig.Manager, settings DeploymentSyncSettings) *AGPLIDPSync {
 	return &AGPLIDPSync{
 		Logger:  logger.Named("idp-sync"),
 		Manager: manager,
