Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitae5315f

Browse files
committed
fixup compile issues from rebase
1 parent355ea31 commitae5315f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎coderd/idpsync/group_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestParseGroupClaims(t *testing.T) {
2929
t.Parallel()
3030

3131
s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),
32-
runtimeconfig.NewStoreManager(),
32+
runtimeconfig.NewManager(),
3333
idpsync.DeploymentSyncSettings{})
3434

3535
ctx:=testutil.Context(t,testutil.WaitMedium)
@@ -45,7 +45,7 @@ func TestParseGroupClaims(t *testing.T) {
4545
t.Parallel()
4646

4747
s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),
48-
runtimeconfig.NewStoreManager(),
48+
runtimeconfig.NewManager(),
4949
idpsync.DeploymentSyncSettings{
5050
GroupField:"groups",
5151
GroupAllowList:map[string]struct{}{
@@ -232,7 +232,7 @@ func TestGroupSyncTable(t *testing.T) {
232232
t.Parallel()
233233

234234
db,_:=dbtestutil.NewDB(t)
235-
manager:=runtimeconfig.NewStoreManager()
235+
manager:=runtimeconfig.NewManager()
236236
s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),
237237
manager,
238238
idpsync.DeploymentSyncSettings{
@@ -264,7 +264,7 @@ func TestGroupSyncTable(t *testing.T) {
264264
t.Parallel()
265265

266266
db,_:=dbtestutil.NewDB(t)
267-
manager:=runtimeconfig.NewStoreManager()
267+
manager:=runtimeconfig.NewManager()
268268
s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),
269269
manager,
270270
// Also sync the default org!
@@ -444,7 +444,7 @@ func TestApplyGroupDifference(t *testing.T) {
444444
for_,tc:=rangetestCase {
445445
tc:=tc
446446
t.Run(tc.Name,func(t*testing.T) {
447-
mgr:=runtimeconfig.NewStoreManager()
447+
mgr:=runtimeconfig.NewManager()
448448
db,_:=dbtestutil.NewDB(t)
449449

450450
ctx:=testutil.Context(t,testutil.WaitMedium)
@@ -505,7 +505,7 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
505505
require.NoError(t,err,"Everyone group for an org")
506506
}
507507

508-
manager:=runtimeconfig.NewStoreManager()
508+
manager:=runtimeconfig.NewManager()
509509
orgResolver:=manager.OrganizationResolver(db,org.ID)
510510
err=s.Group.SetRuntimeValue(context.Background(),orgResolver,def.Settings)
511511
require.NoError(t,err)

‎coderd/idpsync/idpsync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type IDPSync interface {
4545
// IDP. All related code to syncing user information should be in this package.
4646
typeAGPLIDPSyncstruct {
4747
Logger slog.Logger
48-
Manager runtimeconfig.Manager
48+
Manager*runtimeconfig.Manager
4949

5050
SyncSettings
5151
}
@@ -108,7 +108,7 @@ type SyncSettings struct {
108108
Group runtimeconfig.RuntimeEntry[*GroupSyncSettings]
109109
}
110110

111-
funcNewAGPLSync(logger slog.Logger,manager runtimeconfig.Manager,settingsDeploymentSyncSettings)*AGPLIDPSync {
111+
funcNewAGPLSync(logger slog.Logger,manager*runtimeconfig.Manager,settingsDeploymentSyncSettings)*AGPLIDPSync {
112112
return&AGPLIDPSync{
113113
Logger:logger.Named("idp-sync"),
114114
Manager:manager,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp