Skip to content

Commit

Permalink
chore: upgrade to Keycloak v6.0.1 (#106)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewChubatiuk authored and mrparkers committed May 9, 2019
1 parent d57c481 commit f607778
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
test-template: &test-template
docker:
- image: circleci/golang:1.11.4
- image: jboss/keycloak:4.8.3.Final
- image: jboss/keycloak:6.0.1
environment:
DB_VENDOR: H2
KEYCLOAK_LOGLEVEL: DEBUG
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
ports:
- 8389:389
keycloak:
image: jboss/keycloak:4.8.3.Final
image: jboss/keycloak:6.0.1
depends_on:
- postgres
- openldap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

// All openid clients in Keycloak will automatically have these scopes listed as "optional client scopes".
var preAssignedOptionalClientScopes = []string{"address", "phone", "offline_access"}
var preAssignedOptionalClientScopes = []string{"address", "phone", "offline_access", "microprofile-jwt"}

func TestAccKeycloakOpenidClientOptionalScopes_basic(t *testing.T) {
realm := "terraform-realm-" + acctest.RandString(10)
Expand Down Expand Up @@ -265,7 +265,7 @@ func TestAccKeycloakOpenidClientOptionalScopes_noImportNeeded(t *testing.T) {
}

// by optional, keycloak clients have the optional scopes "address", "phone" and
// "offline_access" attached. if you create this resource with only one scope, it
// "offline_access" "microprofile-jwt" attached. if you create this resource with only one scope, it
// won't remove these two scopes, because the creation of a new resource should
// not result in anything destructive. thus, a following plan will not be empty,
// as terraform will think it needs to remove these scopes, which is okay to do
Expand Down Expand Up @@ -426,6 +426,7 @@ resource "keycloak_openid_client_optional_scopes" "optional_scopes" {
"address",
"phone",
"offline_access",
"microprofile-jwt",
"${keycloak_openid_client_scope.client_scope.name}"
]
}
Expand Down Expand Up @@ -506,6 +507,7 @@ resource "keycloak_openid_client_optional_scopes" "optional_scopes" {
"address",
"phone",
"offline_access",
"microprofile-jwt",
"${keycloak_openid_client_scope.client_scope.name}"
]
}
Expand Down Expand Up @@ -540,6 +542,7 @@ resource "keycloak_openid_client_optional_scopes" "optional_scopes" {
"address",
"phone",
"offline_access",
"microprofile-jwt",
"${keycloak_openid_client_scope.client_scope.name}"
]
}
Expand Down Expand Up @@ -602,6 +605,7 @@ resource "keycloak_openid_client_optional_scopes" "optional_scopes" {
"address",
"phone",
"offline_access",
"microprofile-jwt",
"${keycloak_openid_client_scope.client_scope.name}"
]
}
Expand Down

0 comments on commit f607778

Please sign in to comment.