Skip to content
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

Auth Manager API part 2: AuthManager #11809

Merged
merged 6 commits into from
Dec 20, 2024
Merged

Auth Manager API part 2: AuthManager #11809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fdd1941
Auth Manager API part 2: AuthManager, AuthSession
adutra Nov 21, 2024
28db239
[review] close()
adutra Dec 18, 2024
df4243b
[review] nits
adutra Dec 18, 2024
e3c4b31
HTTPAuthSession close()
adutra Dec 18, 2024
52f4423
mainSession -> catalogSession
adutra Dec 19, 2024
2a3f4af
AuthManager constructor
adutra Dec 19, 2024
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
Prev Previous commit
Next Next commit
mainSession -> catalogSession
  • Loading branch information
@adutra
adutra committed Dec 19, 2024
commit 52f4423858a7e217fba223d06bda0e25c1a440a5
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/iceberg/rest/auth/AuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public interface AuthManager extends AutoCloseable {
* <p>This method cannot return null. By default, it returns the catalog session.
*/
default AuthSession initSession(RESTClient initClient, Map<String, String> properties) {
return mainSession(initClient, properties);
return catalogSession(initClient, properties);
}

/**
Expand All @@ -60,7 +60,7 @@ default AuthSession initSession(RESTClient initClient, Map<String, String> prope
* <p>It is not required to cache the returned session internally, as the catalog will keep it
* alive for the lifetime of the catalog.
*/
AuthSession mainSession(RESTClient sharedClient, Map<String, String> properties);
AuthSession catalogSession(RESTClient sharedClient, Map<String, String> properties);

/**
* Returns a session for a specific context.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/rest/auth/BasicAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
public final class BasicAuthManager implements AuthManager {

@Override
public AuthSession mainSession(RESTClient sharedClient, Map<String, String> properties) {
public AuthSession catalogSession(RESTClient sharedClient, Map<String, String> properties) {
Preconditions.checkArgument(
properties.containsKey(AuthProperties.BASIC_USERNAME),
"Invalid username: missing required property %s",
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/rest/auth/NoopAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
public class NoopAuthManager implements AuthManager {

@Override
public AuthSession mainSession(RESTClient sharedClient, Map<String, String> properties) {
public AuthSession catalogSession(RESTClient sharedClient, Map<String, String> properties) {
return AuthSession.EMPTY;
}

Expand Down
6 changes: 3 additions & 3 deletions core/src/test/java/org/apache/iceberg/rest/auth/TestBasicAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TestBasicAuthManager {
@Test
void missingUsername() {
try (AuthManager authManager = new BasicAuthManager()) {
assertThatThrownBy(() -> authManager.mainSession(null, Map.of()))
assertThatThrownBy(() -> authManager.catalogSession(null, Map.of()))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(
"Invalid username: missing required property %s", AuthProperties.BASIC_USERNAME);
Expand All @@ -41,7 +41,7 @@ void missingUsername() {
void missingPassword() {
try (AuthManager authManager = new BasicAuthManager()) {
Map<String, String> properties = Map.of(AuthProperties.BASIC_USERNAME, "alice");
assertThatThrownBy(() -> authManager.mainSession(null, properties))
assertThatThrownBy(() -> authManager.catalogSession(null, properties))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(
"Invalid password: missing required property %s", AuthProperties.BASIC_PASSWORD);
Expand All @@ -53,7 +53,7 @@ void success() {
Map<String, String> properties =
Map.of(AuthProperties.BASIC_USERNAME, "alice", AuthProperties.BASIC_PASSWORD, "secret");
try (AuthManager authManager = new BasicAuthManager();
AuthSession session = authManager.mainSession(null, properties)) {
AuthSession session = authManager.catalogSession(null, properties)) {
assertThat(session)
.isEqualTo(
DefaultAuthSession.of(HTTPHeaders.of(OAuth2Util.basicAuthHeaders("alice:secret"))));
Expand Down