Skip to content

chore(camel-test-infra-keycloak): upgrade keycloak.container to 26.6.2 #23356

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
apupier merged 2 commits into from
May 22, 2026
+27 −3
Merged

chore(camel-test-infra-keycloak): upgrade keycloak.container to 26.6.2 #23356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f67ee86
chore(camel-test-infra-keycloak): upgrade keycloak.container to 26.6.2
github-actions[bot] May 20, 2026
f168422
Configure Keycloak 26.6.2 test to include the client ID in the aud claim
apupier May 21, 2026
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
28 changes: 26 additions & 2 deletions .../test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.camel.component.keycloak.security;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -53,6 +54,7 @@
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.ProtocolMapperRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
Expand Down Expand Up @@ -172,13 +174,35 @@ private static void createTestClient() {

// Get client secret
TEST_CLIENT_SECRET = clientResource.getSecret().getValue();

// Add audience mapper to include this client in the token audience
// This is required for Keycloak 26.6.2+ token introspection
addAudienceMapper(clientResource);

LOG.info("Created test client: {} with secret for introspection", TEST_CLIENT_ID);
} else {
throw new RuntimeException("Failed to create client. Status: " + response.getStatus());
}
response.close();
}

private static void addAudienceMapper(ClientResource clientResource) {
ProtocolMapperRepresentation audienceMapper
= new ProtocolMapperRepresentation();
audienceMapper.setName("audience-mapper");
audienceMapper.setProtocol("openid-connect");
audienceMapper.setProtocolMapper("oidc-audience-mapper");

Map<String, String> config = new HashMap<>();
config.put("included.client.audience", TEST_CLIENT_ID);
config.put("access.token.claim", "true");
config.put("id.token.claim", "false");
audienceMapper.setConfig(config);

clientResource.getProtocolMappers().createMapper(audienceMapper);
LOG.info("Added audience mapper to client: {}", TEST_CLIENT_ID);
}

private static void createTestRoles() {
// Create admin role
RoleRepresentation adminRole = new RoleRepresentation();
Expand Down Expand Up @@ -725,8 +749,8 @@ void testCaffeineCacheClearOperation() throws Exception {
*/
private String getAccessToken(String username, String password) {
try (Client client = ClientBuilder.newClient()) {
String tokenUrl = keycloakService.getKeycloakServerUrl() + "/realms/" + TEST_REALM_NAME
+ "/protocol/openid-connect/token";
String serverRealm = keycloakService.serverUrl() + "/realms/" + TEST_REALM_NAME;
String tokenUrl = serverRealm + "/protocol/openid-connect/token";

Form form = new Form()
.param("grant_type", "password")
Expand Down
2 changes: 1 addition & 1 deletion ...oak/src/main/resources/org/apache/camel/test/infra/keycloak/services/container.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## Keycloak container configuration for test-infra
keycloak.container=mirror.gcr.io/keycloak/keycloak:26.6.1
keycloak.container=mirror.gcr.io/keycloak/keycloak:26.6.2
keycloak.container.ppc64le=icr.io/ppc64le-oss/keycloak-ppc64le:v26.0.5-bv
keycloak.container.version.exclude=nightly