Skip to content

Commit 4ac097b

Browse files
committed
update unit test to use EntryNotFoundErr
1 parent 1093e83 commit 4ac097b

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

coderd/idpsync/group.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ func (s AGPLIDPSync) GroupSyncSettings(ctx context.Context, orgID uuid.UUID, db
5050

5151
// Default to not being configured
5252
settings = &GroupSyncSettings{}
53-
}
5453

55-
// Check for legacy settings if the default org.
56-
if s.DeploymentSyncSettings.Legacy.GroupField != "" && settings.Field == "" {
57-
defaultOrganization, err := db.GetDefaultOrganization(ctx)
58-
if err != nil {
59-
return nil, xerrors.Errorf("get default organization: %w", err)
60-
}
61-
if defaultOrganization.ID == orgID {
62-
settings = ptr.Ref(GroupSyncSettings(codersdk.GroupSyncSettings{
63-
Field: s.Legacy.GroupField,
64-
LegacyNameMapping: s.Legacy.GroupMapping,
65-
RegexFilter: s.Legacy.GroupFilter,
66-
AutoCreateMissing: s.Legacy.CreateMissingGroups,
67-
}))
54+
// Check for legacy settings if the default org.
55+
if s.DeploymentSyncSettings.Legacy.GroupField != "" {
56+
defaultOrganization, err := db.GetDefaultOrganization(ctx)
57+
if err != nil {
58+
return nil, xerrors.Errorf("get default organization: %w", err)
59+
}
60+
if defaultOrganization.ID == orgID {
61+
settings = ptr.Ref(GroupSyncSettings(codersdk.GroupSyncSettings{
62+
Field: s.Legacy.GroupField,
63+
LegacyNameMapping: s.Legacy.GroupMapping,
64+
RegexFilter: s.Legacy.GroupFilter,
65+
AutoCreateMissing: s.Legacy.CreateMissingGroups,
66+
}))
67+
}
6868
}
6969
}
7070

coderd/idpsync/group_test.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -727,16 +727,13 @@ func SetupOrganization(t *testing.T, s *idpsync.AGPLIDPSync, db database.Store,
727727
require.NoError(t, err, "Everyone group for an org")
728728
}
729729

730-
var settings idpsync.GroupSyncSettings
730+
manager := runtimeconfig.NewManager()
731731
if def.Settings != nil {
732-
settings = idpsync.GroupSyncSettings(*def.Settings)
732+
orgResolver := manager.OrganizationResolver(db, org.ID)
733+
err = s.Group.SetRuntimeValue(context.Background(), orgResolver, (*idpsync.GroupSyncSettings)(def.Settings))
734+
require.NoError(t, err)
733735
}
734736

735-
manager := runtimeconfig.NewManager()
736-
orgResolver := manager.OrganizationResolver(db, org.ID)
737-
err = s.Group.SetRuntimeValue(context.Background(), orgResolver, &settings)
738-
require.NoError(t, err)
739-
740737
if !def.NotMember {
741738
dbgen.OrganizationMember(t, db, database.OrganizationMember{
742739
UserID: user.ID,

0 commit comments

Comments
 (0)