You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2013/12/09 22:39:13 UTC
[1/2] git commit: backport of JCLOUDS-362 fix (jclouds-labs-google
cec667a8aed54ebd0c976758181ca7e9899008cf)
Updated Branches:
refs/heads/1.6.x 16c58db3a -> 399a97e48
backport of JCLOUDS-362 fix (jclouds-labs-google cec667a8aed54ebd0c976758181ca7e9899008cf)
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e0839de2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e0839de2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e0839de2
Branch: refs/heads/1.6.x
Commit: e0839de2eb072a9c89f0284214df422f202fafd5
Parents: 16c58db
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 28 14:56:33 2013 +0000
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Dec 9 16:38:25 2013 -0500
----------------------------------------------------------------------
.../config/GoogleComputeEngineHttpApiModule.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e0839de2/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java
index 214c932..bbf5c71 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.googlecomputeengine.config;
-import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Suppliers.compose;
import static com.google.inject.name.Names.named;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
@@ -98,9 +97,20 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException,
compose(new Function<Credentials, String>() {
public String apply(Credentials in) {
- checkState(in.identity.indexOf("@") != 1,
- "identity should be in project_id@developer.gserviceaccount.com format");
- Project project = api.getProjectApi().get(Iterables.get(Splitter.on("@").split(in.identity), 0));
+ // ID should be of the form project_id@developer.gserviceaccount.com
+ // OR (increasingly often) project_id-extended_uid@developer.gserviceaccount.com
+ // where project_id is the NUMBER;
+ // HERE we also accept simply "project" as the identity, if no "@" is present;
+ // this is used in tests, but not sure if it is valid in the wild.
+ String projectName = in.identity;
+ if (projectName.indexOf("@") != -1) {
+ projectName = Iterables.get(Splitter.on("@").split(projectName), 0);
+ if (projectName.indexOf("-") != -1) {
+ // if ID is of the form project_id-extended_uid@developer.gserviceaccount.com
+ projectName = Iterables.get(Splitter.on("-").split(projectName), 0);
+ }
+ }
+ Project project = api.getProjectApi().get(projectName);
return project.getName();
}
}, creds), seconds, TimeUnit.SECONDS);
[2/2] git commit: backport of live tests fix for oauth problems re
JCLOUDS-360 (from jclouds-lab-google
cf7adb8835f0aab4a217d0ec53f2b882afd93810)
Posted by an...@apache.org.
backport of live tests fix for oauth problems re JCLOUDS-360 (from jclouds-lab-google cf7adb8835f0aab4a217d0ec53f2b882afd93810)
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/399a97e4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/399a97e4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/399a97e4
Branch: refs/heads/1.6.x
Commit: 399a97e4807c608a486f3061c327a906ec4deacc
Parents: e0839de
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 28 17:11:32 2013 +0000
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Dec 9 16:38:54 2013 -0500
----------------------------------------------------------------------
.../org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java | 4 +---
.../oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/399a97e4/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
----------------------------------------------------------------------
diff --git a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
index 7fc6dad..e4f483e 100644
--- a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
+++ b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
@@ -29,8 +29,6 @@ import org.jclouds.apis.BaseApiLiveTest;
import org.jclouds.oauth.v2.OAuthApi;
import org.testng.annotations.Test;
-import com.google.common.base.Ticker;
-
/**
* @author David Alves
@@ -54,7 +52,7 @@ public class BaseOAuthApiLiveTest extends BaseApiLiveTest<OAuthApi> {
}
protected long nowInSeconds() {
- return TimeUnit.SECONDS.convert(Ticker.systemTicker().read(), TimeUnit.NANOSECONDS);
+ return TimeUnit.SECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/399a97e4/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
----------------------------------------------------------------------
diff --git a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
index 0294ff7..d2fbd91 100644
--- a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
+++ b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
@@ -17,7 +17,7 @@
package org.jclouds.oauth.v2.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
import static org.jclouds.oauth.v2.config.OAuthProperties.SIGNATURE_OR_MAC_ALGORITHM;
@@ -37,7 +37,6 @@ import org.jclouds.oauth.v2.domain.TokenRequest;
import org.testng.annotations.Test;
import com.google.common.base.Function;
-import com.google.common.base.Ticker;
import com.google.common.reflect.TypeToken;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -80,7 +79,7 @@ public abstract class BaseOAuthAuthenticatedApiLiveTest<A extends Closeable> ext
Header header = Header.builder().signerAlgorithm(signatureAlgorithm).type("JWT").build();
- long now = SECONDS.convert(Ticker.systemTicker().read(), NANOSECONDS);
+ long now = SECONDS.convert(System.currentTimeMillis(), MILLISECONDS);
ClaimSet claimSet = ClaimSet.builder()
.addClaim("aud", audience)