fix compile issues

Emyrk · Emyrk · commit a8c89a4a2f2c · 2024-08-26T13:08:36.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -201,7 +201,7 @@ func createOIDCConfig(ctx context.Context, logger slog.Logger, vals *codersdk.De
 		IDPSync: idpsync.NewSync(logger, idpsync.SyncSettings{
 			OrganizationField:         vals.OIDC.OrganizationField.Value(),
 			OrganizationMapping:       vals.OIDC.OrganizationMapping.Value,
-			OrganizationAssignDefault: vals.OIDC.OrganizationAssignDefault.Value,
+			OrganizationAssignDefault: vals.OIDC.OrganizationAssignDefault.Value(),
 		}),
 	}, nil
 }
diff --git a/cli/server_createadminuser_test.go b/cli/server_createadminuser_test.go
@@ -60,7 +60,7 @@ func TestServerCreateAdminUser(t *testing.T) {
 		require.EqualValues(t, []string{codersdk.RoleOwner}, user.RBACRoles, "user does not have owner role")
 
 		// Check that user is admin in every org.
-		orgs, err := db.GetOrganizations(ctx)
+		orgs, err := db.GetOrganizations(ctx, database.GetOrganizationsParams{})
 		require.NoError(t, err)
 		orgIDs := make(map[uuid.UUID]struct{}, len(orgs))
 		for _, org := range orgs {
diff --git a/coderd/database/dbmem/dbmem_test.go b/coderd/database/dbmem/dbmem_test.go
@@ -46,7 +46,7 @@ func TestInTx(t *testing.T) {
 	go func() {
 		<-inTx
 		for i := 0; i < 20; i++ {
-			orgs, err := uut.GetOrganizations(context.Background())
+			orgs, err := uut.GetOrganizations(context.Background(), database.GetOrganizationsParams{})
 			if err != nil {
 				assert.ErrorIs(t, err, sql.ErrNoRows)
 			}

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func createOIDCConfig(ctx context.Context, logger slog.Logger, vals *codersdk.De`
`201`	`201`	`IDPSync: idpsync.NewSync(logger, idpsync.SyncSettings{`
`202`	`202`	`OrganizationField: vals.OIDC.OrganizationField.Value(),`
`203`	`203`	`OrganizationMapping: vals.OIDC.OrganizationMapping.Value,`
`204`		`- OrganizationAssignDefault: vals.OIDC.OrganizationAssignDefault.Value,`
	`204`	`+ OrganizationAssignDefault: vals.OIDC.OrganizationAssignDefault.Value(),`
`205`	`205`	`}),`
`206`	`206`	`}, nil`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func TestInTx(t *testing.T) {`
`46`	`46`	`go func() {`
`47`	`47`	`<-inTx`
`48`	`48`	`for i := 0; i < 20; i++ {`
`49`		`- orgs, err := uut.GetOrganizations(context.Background())`
	`49`	`+ orgs, err := uut.GetOrganizations(context.Background(), database.GetOrganizationsParams{})`
`50`	`50`	`if err != nil {`
`51`	`51`	`assert.ErrorIs(t, err, sql.ErrNoRows)`
`52`	`52`	`}`