Skip to content

Commit

Permalink
Allow custom access token generation in integration test env (apache#789
Browse files Browse the repository at this point in the history
)

Polaris allows running the integration test suite against
an external (managed) server.

This change further enables customizing access tokens for
these tests according to the test env. needs.
  • Loading branch information
dimas-b authored Jan 15, 2025
1 parent 5e1de4f commit 56f2fc5
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.service.it.env;

import jakarta.ws.rs.client.Client;
import org.apache.polaris.service.it.ext.PolarisAccessManager;

/**
* This class obtains access tokens from the {@code v1/oauth/tokens} endpoint defined by the Iceberg
* REST Catalog spec.
*
* <p>Note: even though this endpoint is still part of the Iceberg REST Catalog spec it has been
* deprecated per <a href="https://github.com/apache/iceberg/pull/10603">Iceberg PR#10603</a>.
*/
public class IcebergTokenAccessManager implements PolarisAccessManager {
private final Client client;

public IcebergTokenAccessManager(Client client) {
this.client = client;
}

@Override
public String obtainAccessToken(PolarisApiEndpoints endpoints, ClientCredentials credentials) {
CatalogApi anon = new CatalogApi(client, endpoints, null, endpoints.catalogApiEndpoint());
return anon.obtainToken(credentials);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ public String obtainToken(PrincipalWithCredentials principal) {

/** Requests an access token from the Polaris server for the given {@link ClientCredentials}. */
public String obtainToken(ClientCredentials credentials) {
CatalogApi anon = new CatalogApi(client, endpoints, null, endpoints.catalogApiEndpoint());
return anon.obtainToken(credentials);
return polarisServerManager().accessManager().obtainAccessToken(endpoints, credentials);
}

private boolean ownedName(String name) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.service.it.ext;

import org.apache.polaris.service.it.env.ClientCredentials;
import org.apache.polaris.service.it.env.PolarisApiEndpoints;

public interface PolarisAccessManager {

String obtainAccessToken(PolarisApiEndpoints endpoints, ClientCredentials credentials);
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import java.util.ServiceLoader;
import org.apache.polaris.service.it.env.IcebergTokenAccessManager;
import org.apache.polaris.service.it.env.Server;
import org.junit.jupiter.api.extension.ExtensionContext;

Expand All @@ -50,6 +51,10 @@ public interface PolarisServerManager {
*/
Server serverForContext(ExtensionContext context);

default PolarisAccessManager accessManager() {
return new IcebergTokenAccessManager(createClient());
}

/** Create a new HTTP client for accessing the server targeted by tests. */
default Client createClient() {
return ClientBuilder.newBuilder()
Expand Down

0 comments on commit 56f2fc5

Please sign in to comment.