This is an automated email from the ASF dual-hosted git repository.
nacx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
The following commit(s) were added to refs/heads/master by this push:
new 611b4c4a11 Adding access key auth support for openstack V3 (#183)
611b4c4a11 is described below
commit 611b4c4a1107501b705191495fb034e2b8ac1bcc
Author: Edo Demirbilek <[email protected]>
AuthorDate: Mon Sep 4 17:49:45 2023 -0400
Adding access key auth support for openstack V3 (#183)
* Adding access key auth support for openstack V3 from an earlier commit +
adding test
* added new line at the end to fix checkstyle warning
---
.../keystone/v3/auth/V3AuthenticationApi.java | 10 +++++++
...ad.java => BindAccessKeyAuthToJsonPayload.java} | 35 +++++++++++-----------
.../v3/binders/BindPasswordAuthToJsonPayload.java | 2 +-
.../v3/binders/BindTokenAuthToJsonPayload.java | 2 +-
.../jclouds/openstack/keystone/v3/domain/Auth.java | 20 +++++++++++--
.../v3/auth/V3AuthenticationApiLiveTest.java | 7 +++++
.../v3/auth/V3AuthenticationApiMockTest.java | 10 +++++++
.../src/test/resources/v3/auth-accesskey.json | 13 ++++++++
8 files changed, 76 insertions(+), 23 deletions(-)
diff --git
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java
index 0902f659a6..cac54f34ab 100644
---
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java
+++
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java
@@ -27,6 +27,9 @@ import org.jclouds.openstack.keystone.auth.AuthenticationApi;
import org.jclouds.openstack.keystone.auth.domain.PasswordCredentials;
import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials;
import org.jclouds.openstack.keystone.auth.domain.TokenCredentials;
+import org.jclouds.openstack.keystone.auth.domain.ApiAccessKeyCredentials;
+import org.jclouds.openstack.keystone.auth.domain.AuthInfo;
+import
org.jclouds.openstack.keystone.v3.binders.BindAccessKeyAuthToJsonPayload;
import org.jclouds.openstack.keystone.v3.binders.BindPasswordAuthToJsonPayload;
import org.jclouds.openstack.keystone.v3.binders.BindTokenAuthToJsonPayload;
import org.jclouds.openstack.keystone.v3.domain.Token;
@@ -57,4 +60,11 @@ public interface V3AuthenticationApi extends
AuthenticationApi, Closeable {
@Override
Token authenticateToken(TenantOrDomainAndCredentials<TokenCredentials>
credentials);
+ @Named("token:create")
+ @POST
+ @ResponseParser(ParseTokenFromHttpResponse.class)
+ @MapBinder(BindAccessKeyAuthToJsonPayload.class)
+ @Override
+ AuthInfo
authenticateAccessKey(TenantOrDomainAndCredentials<ApiAccessKeyCredentials>
credentials);
+
}
diff --git
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java
similarity index 60%
copy from
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
copy to
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java
index 439baa29eb..d9e3da0fa2 100644
---
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
+++
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java
@@ -16,30 +16,29 @@
*/
package org.jclouds.openstack.keystone.v3.binders;
-import static java.util.Collections.singletonList;
+import org.jclouds.json.Json;
+import org.jclouds.openstack.keystone.auth.domain.ApiAccessKeyCredentials;
+import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials;
+import org.jclouds.openstack.keystone.v3.domain.Auth;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.jclouds.json.Json;
-import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials;
-import org.jclouds.openstack.keystone.auth.domain.TokenCredentials;
-import org.jclouds.openstack.keystone.v3.domain.Auth;
-import org.jclouds.openstack.keystone.v3.domain.Auth.Id;
-import org.jclouds.openstack.keystone.v3.domain.Auth.Identity;
+import static java.util.Collections.singletonList;
@Singleton
-public class BindTokenAuthToJsonPayload extends
BindAuthToJsonPayload<TokenCredentials> {
-
- @Inject
- BindTokenAuthToJsonPayload(Json jsonBinder) {
- super(jsonBinder);
- }
+public class BindAccessKeyAuthToJsonPayload extends
BindAuthToJsonPayload<ApiAccessKeyCredentials> {
- @Override
- protected Auth buildAuth(TenantOrDomainAndCredentials<TokenCredentials>
credentials, Object scope) {
- Id token = Id.create(credentials.credentials().id());
- return Auth.create(Identity.create(singletonList("token"), token, null),
scope);
- }
+ @Inject
+ protected BindAccessKeyAuthToJsonPayload(Json jsonBinder) {
+ super(jsonBinder);
+ }
+ @Override
+ protected Auth
buildAuth(TenantOrDomainAndCredentials<ApiAccessKeyCredentials> credentials,
Object scope) {
+ Auth.Identity.AccessKeyAuth accessKeyAuth =
Auth.Identity.AccessKeyAuth.create(
+ credentials.credentials().accessKey(),
+ credentials.credentials().secretKey());
+ return
Auth.create(Auth.Identity.create(singletonList("application_credential"), null,
null, accessKeyAuth), null);
+ }
}
diff --git
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java
index 40c94f89ec..5e0ce7b22a 100644
---
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java
+++
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java
@@ -44,7 +44,7 @@ public class BindPasswordAuthToJsonPayload extends
BindAuthToJsonPayload<Passwor
DomainAuth domain = DomainAuth.create(credentials.tenantOrDomainName());
UserAuth user = UserAuth.create(creds.username(), domain,
creds.password());
- return Auth.create(Identity.create(singletonList("password"), null,
PasswordAuth.create(user)), scope);
+ return Auth.create(Identity.create(singletonList("password"), null,
PasswordAuth.create(user), null), scope);
}
}
diff --git
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
index 439baa29eb..a3e01a6d47 100644
---
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
+++
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java
@@ -39,7 +39,7 @@ public class BindTokenAuthToJsonPayload extends
BindAuthToJsonPayload<TokenCrede
@Override
protected Auth buildAuth(TenantOrDomainAndCredentials<TokenCredentials>
credentials, Object scope) {
Id token = Id.create(credentials.credentials().id());
- return Auth.create(Identity.create(singletonList("token"), token, null),
scope);
+ return Auth.create(Identity.create(singletonList("token"), token, null,
null), scope);
}
}
diff --git
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Auth.java
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Auth.java
index fcfe4faaf9..25ab9bc6fc 100644
---
a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Auth.java
+++
b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Auth.java
@@ -45,9 +45,23 @@ public abstract class Auth {
@Nullable
public abstract PasswordAuth password();
- @SerializedNames({ "methods", "token", "password" })
- public static Identity create(List<String> methods, Id token,
PasswordAuth password) {
- return new AutoValue_Auth_Identity(methods, token, password);
+ @Nullable
+ public abstract AccessKeyAuth secret();
+
+ @SerializedNames({ "methods", "token", "password",
"application_credential" })
+ public static Identity create(List<String> methods, Id token,
PasswordAuth password, AccessKeyAuth accessKeyAuth) {
+ return new AutoValue_Auth_Identity(methods, token, password,
accessKeyAuth);
+ }
+
+ @AutoValue
+ public abstract static class AccessKeyAuth {
+ public abstract String id();
+ public abstract String secret();
+
+ @SerializedNames({ "id", "secret" })
+ public static AccessKeyAuth create(String id, String secret) {
+ return new AutoValue_Auth_Identity_AccessKeyAuth(id, secret);
+ }
}
@AutoValue
diff --git
a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiLiveTest.java
b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiLiveTest.java
index 3b8a3b48c3..aba908bdf1 100644
---
a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiLiveTest.java
+++
b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiLiveTest.java
@@ -23,6 +23,7 @@ import java.util.Properties;
import org.jclouds.openstack.keystone.auth.domain.PasswordCredentials;
import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials;
import org.jclouds.openstack.keystone.auth.domain.TokenCredentials;
+import org.jclouds.openstack.keystone.auth.domain.ApiAccessKeyCredentials;
import org.jclouds.openstack.keystone.v3.internal.BaseV3KeystoneApiLiveTest;
import org.testng.annotations.Test;
@@ -54,4 +55,10 @@ public class V3AuthenticationApiLiveTest extends
BaseV3KeystoneApiLiveTest {
.tenantOrDomainName(tenant).scope("unscoped")
.credentials(TokenCredentials.builder().id(token.get()).build()).build()));
}
+
+ public void testAuthenticateAccessKey() {
+
assertNotNull(authenticationApi.authenticateAccessKey(TenantOrDomainAndCredentials.<ApiAccessKeyCredentials>
builder()
+ .tenantOrDomainName(tenant).scope("unscoped")
+
.credentials(ApiAccessKeyCredentials.builder().accessKey(identity).secretKey(credential).build()).build()));
+ }
}
diff --git
a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiMockTest.java
b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiMockTest.java
index fac5d52bde..771a8b227c 100644
---
a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiMockTest.java
+++
b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApiMockTest.java
@@ -160,4 +160,14 @@ public class V3AuthenticationApiMockTest extends
BaseV3KeystoneApiMockTest {
assertSent(server, "POST", "/auth/tokens", stringFromResource(json));
}
+ public void testAuthenticateAccessKey() throws InterruptedException {
+
+ TenantOrDomainAndCredentials<ApiAccessKeyCredentials> credentials =
TenantOrDomainAndCredentials
+ .<ApiAccessKeyCredentials>
builder().tenantOrDomainName("domain").scope("unscoped")
+
.credentials(ApiAccessKeyCredentials.builder().accessKey("identity").secretKey("credential").build()).build();
+
+
+ checkTokenResult(credentials, "/v3/auth-accesskey.json");
+ }
+
}
diff --git a/apis/openstack-keystone/src/test/resources/v3/auth-accesskey.json
b/apis/openstack-keystone/src/test/resources/v3/auth-accesskey.json
new file mode 100644
index 0000000000..acc185140d
--- /dev/null
+++ b/apis/openstack-keystone/src/test/resources/v3/auth-accesskey.json
@@ -0,0 +1,13 @@
+{
+ "auth": {
+ "identity": {
+ "methods": [
+ "application_credential"
+ ],
+ "application_credential": {
+ "id": "identity",
+ "secret": "credential"
+ }
+ }
+ }
+}
