fix compile issues

Emyrk · Emyrk · commit ff53e188989e · 2024-09-05T12:28:30.000-05:00
diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go
@@ -13,7 +13,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"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/slice"
 )
 
@@ -44,8 +43,6 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
 	ctx = dbauthz.AsSystemRestricted(ctx)
 
 	db.InTx(func(tx database.Store) error {
-		manager := runtimeconfig.NewStoreManager(tx)
-
 		userGroups, err := tx.GetGroups(ctx, database.GetGroupsParams{
 			HasMemberID: user.ID,
 		})
@@ -63,7 +60,7 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
 		// For each org, we need to fetch the sync settings
 		orgSettings := make(map[uuid.UUID]GroupSyncSettings)
 		for orgID := range userOrgs {
-			orgResolver := manager.Scoped(orgID.String())
+			orgResolver := s.Manager.OrganizationResolver(tx, orgID)
 			settings, err := s.SyncSettings.Group.Resolve(ctx, orgResolver)
 			if err != nil {
 				return xerrors.Errorf("resolve group sync settings: %w", err)
diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go
@@ -28,7 +28,7 @@ func TestParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			idpsync.DeploymentSyncSettings{})
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
@@ -44,7 +44,7 @@ func TestParseGroupClaims(t *testing.T) {
 		t.Parallel()
 
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			idpsync.DeploymentSyncSettings{
 				GroupField: "groups",
 				GroupAllowList: map[string]struct{}{
@@ -209,7 +209,7 @@ func TestGroupSyncTable(t *testing.T) {
 			}
 
 			db, _ := dbtestutil.NewDB(t)
-			manager := runtimeconfig.NewStoreManager(db)
+			manager := runtimeconfig.NewStoreManager()
 			s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
 				manager,
 				idpsync.DeploymentSyncSettings{
@@ -240,8 +240,8 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
 	_, err := db.InsertAllUsersGroup(context.Background(), org.ID)
 	require.NoError(t, err, "Everyone group for an org")
 
-	manager := runtimeconfig.NewStoreManager(db)
-	orgResolver := manager.Scoped(org.ID.String())
+	manager := runtimeconfig.NewStoreManager()
+	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
@@ -43,7 +43,8 @@ type IDPSync interface {
 // AGPLIDPSync is the configuration for syncing user information from an external
 // IDP. All related code to syncing user information should be in this package.
 type AGPLIDPSync struct {
-	Logger slog.Logger
+	Logger  slog.Logger
+	Manager runtimeconfig.Manager
 
 	SyncSettings
 }
@@ -88,7 +89,7 @@ func FromDeploymentValues(dv *codersdk.DeploymentValues) DeploymentSyncSettings
 type SyncSettings struct {
 	DeploymentSyncSettings
 
-	Group runtimeconfig.Entry[*GroupSyncSettings]
+	Group runtimeconfig.RuntimeEntry[*GroupSyncSettings]
 
 	//// Group options here are set by the deployment config and only apply to
 	//// the default organization.
@@ -100,13 +101,11 @@ type SyncSettings struct {
 
 func NewAGPLSync(logger slog.Logger, manager runtimeconfig.Manager, settings DeploymentSyncSettings) *AGPLIDPSync {
 	return &AGPLIDPSync{
-		Logger: logger.Named("idp-sync"),
+		Logger:  logger.Named("idp-sync"),
+		Manager: manager,
 		SyncSettings: SyncSettings{
 			DeploymentSyncSettings: settings,
-			// Default to '{}' if the group sync settings are not set.
-			// TODO: Feels strange to have to define the type as a string. I should be
-			// able to pass in an empty struct.
-			Group: runtimeconfig.MustNew[*GroupSyncSettings]("group-sync-settings", "{}"),
+			Group:                  runtimeconfig.MustNew[*GroupSyncSettings]("group-sync-settings"),
 		},
 	}
 }
diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go
@@ -20,7 +20,7 @@ func TestParseOrganizationClaims(t *testing.T) {
 		t.Parallel()
 
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			idpsync.DeploymentSyncSettings{
 				OrganizationField:         "",
 				OrganizationMapping:       nil,
@@ -42,7 +42,7 @@ func TestParseOrganizationClaims(t *testing.T) {
 
 		// AGPL has limited behavior
 		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
-			runtimeconfig.NewNoopManager(),
+			runtimeconfig.NewStoreManager(),
 			idpsync.DeploymentSyncSettings{
 				OrganizationField: "orgs",
 				OrganizationMapping: map[string][]uuid.UUID{
