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/11/05 20:11:59 UTC
git commit: Enforcing identity format
'...@developer.gserviceaccount.com' correctly
Updated Branches:
refs/heads/fix-project-name-validation [created] 5ef13c952
Enforcing identity format '...@developer.gserviceaccount.com' correctly
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/5ef13c95
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/5ef13c95
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/5ef13c95
Branch: refs/heads/fix-project-name-validation
Commit: 5ef13c952dbf6401433c78373aa5f7bd82589fbf
Parents: 5ec13c9
Author: Andrew Phillips <de...@yahoo.co.uk>
Authored: Tue Nov 5 14:09:07 2013 -0500
Committer: Andrew Phillips <de...@yahoo.co.uk>
Committed: Tue Nov 5 14:09:07 2013 -0500
----------------------------------------------------------------------
.../config/GoogleComputeEngineHttpApiModule.java | 4 ++--
.../compute/GoogleComputeEngineServiceExpectTest.java | 2 +-
.../internal/BaseGoogleComputeEngineApiExpectTest.java | 2 +-
.../internal/BaseGoogleComputeEngineExpectTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/5ef13c95/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 31f3786..5d29ebd 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
@@ -101,8 +101,8 @@ 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");
+ checkState(in.identity.indexOf("@") > -1,
+ "identity should be project_id@developer.gserviceaccount.com or project_id-extended_uid@developer.gserviceaccount.com but was: %s", in.identity);
Project project = api.getProjectApi().get(Iterables.get(Splitter.on("@").split(in.identity), 0));
return project.getName();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/5ef13c95/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
index d9e68b5..6818541 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
@@ -198,7 +198,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
@Override
protected Properties setupProperties() {
Properties overrides = super.setupProperties();
- overrides.put("google-compute-engine.identity", "myproject");
+ overrides.put("google-compute-engine.identity", "myproject@developer.gserviceaccount.com");
try {
overrides.put("google-compute-engine.credential", toStringAndClose(getClass().getResourceAsStream("/testpk.pem")));
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/5ef13c95/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java
index ae7be6a..787f467 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java
@@ -28,7 +28,7 @@ public class BaseGoogleComputeEngineApiExpectTest extends BaseGoogleComputeEngin
@Override
protected Properties setupProperties() {
Properties properties = super.setupProperties();
- properties.put("google-compute-engine.identity", "myproject");
+ properties.put("google-compute-engine.identity", "myproject@developer.gserviceaccount.com");
return properties;
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/5ef13c95/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java
index 1c360f2..587afc7 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java
@@ -73,7 +73,7 @@ public class BaseGoogleComputeEngineExpectTest<T> extends BaseRestApiExpectTest<
private static final String header = "{\"alg\":\"none\",\"typ\":\"JWT\"}";
private static final String CLAIMS_TEMPLATE = "{" +
- "\"iss\":\"myproject\"," +
+ "\"iss\":\"myproject@developer.gserviceaccount.com\"," +
"\"scope\":\"%s\"," +
"\"aud\":\"https://accounts.google.com/o/oauth2/token\"," +
"\"exp\":3600," +