adutra commented on code in PR #5107:
URL: https://github.com/apache/polaris/pull/5107#discussion_r3614848328


##########
runtime/service/src/intTest/java/org/apache/polaris/service/it/RestCatalogKeycloakFileIT.java:
##########
@@ -19,28 +19,62 @@
 package org.apache.polaris.service.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.service.it.env.ClientPrincipal;
 import org.apache.polaris.service.it.env.ManagementApi;
 import org.apache.polaris.service.it.env.PolarisClient;
 import 
org.apache.polaris.service.it.test.PolarisRestCatalogFileIntegrationTest;
-import org.apache.polaris.test.commons.keycloak.KeycloakAccess;
-import org.apache.polaris.test.commons.keycloak.KeycloakProfile;
+import org.apache.polaris.test.keycloak.Keycloak;
+import org.apache.polaris.test.keycloak.KeycloakAccess;
+import org.apache.polaris.test.keycloak.KeycloakTestResource;
 
 @QuarkusIntegrationTest
-@TestProfile(KeycloakProfile.class)
+@TestProfile(RestCatalogKeycloakFileIT.Profile.class)
 public class RestCatalogKeycloakFileIT extends 
PolarisRestCatalogFileIntegrationTest {
 
-  KeycloakAccess keycloak;
+  public static class Profile implements QuarkusTestProfile {
+
+    @Override
+    public Map<String, String> getConfigOverrides() {
+      return Map.of(
+          "quarkus.oidc.tenant-enabled", "true",
+          "quarkus.oidc.client-id", "polaris",
+          "polaris.authentication.type", "external",
+          "polaris.oidc.principal-mapper.name-claim-path", 
KeycloakAccess.PRINCIPAL_NAME_CLAIM,
+          "polaris.oidc.principal-roles-mapper.filter", "PRINCIPAL_ROLE:.*");
+    }
+
+    @Override
+    public List<TestResourceEntry> testResources() {
+      Optional<String> clients =
+          RootCredentialsSet.fromEnvironment().credentials().values().stream()
+              .map(creds -> creds.clientId() + "=" + creds.clientSecret())
+              .reduce((a, b) -> a + "," + b);
+      return List.of(
+          new TestResourceEntry(
+              KeycloakTestResource.class,
+              Map.of(
+                  KeycloakTestResource.ROLES_INIT_ARG, "PRINCIPAL_ROLE:ALL",
+                  KeycloakTestResource.USERS_INIT_ARG, "root=s3cr3t",
+                  KeycloakTestResource.GRANTS_INIT_ARG, 
"root=PRINCIPAL_ROLE:ALL",
+                  KeycloakTestResource.CLIENTS_INIT_ARG, clients.orElse(""))));
+    }
+  }
+
+  @Keycloak KeycloakAccess keycloak;
 
   @Override
   protected ClientPrincipal createTestPrincipal(
       PolarisClient client, String principalName, String principalRole) {
     ClientPrincipal principal = super.createTestPrincipal(client, 
principalName, principalRole);
-    keycloak.createRole(principalRole);
-    keycloak.createUser(principalName);
-    keycloak.assignRoleToUser(principalRole, principalName);
+    keycloak.createRole("PRINCIPAL_ROLE:" + principalRole);
+    keycloak.createUser(principalName, "s3cr3t");
+    keycloak.assignRoleToUser("PRINCIPAL_ROLE:" + principalRole, 
principalName);

Review Comment:
   Fixed the javadocs.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to