Skip to content

Fix merge conflict in CatalogFederationIntegrationTest #2420

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
merged 2 commits into from
Aug 21, 2025
Merged

Fix merge conflict in CatalogFederationIntegrationTest #2420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f058a0
fixed
eric-maynard Aug 21, 2025
68e83ff
cleanups
eric-maynard Aug 21, 2025
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
6 changes: 3 additions & 3 deletions ...ts/src/main/java/org/apache/polaris/service/it/test/CatalogFederationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public class CatalogFederationIntegrationTest {
private static PolarisClient client;
private static ManagementApi managementApi;
private static PolarisApiEndpoints endpoints;
private static ClientCredentials adminCredentials;
private static SparkSession spark;
private static String sparkToken;
private static String adminToken;

private static final String PRINCIPAL_NAME = "test-catalog-federation-user";
private static final String LOCAL_CATALOG_NAME = "test_catalog_local";
Expand All @@ -82,8 +82,8 @@ public class CatalogFederationIntegrationTest {
static void setup(PolarisApiEndpoints apiEndpoints, ClientCredentials credentials) {
endpoints = apiEndpoints;
client = polarisClient(endpoints);
managementApi = client.managementApi(credentials);
adminCredentials = credentials;
adminToken = client.obtainToken(credentials);
managementApi = client.managementApi(adminToken);
sparkToken = client.obtainToken(credentials);
}

Expand Down