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

Commitdb51906

Browse files
committed
rad
1 parent6011963 commitdb51906

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

‎coderd/idpsync/group.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/coder/coder/v2/coderd/database/db2sdk"
1515
"github.com/coder/coder/v2/coderd/database/dbauthz"
1616
"github.com/coder/coder/v2/coderd/runtimeconfig"
17+
"github.com/coder/coder/v2/coderd/util/ptr"
1718
"github.com/coder/coder/v2/coderd/util/slice"
1819
"github.com/coder/coder/v2/codersdk"
1920
)
@@ -93,14 +94,12 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
9394

9495
// Legacy deployment settings will override empty settings.
9596
iforgID==defaultOrgID&&settings.Field=="" {
96-
settings=&GroupSyncSettings{
97-
GroupSyncSettings: codersdk.GroupSyncSettings{
98-
Field:s.Legacy.GroupField,
99-
LegacyNameMapping:s.Legacy.GroupMapping,
100-
RegexFilter:s.Legacy.GroupFilter,
101-
AutoCreateMissing:s.Legacy.CreateMissingGroups,
102-
},
103-
}
97+
settings=ptr.Ref(GroupSyncSettings(codersdk.GroupSyncSettings{
98+
Field:s.Legacy.GroupField,
99+
LegacyNameMapping:s.Legacy.GroupMapping,
100+
RegexFilter:s.Legacy.GroupFilter,
101+
AutoCreateMissing:s.Legacy.CreateMissingGroups,
102+
}))
104103
}
105104
orgSettings[orgID]=*settings
106105
}
@@ -241,9 +240,7 @@ func (s AGPLIDPSync) ApplyGroupDifference(ctx context.Context, tx database.Store
241240
returnnil
242241
}
243242

244-
typeGroupSyncSettingsstruct {
245-
codersdk.GroupSyncSettings
246-
}
243+
typeGroupSyncSettings codersdk.GroupSyncSettings
247244

248245
func (s*GroupSyncSettings)Set(vstring)error {
249246
returnjson.Unmarshal([]byte(v),s)

‎coderd/idpsync/group_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,9 +716,14 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
716716
require.NoError(t,err,"Everyone group for an org")
717717
}
718718

719+
varsettings idpsync.GroupSyncSettings
720+
ifdef.Settings!=nil {
721+
settings=idpsync.GroupSyncSettings(*def.Settings)
722+
}
723+
719724
manager:=runtimeconfig.NewManager()
720725
orgResolver:=manager.OrganizationResolver(db,org.ID)
721-
err=s.Group.SetRuntimeValue(context.Background(),orgResolver,&idpsync.GroupSyncSettings{GroupSyncSettings:*def.Settings})
726+
err=s.Group.SetRuntimeValue(context.Background(),orgResolver,&settings)
722727
require.NoError(t,err)
723728

724729
if!def.NotMember {

0 commit comments

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