Skip to content

chore: load 'assign_default' value from legacy value #17428

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 5 commits into from
Apr 16, 2025
Merged

chore: load 'assign_default' value from legacy value #17428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
926fc00
chore: 'assign_default' value should be loaded from legacy value
Emyrk Apr 16, 2025
b11533b
parallelize test
Emyrk Apr 16, 2025
1a92f70
Merge branch 'main' into stevenmasley/org_sync_settings_fixed
Emyrk Apr 16, 2025
5a53f68
Update coderd/idpsync/organization.go
Emyrk Apr 16, 2025
b7ebb06
fix indent
Emyrk Apr 16, 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
11 changes: 11 additions & 0 deletions coderd/idpsync/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,17 @@ type OrganizationSyncSettings struct {
}

func (s *OrganizationSyncSettings) Set(v string) error {
legacyCheck := make(map[string]any)
err := json.Unmarshal([]byte(v), &legacyCheck)
if assign, ok := legacyCheck["AssignDefault"]; err == nil && ok {
// The legacy JSON key was 'AssignDefault' instead of 'assign_default'
// Set the default value from the legacy if it exists.
isBool, ok := assign.(bool)
if ok {
s.AssignDefault = isBool
}
}

return json.Unmarshal([]byte(v), s)
}

Expand Down
68 changes: 68 additions & 0 deletions coderd/idpsync/organizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package idpsync_test

import (
"database/sql"
"fmt"
"testing"

"github.com/golang-jwt/jwt/v4"
Expand All @@ -19,6 +20,73 @@ import (
"github.com/coder/coder/v2/testutil"
)

func TestFromLegacySettings(t *testing.T) {
t.Parallel()

legacy := func(assignDefault bool) string {
return fmt.Sprintf(`{
"Field":"groups",
"Mapping":{
"engineering":[
"10b2bd19-f5ca-4905-919f-bf02e95e3b6a"
]
},
"AssignDefault":%t
}`, assignDefault)
}

t.Run("AssignDefault,True", func(t *testing.T) {
t.Parallel()

var settings idpsync.OrganizationSyncSettings
settings.AssignDefault = true
err := settings.Set(legacy(true))
require.NoError(t, err)

require.Equal(t, settings.Field, "groups", "field")
require.Equal(t, settings.Mapping, map[string][]uuid.UUID{
"engineering": {
uuid.MustParse("10b2bd19-f5ca-4905-919f-bf02e95e3b6a"),
},
}, "mapping")
require.True(t, settings.AssignDefault, "assign default")
})

t.Run("AssignDefault,False", func(t *testing.T) {
t.Parallel()

var settings idpsync.OrganizationSyncSettings
settings.AssignDefault = true
err := settings.Set(legacy(false))
require.NoError(t, err)

require.Equal(t, settings.Field, "groups", "field")
require.Equal(t, settings.Mapping, map[string][]uuid.UUID{
"engineering": {
uuid.MustParse("10b2bd19-f5ca-4905-919f-bf02e95e3b6a"),
},
}, "mapping")
require.False(t, settings.AssignDefault, "assign default")
})

t.Run("CorrectAssign", func(t *testing.T) {
t.Parallel()

var settings idpsync.OrganizationSyncSettings
settings.AssignDefault = true
err := settings.Set(legacy(false))
require.NoError(t, err)

require.Equal(t, settings.Field, "groups", "field")
require.Equal(t, settings.Mapping, map[string][]uuid.UUID{
"engineering": {
uuid.MustParse("10b2bd19-f5ca-4905-919f-bf02e95e3b6a"),
},
}, "mapping")
require.False(t, settings.AssignDefault, "assign default")
})
}

func TestParseOrganizationClaims(t *testing.T) {
t.Parallel()

Expand Down
Loading