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

gcp-cherry-pick-bot[bot] · Emyrk · matifali · web-flow · commit b760f1d3aa74 · 2025-04-22T18:40:25.000+05:00
Co-authored-by: Steven Masley &lt;Emyrk@users.noreply.github.com&gt;
Co-authored-by: M Atif Ali &lt;atif@coder.com&gt;
diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go
@@ -268,6 +268,9 @@ func (s *GroupSyncSettings) Set(v string) error {
 }
 
 func (s *GroupSyncSettings) String() string {
+	if s.Mapping == nil {
+		s.Mapping = make(map[string][]uuid.UUID)
+	}
 	return runtimeconfig.JSONString(s)
 }
 
diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go
@@ -168,6 +168,9 @@ func (s *OrganizationSyncSettings) Set(v string) error {
 }
 
 func (s *OrganizationSyncSettings) String() string {
+	if s.Mapping == nil {
+		s.Mapping = make(map[string][]uuid.UUID)
+	}
 	return runtimeconfig.JSONString(s)
 }
 
diff --git a/coderd/idpsync/role.go b/coderd/idpsync/role.go
@@ -286,5 +286,8 @@ func (s *RoleSyncSettings) Set(v string) error {
 }
 
 func (s *RoleSyncSettings) String() string {
+	if s.Mapping == nil {
+		s.Mapping = make(map[string][]string)
+	}
 	return runtimeconfig.JSONString(s)
 }

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`	`+ if s.Mapping == nil {`
	`272`	`+ s.Mapping = make(map[string][]uuid.UUID)`
	`273`	`+ }`
`271`	`274`	`return runtimeconfig.JSONString(s)`
`272`	`275`	`}`
`273`	`276`
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`	`+ if s.Mapping == nil {`
	`172`	`+ s.Mapping = make(map[string][]uuid.UUID)`
	`173`	`+ }`
`171`	`174`	`return runtimeconfig.JSONString(s)`
`172`	`175`	`}`
`173`	`176`
Original file line number	Diff line number	Diff line change
`@@ -286,5 +286,8 @@ func (s *RoleSyncSettings) Set(v string) error {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`func (s *RoleSyncSettings) String() string {`
	`289`	`+ if s.Mapping == nil {`
	`290`	`+ s.Mapping = make(map[string][]string)`
	`291`	`+ }`
`289`	`292`	`return runtimeconfig.JSONString(s)`
`290`	`293`	`}`