fixup some tests

Emyrk · Emyrk · commit 6d3ed2e57043 · 2024-09-09T16:31:05.000-05:00
diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go
@@ -9,6 +9,7 @@ import (
 
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/idpsync"
+	"github.com/coder/coder/v2/coderd/runtimeconfig"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -18,11 +19,13 @@ func TestParseOrganizationClaims(t *testing.T) {
 	t.Run("SingleOrgDeployment", func(t *testing.T) {
 		t.Parallel()
 
-		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}), idpsync.SyncSettings{
-			OrganizationField:         "",
-			OrganizationMapping:       nil,
-			OrganizationAssignDefault: true,
-		})
+		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
+			runtimeconfig.NewNoopManager(),
+			idpsync.DeploymentSyncSettings{
+				OrganizationField:         "",
+				OrganizationMapping:       nil,
+				OrganizationAssignDefault: true,
+			})
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
 
@@ -38,13 +41,15 @@ func TestParseOrganizationClaims(t *testing.T) {
 		t.Parallel()
 
 		// AGPL has limited behavior
-		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}), idpsync.SyncSettings{
-			OrganizationField: "orgs",
-			OrganizationMapping: map[string][]uuid.UUID{
-				"random": {uuid.New()},
-			},
-			OrganizationAssignDefault: false,
-		})
+		s := idpsync.NewAGPLSync(slogtest.Make(t, &slogtest.Options{}),
+			runtimeconfig.NewNoopManager(),
+			idpsync.DeploymentSyncSettings{
+				OrganizationField: "orgs",
+				OrganizationMapping: map[string][]uuid.UUID{
+					"random": {uuid.New()},
+				},
+				OrganizationAssignDefault: false,
+			})
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
 
diff --git a/enterprise/coderd/enidpsync/enidpsync.go b/enterprise/coderd/enidpsync/enidpsync.go
@@ -4,6 +4,7 @@ import (
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/coderd/entitlements"
 	"github.com/coder/coder/v2/coderd/idpsync"
+	"github.com/coder/coder/v2/coderd/runtimeconfig"
 )
 
 // EnterpriseIDPSync enabled syncing user information from an external IDP.
@@ -16,9 +17,9 @@ type EnterpriseIDPSync struct {
 	*idpsync.AGPLIDPSync
 }
 
-func NewSync(logger slog.Logger, set *entitlements.Set, settings idpsync.DeploymentSyncSettings) *EnterpriseIDPSync {
+func NewSync(logger slog.Logger, manager runtimeconfig.Manager, set *entitlements.Set, settings idpsync.DeploymentSyncSettings) *EnterpriseIDPSync {
 	return &EnterpriseIDPSync{
 		entitlements: set,
-		AGPLIDPSync:  idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), settings),
+		AGPLIDPSync:  idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), manager, settings),
 	}
 }
diff --git a/enterprise/coderd/enidpsync/organizations_test.go b/enterprise/coderd/enidpsync/organizations_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/coder/coder/v2/coderd/entitlements"
 	"github.com/coder/coder/v2/coderd/idpsync"
 	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/coderd/runtimeconfig"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/enidpsync"
 	"github.com/coder/coder/v2/testutil"
@@ -41,7 +42,7 @@ type Expectations struct {
 }
 
 type OrganizationSyncTestCase struct {
-	Settings     idpsync.SyncSettings
+	Settings     idpsync.DeploymentSyncSettings
 	Entitlements *entitlements.Set
 	Exps         []Expectations
 }
@@ -89,7 +90,7 @@ func TestOrganizationSync(t *testing.T) {
 				other := dbgen.Organization(t, db, database.Organization{})
 				return OrganizationSyncTestCase{
 					Entitlements: entitled,
-					Settings: idpsync.SyncSettings{
+					Settings: idpsync.DeploymentSyncSettings{
 						OrganizationField:         "",
 						OrganizationMapping:       nil,
 						OrganizationAssignDefault: true,
@@ -142,7 +143,7 @@ func TestOrganizationSync(t *testing.T) {
 				three := dbgen.Organization(t, db, database.Organization{})
 				return OrganizationSyncTestCase{
 					Entitlements: entitled,
-					Settings: idpsync.SyncSettings{
+					Settings: idpsync.DeploymentSyncSettings{
 						OrganizationField: "organizations",
 						OrganizationMapping: map[string][]uuid.UUID{
 							"first":  {one.ID},
@@ -236,7 +237,7 @@ func TestOrganizationSync(t *testing.T) {
 			}
 
 			// Create a new sync object
-			sync := enidpsync.NewSync(logger, caseData.Entitlements, caseData.Settings)
+			sync := enidpsync.NewSync(logger, runtimeconfig.NewStoreManager(rdb), caseData.Entitlements, caseData.Settings)
 			for _, exp := range caseData.Exps {
 				t.Run(exp.Name, func(t *testing.T) {
 					params, httpErr := sync.ParseOrganizationClaims(ctx, exp.Claims)

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"cdr.dev/slog"`
`5`	`5`	`"github.com/coder/coder/v2/coderd/entitlements"`
`6`	`6`	`"github.com/coder/coder/v2/coderd/idpsync"`
	`7`	`+ "github.com/coder/coder/v2/coderd/runtimeconfig"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`// EnterpriseIDPSync enabled syncing user information from an external IDP.`
`@@ -16,9 +17,9 @@ type EnterpriseIDPSync struct {`
`16`	`17`	`*idpsync.AGPLIDPSync`
`17`	`18`	`}`
`18`	`19`
`19`		`-func NewSync(logger slog.Logger, set entitlements.Set, settings idpsync.DeploymentSyncSettings) EnterpriseIDPSync {`
	`20`	`+func NewSync(logger slog.Logger, manager runtimeconfig.Manager, set entitlements.Set, settings idpsync.DeploymentSyncSettings) EnterpriseIDPSync {`
`20`	`21`	`return &EnterpriseIDPSync{`
`21`	`22`	`entitlements: set,`
`22`		`- AGPLIDPSync: idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), settings),`
	`23`	`+ AGPLIDPSync: idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), manager, settings),`
`23`	`24`	`}`
`24`	`25`	`}`