Skip to content

Commit

Permalink
Support for multiple realm definitions inside one YAML file.
Browse files Browse the repository at this point in the history
Fixes #593
  • Loading branch information
jkroepke committed Dec 18, 2021
1 parent 5a73de7 commit d0149e6
Show file tree
Hide file tree
Showing 7 changed files with 4,331 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Used in docker-compose
# shellcheck disable=SC2034
KEYCLOAK_VERSION=15.0.2
KEYCLOAK_VERSION=16.0.0
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
fail-fast: false
matrix:
env:
- KEYCLOAK_VERSION: 12.0.4
- KEYCLOAK_VERSION: 13.0.1
- KEYCLOAK_VERSION: 14.0.0
- KEYCLOAK_VERSION: 15.0.2
- KEYCLOAK_VERSION: 15.1.1
- KEYCLOAK_VERSION: 16.0.0
steps:
- uses: actions/checkout@v2.4.0
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ jobs:
fail-fast: false
matrix:
env:
- KEYCLOAK_VERSION: 12.0.4
- KEYCLOAK_VERSION: 13.0.1
- KEYCLOAK_VERSION: 14.0.0
- KEYCLOAK_VERSION: 15.0.2
- KEYCLOAK_VERSION: 15.1.1
- KEYCLOAK_VERSION: 16.0.0
steps:
- uses: actions/checkout@v2.4.0

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]

### Added
- Added Keycloak 16 support, drop Keycloak 12 support
- Support for multiple realm definitions inside one YAML file.
- Workaround for creating client authorization resources, if a username is defined an owner through `owner.name`. Keycloak [excepts](https://github.com/keycloak/keycloak/blob/bfce612641a70e106b20b136431f0e4046b5c37f/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java#L2647-L2649) `owner.id` here instead `owner.name`. See [#589](https://github.com/adorsys/keycloak-config-cli/pull/589)

Expand Down
1 change: 1 addition & 0 deletions contrib/scripts/upgrade-keycloak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if [[ "${KEYCLOAK_VERSION_OLD%%.*}" -eq "${KEYCLOAK_VERSION_NEW%%.*}" ]]; then
_sedi "s/- KEYCLOAK_VERSION: ${KEYCLOAK_VERSION_OLD}/- KEYCLOAK_VERSION: ${KEYCLOAK_VERSION_NEW}/" "${GIT_ROOT}/.github/workflows/ci.yaml"
_sedi "s/- KEYCLOAK_VERSION: ${KEYCLOAK_VERSION_OLD}/- KEYCLOAK_VERSION: ${KEYCLOAK_VERSION_NEW}/" "${GIT_ROOT}/.github/workflows/release.yaml"
else
KEYCLOAK_VERSION_NEW="${KEYCLOAK_VERSION_NEW%%.*}"
KEYCLOAK_VERSION_UNSUPPORTED=$((KEYCLOAK_VERSION_NEW-4))

_sedi "/- KEYCLOAK_VERSION: ${KEYCLOAK_VERSION_UNSUPPORTED}/d" "${GIT_ROOT}/.github/workflows/ci.yaml"
Expand Down
Loading

0 comments on commit d0149e6

Please sign in to comment.