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

handle both scope and resource permission types #220

Merged
merged 6 commits into from
Feb 25, 2020
Merged

handle both scope and resource permission types #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8f94b3
handle both scope and resource permission types
Feb 12, 2020
5698072
working on tests for scopes
Feb 18, 2020
4c438fa
added tests for scope permissions
Feb 19, 2020
babe011
Merge pull request #1 from ware2go/am/writing-tests
Feb 19, 2020
e8ceb9e
added example to main.tf for keycloak_openid_client_authorization_per…
Feb 19, 2020
e9b1ff1
Merge branch 'master' into permission-types
Feb 20, 2020
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
4 changes: 4 additions & 0 deletions example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,10 @@ resource "keycloak_openid_client_authorization_permission" "resource" {
resources = [
"${keycloak_openid_client_authorization_resource.resource.id}",
]

scopes = [
"${keycloak_openid_client_authorization_scope.resource.id}"
]
}

resource "keycloak_openid_client_authorization_resource" "resource" {
Expand Down
17 changes: 14 additions & 3 deletions keycloak/openid_client_authorization_permission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ type OpenidClientAuthorizationPermission struct {
DecisionStrategy string `json:"decisionStrategy"`
Policies []string `json:"policies"`
Resources []string `json:"resources"`
Scopes []string `json:"scopes"`
Type string `json:"type"`
}

Expand All @@ -26,8 +27,9 @@ func (keycloakClient *KeycloakClient) GetOpenidClientAuthorizationPermission(rea

policies := []OpenidClientAuthorizationPolicy{}
resources := []OpenidClientAuthorizationResource{}
scopes := []OpenidClientAuthorizationScope{}

err := keycloakClient.get(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/resource/%s", realm, resourceServerId, id), &permission, nil)
err := keycloakClient.get(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/%s", realm, resourceServerId, id), &permission, nil)
if err != nil {
return nil, err
}
Expand All @@ -42,6 +44,11 @@ func (keycloakClient *KeycloakClient) GetOpenidClientAuthorizationPermission(rea
return nil, err
}

err = keycloakClient.get(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/%s/scopes", realm, resourceServerId, id), &scopes, nil)
if err != nil {
return nil, err
}

for _, policy := range policies {
permission.Policies = append(permission.Policies, policy.Id)
}
Expand All @@ -50,11 +57,15 @@ func (keycloakClient *KeycloakClient) GetOpenidClientAuthorizationPermission(rea
permission.Resources = append(permission.Resources, resource.Id)
}

for _, resource := range scopes {
permission.Scopes = append(permission.Scopes, resource.Id)
}

return &permission, nil
}

func (keycloakClient *KeycloakClient) NewOpenidClientAuthorizationPermission(permission *OpenidClientAuthorizationPermission) error {
body, _, err := keycloakClient.post(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission", permission.RealmId, permission.ResourceServerId), permission)
body, _, err := keycloakClient.post(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/%s", permission.RealmId, permission.ResourceServerId, permission.Type), permission)
if err != nil {
return err
}
Expand All @@ -66,7 +77,7 @@ func (keycloakClient *KeycloakClient) NewOpenidClientAuthorizationPermission(per
}

func (keycloakClient *KeycloakClient) UpdateOpenidClientAuthorizationPermission(permission *OpenidClientAuthorizationPermission) error {
err := keycloakClient.put(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/resource/%s", permission.RealmId, permission.ResourceServerId, permission.Id), permission)
err := keycloakClient.put(fmt.Sprintf("/realms/%s/clients/%s/authz/resource-server/permission/%s/%s", permission.RealmId, permission.ResourceServerId, permission.Type, permission.Id), permission)
if err != nil {
return err
}
Expand Down
17 changes: 16 additions & 1 deletion provider/resource_keycloak_openid_client_authorization_permission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package provider

import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/mrparkers/terraform-provider-keycloak/keycloak"
"strings"
)

var (
Expand Down Expand Up @@ -57,6 +58,11 @@ func resourceKeycloakOpenidClientAuthorizationPermission() *schema.Resource {
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
},
"scopes": {
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
},
"type": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -70,6 +76,7 @@ func resourceKeycloakOpenidClientAuthorizationPermission() *schema.Resource {
func getOpenidClientAuthorizationPermissionFromData(data *schema.ResourceData) *keycloak.OpenidClientAuthorizationPermission {
var policies []string
var resources []string
var scopes []string
if v, ok := data.GetOk("resources"); ok {
for _, resource := range v.(*schema.Set).List() {
resources = append(resources, resource.(string))
Expand All @@ -80,6 +87,12 @@ func getOpenidClientAuthorizationPermissionFromData(data *schema.ResourceData) *
policies = append(policies, policy.(string))
}
}
if v, ok := data.GetOk("scopes"); ok {
for _, scope := range v.(*schema.Set).List() {
scopes = append(scopes, scope.(string))
}
}

permission := keycloak.OpenidClientAuthorizationPermission{
Id: data.Id(),
ResourceServerId: data.Get("resource_server_id").(string),
Expand All @@ -89,6 +102,7 @@ func getOpenidClientAuthorizationPermissionFromData(data *schema.ResourceData) *
DecisionStrategy: data.Get("decision_strategy").(string),
Type: data.Get("type").(string),
Policies: policies,
Scopes: scopes,
Resources: resources,
}
return &permission
Expand All @@ -103,6 +117,7 @@ func setOpenidClientAuthorizationPermissionData(data *schema.ResourceData, permi
data.Set("decision_strategy", permission.DecisionStrategy)
data.Set("type", permission.Type)
data.Set("policies", permission.Policies)
data.Set("scopes", permission.Scopes)
data.Set("resources", permission.Resources)
}

Expand Down
49 changes: 34 additions & 15 deletions provider/resource_keycloak_openid_client_authorization_permission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,28 @@ package provider

import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/mrparkers/terraform-provider-keycloak/keycloak"
"testing"
)

func TestAccKeycloakOpenidClientAuthorizationPermission_basic(t *testing.T) {
realmName := "terraform-" + acctest.RandString(10)
clientId := "terraform-" + acctest.RandString(10)
resourceName := "terraform-" + acctest.RandString(10)
permissionName := "terraform-" + acctest.RandString(10)
scopeName := "terraform-" + acctest.RandString(10)

resource.Test(t, resource.TestCase{
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t) },
CheckDestroy: testAccCheckKeycloakOpenidClientAuthorizationPermissionDestroy(),
Steps: []resource.TestStep{
{
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName),
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName, scopeName),
Check: testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
},
},
Expand All @@ -35,14 +37,15 @@ func TestAccKeycloakOpenidClientAuthorizationPermission_createAfterManualDestroy
clientId := "terraform-" + acctest.RandString(10)
resourceName := "terraform-" + acctest.RandString(10)
permissionName := "terraform-" + acctest.RandString(10)
scopeName := "terraform-" + acctest.RandString(10)

resource.Test(t, resource.TestCase{
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t) },
CheckDestroy: testAccCheckKeycloakOpenidClientAuthorizationPermissionDestroy(),
Steps: []resource.TestStep{
{
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName),
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName, scopeName),
Check: testAccCheckKeycloakOpenidClientAuthorizationPermissionFetch("keycloak_openid_client_authorization_permission.test", authorizationPermission),
},
{
Expand All @@ -54,7 +57,7 @@ func TestAccKeycloakOpenidClientAuthorizationPermission_createAfterManualDestroy
t.Fatal(err)
}
},
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName),
Config: testKeycloakOpenidClientAuthorizationPermission_basic(realmName, clientId, resourceName, permissionName, scopeName),
Check: testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
},
},
Expand All @@ -67,21 +70,22 @@ func TestAccKeycloakOpenidClientAuthorizationPermission_basicUpdateRealm(t *test
clientId := "terraform-" + acctest.RandString(10)
resourceName := "terraform-" + acctest.RandString(10)
permissionName := "terraform-" + acctest.RandString(10)
scopeName := "terraform-" + acctest.RandString(10)

resource.Test(t, resource.TestCase{
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t) },
CheckDestroy: testAccCheckKeycloakOpenidClientAuthorizationPermissionDestroy(),
Steps: []resource.TestStep{
{
Config: testKeycloakOpenidClientAuthorizationPermission_basic(firstRealm, clientId, resourceName, permissionName),
Config: testKeycloakOpenidClientAuthorizationPermission_basic(firstRealm, clientId, resourceName, permissionName, scopeName),
Check: resource.ComposeTestCheckFunc(
testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
resource.TestCheckResourceAttr("keycloak_openid_client_authorization_permission.test", "realm_id", firstRealm),
),
},
{
Config: testKeycloakOpenidClientAuthorizationPermission_basic(secondRealm, clientId, resourceName, permissionName),
Config: testKeycloakOpenidClientAuthorizationPermission_basic(secondRealm, clientId, resourceName, permissionName, scopeName),
Check: resource.ComposeTestCheckFunc(
testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
resource.TestCheckResourceAttr("keycloak_openid_client_authorization_permission.test", "realm_id", secondRealm),
Expand All @@ -94,6 +98,7 @@ func TestAccKeycloakOpenidClientAuthorizationPermission_basicUpdateRealm(t *test
func TestAccKeycloakOpenidClientAuthorizationPermission_basicUpdateAll(t *testing.T) {
realmName := "terraform-" + acctest.RandString(10)
clientId := "terraform-" + acctest.RandString(10)
scopeName := "terraform-" + acctest.RandString(10)

firstAuthrorizationPermission := &keycloak.OpenidClientAuthorizationPermission{
RealmId: realmName,
Expand All @@ -113,11 +118,11 @@ func TestAccKeycloakOpenidClientAuthorizationPermission_basicUpdateAll(t *testin
CheckDestroy: testAccCheckKeycloakOpenidClientAuthorizationPermissionDestroy(),
Steps: []resource.TestStep{
{
Config: testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId, firstAuthrorizationPermission, acctest.RandString(10)),
Config: testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId, firstAuthrorizationPermission, acctest.RandString(10), scopeName),
Check: testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
},
{
Config: testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId, secondAuthrorizationPermission, acctest.RandString(10)),
Config: testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId, secondAuthrorizationPermission, acctest.RandString(10), scopeName),
Check: testAccCheckKeycloakOpenidClientAuthorizationPermissionExists("keycloak_openid_client_authorization_permission.test"),
},
},
Expand Down Expand Up @@ -193,7 +198,7 @@ func getKeycloakOpenidClientAuthorizationPermissionFromState(s *terraform.State,
return authorizationPermission, nil
}

func testKeycloakOpenidClientAuthorizationPermission_basic(realm, clientId, resourceName, permissionName string) string {
func testKeycloakOpenidClientAuthorizationPermission_basic(realm, clientId, resourceName, permissionName, scopeName string) string {
return fmt.Sprintf(`
resource keycloak_realm test {
realm = "%s"
Expand Down Expand Up @@ -225,17 +230,24 @@ resource keycloak_openid_client_authorization_resource test {
]
}

resource keycloak_openid_client_authorization_scope test {
resource_server_id = "${keycloak_openid_client.test.resource_server_id}"
name = "%s"
realm_id = "${keycloak_realm.test.id}"
}

resource keycloak_openid_client_authorization_permission test {
resource_server_id = "${keycloak_openid_client.test.resource_server_id}"
realm_id = "${keycloak_realm.test.id}"
name = "%s"
policies = ["${data.keycloak_openid_client_authorization_policy.default.id}"]
resources = ["${keycloak_openid_client_authorization_resource.test.id}"]
resources = ["${keycloak_openid_client_authorization_resource.test.id}"]

}
`, realm, clientId, resourceName, permissionName)
`, realm, clientId, resourceName, scopeName, permissionName)
}

func testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId string, authorizationPermission *keycloak.OpenidClientAuthorizationPermission, resourceName string) string {
func testKeycloakOpenidClientAuthorizationPermission_basicFromInterface(clientId string, authorizationPermission *keycloak.OpenidClientAuthorizationPermission, resourceName, scopeName string) string {
return fmt.Sprintf(`
resource keycloak_realm test {
realm = "%s"
Expand All @@ -260,20 +272,27 @@ data keycloak_openid_client_authorization_policy default {
resource keycloak_openid_client_authorization_resource resource {
resource_server_id = "${keycloak_openid_client.test.resource_server_id}"
name = "%s"
realm_id = "${keycloak_realm.test.id}"
realm_id = "${keycloak_realm.test.id}"

uris = [
"/endpoint/*"
]
}

resource keycloak_openid_client_authorization_scope test {
resource_server_id = "${keycloak_openid_client.test.resource_server_id}"
name = "%s"
realm_id = "${keycloak_realm.test.id}"
}

resource keycloak_openid_client_authorization_permission test {
resource_server_id = "${keycloak_openid_client.test.resource_server_id}"
realm_id = "${keycloak_realm.test.id}"
name = "%s"
policies = ["${data.keycloak_openid_client_authorization_policy.default.id}"]
resources = ["${keycloak_openid_client_authorization_resource.resource.id}"]
description = "%s"
description = "%s"
scopes = ["${keycloak_openid_client_authorization_scope.test.id}"]
}
`, authorizationPermission.RealmId, clientId, resourceName, authorizationPermission.Name, authorizationPermission.Description)
`, authorizationPermission.RealmId, clientId, resourceName, scopeName, authorizationPermission.Name, authorizationPermission.Description)
}