Skip to content
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

Jump to bottom

Add OIDC role mapping #137

Merged
merged 5 commits into from
Oct 10, 2024
Merged

Add OIDC role mapping #137

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
60ea8ee
Add OIDC role mapping
akhter-ali-idexx Oct 9, 2024
675e3bc
Remove duplicate or
akhter-ali-idexx Oct 9, 2024
740049b
Add test for role mapping
akhter-ali-idexx Oct 9, 2024
c74d1bf
Add an example of a role mapping
akhter-ali-idexx Oct 9, 2024
ad7d6aa
Add test execution
akhter-ali-idexx Oct 9, 2024
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
6 changes: 3 additions & 3 deletions pkg/platform/resource_oidc_identity_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ func (r *odicIdentityMappingResource) Schema(ctx context.Context, req resource.S
Required: true,
Validators: []validator.String{
stringvalidator.RegexMatches(
regexp.MustCompile(`^(applied-permissions\/admin|applied-permissions\/user|applied-permissions\/groups:.+)$`),
"must start with either 'applied-permissions/admin', 'applied-permissions/user', or 'applied-permissions/groups:'",
regexp.MustCompile(`^(applied-permissions\/admin|applied-permissions\/user|applied-permissions\/groups|applied-permissions\/roles:.+)$`),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trailing : is missing for the groups.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The : is still missing. Should be applied-permissions\/groups:

"must start with either 'applied-permissions/admin', 'applied-permissions/user', 'applied-permissions/groups:', or 'applied-permissions/roles:'",
),
},
MarkdownDescription: "Scope of the token. Must start with `applied-permissions/user`, `applied-permissions/admin`, or `applied-permissions/groups:`. Group names must be comma-separated, double quotes wrapped, e.g. `applied-permissions/groups:\\\"readers\\\",\\\"my-group\\\",`",
MarkdownDescription: "Scope of the token. Must start with `applied-permissions/user`, `applied-permissions/admin`, `applied-permissions/roles`, or `applied-permissions/groups:`. Group names must be comma-separated, double quotes wrapped, e.g. `applied-permissions/groups:\\\"readers\\\",\\\"my-group\\\",` Role permissions must be comma-separated, double quotes wrapped, and provide a project name, e.g. `applied-permissions:roles:<Your Artifactory Project Name>:\"Developer\",\"Viewer\"",
},
"audience": schema.StringAttribute{
Optional: true,
Expand Down
62 changes: 62 additions & 0 deletions pkg/platform/resource_oidc_identity_mapping_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,68 @@ func TestAccOIDCIdentityMapping_full(t *testing.T) {
})
}

func TestAccOIDCIdentityMapping_roles_scope(t *testing.T) {
_, _, configName := testutil.MkNames("test-oidc-configuration", "platform_oidc_configuration")
_, fqrn, identityMappingName := testutil.MkNames("test-oidc-identity-mapping", "platform_oidc_identity_mapping")

temp := `
resource "platform_oidc_configuration" "{{ .configName }}" {
name = "{{ .configName }}"
description = "Test description"
issuer_url = "{{ .issuerURL }}"
provider_type = "{{ .providerType }}"
audience = "{{ .audience }}"
}

resource "platform_oidc_identity_mapping" "{{ .identityMappingName }}" {
name = "{{ .identityMappingName }}"
description = "Test description"
provider_name = platform_oidc_configuration.{{ .configName }}.name
priority = {{ .priority }}
claims_json = jsonencode({
sub = "{{ .sub }}",
updated_at = 1490198843
})
token_spec = {
scope = "applied-permissions/roles:myProject:\"developer\",\"qa\""
audience = "*@*"
expires_in = 120
}
}`

testData := map[string]string{
"configName": configName,
"identityMappingName": identityMappingName,
"issuerURL": "https://tempurl.org",
"providerType": "generic",
"audience": "test-audience",
"priority": fmt.Sprintf("%d", testutil.RandomInt()),
"sub": fmt.Sprintf("test-subscriber-%d", testutil.RandomInt()),
"scope": "applied-permissions/roles:myProject:\"developer\",\"qa\"",
}

config := util.ExecuteTemplate(identityMappingName, temp, testData)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProviders(),
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(fqrn, "name", testData["identityMappingName"]),
resource.TestCheckResourceAttr(fqrn, "priority", testData["priority"]),
resource.TestCheckResourceAttr(fqrn, "claims_json", fmt.Sprintf("{\"sub\":\"%s\",\"updated_at\":1490198843}", testData["sub"])),
resource.TestCheckResourceAttr(fqrn, "token_spec.scope", "applied-permissions/roles:myProject:\"developer\",\"qa\""),
resource.TestCheckResourceAttr(fqrn, "token_spec.audience", "*@*"),
resource.TestCheckResourceAttr(fqrn, "token_spec.expires_in", "120"),
),
},
},
})

}

func TestAccOIDCIdentityMapping_groups_scope(t *testing.T) {
_, _, configName := testutil.MkNames("test-oidc-configuration", "platform_oidc_configuration")
_, fqrn, identityMappingName := testutil.MkNames("test-oidc-identity-mapping", "platform_oidc_identity_mapping")
Expand Down
Loading