Commitb56ffe0

and

authored

chore: prevent null loading sync settings (cherry-pick#17430) (#17487)

Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>

1 parentfc8454b commitb56ffe0Copy full SHA for b56ffe0

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,9 @@ func (s *GroupSyncSettings) Set(v string) error {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`func (s*GroupSyncSettings)String()string {`
	`271`	`+ifs.Mapping==nil {`
	`272`	`+s.Mapping=make(map[string][]uuid.UUID)`
	`273`	`+}`
`271`	`274`	`returnruntimeconfig.JSONString(s)`
`272`	`275`	`}`
`273`	`276`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,9 @@ func (s *OrganizationSyncSettings) Set(v string) error {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`func (s*OrganizationSyncSettings)String()string {`
	`171`	`+ifs.Mapping==nil {`
	`172`	`+s.Mapping=make(map[string][]uuid.UUID)`
	`173`	`+}`
`171`	`174`	`returnruntimeconfig.JSONString(s)`
`172`	`175`	`}`
`173`	`176`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,5 +284,8 @@ func (s *RoleSyncSettings) Set(v string) error {`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`func (s*RoleSyncSettings)String()string {`
	`287`	`+ifs.Mapping==nil {`
	`288`	`+s.Mapping=make(map[string][]string)`
	`289`	`+}`
`287`	`290`	`returnruntimeconfig.JSONString(s)`
`288`	`291`	`}`

Comments

(0)