Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3accbb
chore: prevent null loading sync settings (#17430)
Emyrk Apr 16, 2025
60c53d0
Merge branch 'release/2.21' into cherry-pick-8288d8-release/2.21
matifali Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore: prevent null loading sync settings (#17430) 
Nulls passed to the frontend caused a page to fail to load.

`Record<string,string>` can be `nil` in golang
  • Loading branch information
@Emyrk
Emyrk authored Apr 16, 2025
commit e3accbbff85b9d9acedc6146d7a51a325126c7b9
3 changes: 3 additions & 0 deletions coderd/idpsync/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
3 changes: 3 additions & 0 deletions coderd/idpsync/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
3 changes: 3 additions & 0 deletions coderd/idpsync/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Loading