You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/29 00:40:00 UTC
jclouds git commit: JCLOUDS-523 fix typo in implementation.
Repository: jclouds
Updated Branches:
refs/heads/master 902f1b410 -> c635b3006
JCLOUDS-523 fix typo in implementation.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/c635b300
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c635b300
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c635b300
Branch: refs/heads/master
Commit: c635b3006dc0056b607f4dcd393c26d093a8edbc
Parents: 902f1b4
Author: Adrian Cole <ac...@twitter.com>
Authored: Fri Nov 28 14:31:44 2014 -0800
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Nov 28 15:39:42 2014 -0800
----------------------------------------------------------------------
.../openstack/swift/v1/config/SwiftAuthenticationModule.java | 2 +-
.../java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c635b300/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java
index 9b6ae40..8b45538 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java
@@ -122,7 +122,7 @@ public final class SwiftAuthenticationModule extends KeystoneAuthenticationModul
if (header.equalsIgnoreCase(STORAGE_URL)) {
storageUrl = getURI(entry.getValue());
} else if (header.equalsIgnoreCase(AUTH_TOKEN)) {
- authToken = entry.getKey();
+ authToken = entry.getValue();
}
}
if (storageUrl == null || authToken == null) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c635b300/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
index 6a148af..d1c8829 100644
--- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
+++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
@@ -43,7 +43,7 @@ public class TempAuthMockTest {
private MockWebServer tempAuthServer;
- public void testGenerateJWTRequest() throws Exception {
+ public void testTempAuthRequest() throws Exception {
tempAuthServer.enqueue(new MockResponse().setResponseCode(204)
.addHeader("X-Auth-Token", "token")
.addHeader("X-Storage-Url", swiftServer.getUrl("").toString()));
@@ -67,6 +67,7 @@ public class TempAuthMockTest {
assertEquals(listContainers.getMethod(), "GET");
assertEquals(listContainers.getPath(), "/");
assertEquals(listContainers.getHeader("Accept"), APPLICATION_JSON);
+ assertEquals(listContainers.getHeader("X-Auth-Token"), "token");
}
private SwiftApi api(String authUrl) throws IOException {