Commit4ac097b

committed

update unit test to use EntryNotFoundErr

1 parent1093e83 commit4ac097bCopy full SHA for 4ac097b

File tree

+18

-21

lines changed

+18

-21

lines changed

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,21 +50,21 @@ func (s AGPLIDPSync) GroupSyncSettings(ctx context.Context, orgID uuid.UUID, db`
`50`	`50`
`51`	`51`	`// Default to not being configured`
`52`	`52`	`settings=&GroupSyncSettings{}`
`53`		`-}`
`54`	`53`
`55`		`-// Check for legacy settings if the default org.`
`56`		`-ifs.DeploymentSyncSettings.Legacy.GroupField!=""&&settings.Field=="" {`
`57`		`-defaultOrganization,err:=db.GetDefaultOrganization(ctx)`
`58`		`-iferr!=nil {`
`59`		`-returnnil,xerrors.Errorf("get default organization: %w",err)`
`60`		`-}`
`61`		`-ifdefaultOrganization.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`	`+ifs.DeploymentSyncSettings.Legacy.GroupField!="" {`
	`56`	`+defaultOrganization,err:=db.GetDefaultOrganization(ctx)`
	`57`	`+iferr!=nil {`
	`58`	`+returnnil,xerrors.Errorf("get default organization: %w",err)`
	`59`	`+}`
	`60`	`+ifdefaultOrganization.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`	`+}`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -727,16 +727,13 @@ func SetupOrganization(t testing.T, s idpsync.AGPLIDPSync, db database.Store,`
`727`	`727`	`require.NoError(t,err,"Everyone group for an org")`
`728`	`728`	`}`
`729`	`729`
`730`		`-varsettings idpsync.GroupSyncSettings`
	`730`	`+manager:=runtimeconfig.NewManager()`
`731`	`731`	`ifdef.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)`
`733`	`735`	`}`
`734`	`736`
`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`		`-`
`740`	`737`	`if!def.NotMember {`
`741`	`738`	`dbgen.OrganizationMember(t,db, database.OrganizationMember{`
`742`	`739`	`UserID:user.ID,`

Comments

(0)