Skip to content

Commit f7487f6

Browse files
authored
Fix merge conflict in CatalogFederationIntegrationTest (#2420)
#2344 added a new test for catalog federation, but it looks like an undetected conflict with concurrent changes related to authentication have broken the test in main.
1 parent c2209cf commit f7487f6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

integration-tests/src/main/java/org/apache/polaris/service/it/test/CatalogFederationIntegrationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public class CatalogFederationIntegrationTest {
6363
private static PolarisClient client;
6464
private static ManagementApi managementApi;
6565
private static PolarisApiEndpoints endpoints;
66-
private static ClientCredentials adminCredentials;
6766
private static SparkSession spark;
6867
private static String sparkToken;
68+
private static String adminToken;
6969

7070
private static final String PRINCIPAL_NAME = "test-catalog-federation-user";
7171
private static final String LOCAL_CATALOG_NAME = "test_catalog_local";
@@ -82,8 +82,8 @@ public class CatalogFederationIntegrationTest {
8282
static void setup(PolarisApiEndpoints apiEndpoints, ClientCredentials credentials) {
8383
endpoints = apiEndpoints;
8484
client = polarisClient(endpoints);
85-
managementApi = client.managementApi(credentials);
86-
adminCredentials = credentials;
85+
adminToken = client.obtainToken(credentials);
86+
managementApi = client.managementApi(adminToken);
8787
sparkToken = client.obtainToken(credentials);
8888
}
8989

0 commit comments

Comments
 (0)