You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/11/30 09:59:27 UTC
[1/4] jclouds git commit: Define the JDK version in a Maven property
Repository: jclouds
Updated Branches:
refs/heads/master 8ec3c520c -> 624367dfb
Define the JDK version in a Maven property
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6f7e4b92
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6f7e4b92
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6f7e4b92
Branch: refs/heads/master
Commit: 6f7e4b92b0761cf34ca2233d080f70c719103a29
Parents: 8ec3c52
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Oct 25 08:39:30 2017 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Nov 30 09:04:46 2017 +0100
----------------------------------------------------------------------
project/pom.xml | 33 +++------------------------------
1 file changed, 3 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f7e4b92/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index aa8a506..0fe78c4 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -219,6 +219,7 @@
<properties>
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
+ <jdk.version>1.7</jdk.version>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
<guava.version>18.0</guava.version>
@@ -1379,7 +1380,7 @@
<id>jenkins</id>
<build>
<plugins>
- <!-- make sure jclouds is built with the right JDK -->
+ <!-- Make sure jclouds is built with the right JDK -->
<plugin>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
@@ -1393,35 +1394,7 @@
<configuration>
<toolchains>
<jdk>
- <version>1.7</version>
- <vendor>oracle</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jenkins-jdk8</id>
- <build>
- <plugins>
- <!-- make sure jclouds is built with the right JDK -->
- <plugin>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.8</version>
- <vendor>openjdk</vendor>
+ <version>${jdk.version}</version>
</jdk>
</toolchains>
</configuration>
[4/4] jclouds git commit: OAuth filter customization per request
Posted by na...@apache.org.
OAuth filter customization per request
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/624367df
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/624367df
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/624367df
Branch: refs/heads/master
Commit: 624367dfbf4f6b86bc53aa2a7ac14c8db02533f3
Parents: 715994b
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri Nov 24 17:08:22 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Nov 30 09:07:20 2017 +0100
----------------------------------------------------------------------
.../oauth/v2/config/OAuthConfigFactory.java | 79 ++++++++++++++++++++
.../ClientCredentialsJWTBearerTokenFlow.java | 29 +++----
.../v2/filters/ClientCredentialsSecretFlow.java | 45 +++++------
.../oauth/v2/filters/JWTBearerTokenFlow.java | 17 ++---
.../v2/filters/TestJWTBearerTokenFlow.java | 7 +-
5 files changed, 121 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/624367df/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java
new file mode 100644
index 0000000..63124d0
--- /dev/null
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.oauth.v2.config;
+
+import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
+import static org.jclouds.oauth.v2.config.OAuthProperties.RESOURCE;
+
+import java.util.List;
+
+import javax.inject.Named;
+
+import org.jclouds.http.HttpRequest;
+import org.jclouds.javax.annotation.Nullable;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.annotations.Beta;
+import com.google.inject.ImplementedBy;
+import com.google.inject.Inject;
+
+/**
+ * Provides all OAuth configuration. Implementations are api-specific.
+ */
+@Beta
+@ImplementedBy(OAuthConfigFactory.OAuthConfigFromProperties.class)
+public interface OAuthConfigFactory {
+
+ @AutoValue
+ public abstract static class OAuthConfig {
+ public abstract List<String> scopes();
+ @Nullable public abstract String audience();
+ @Nullable public abstract String resource();
+
+ public static OAuthConfig create(List<String> scopes, String audience, String resource) {
+ return new AutoValue_OAuthConfigFactory_OAuthConfig(scopes, audience, resource);
+ }
+ }
+
+ /**
+ * Returns the OAuth configuration to be used to authenticate the gicen
+ * request.
+ */
+ OAuthConfig forRequest(HttpRequest input);
+
+ public static class OAuthConfigFromProperties implements OAuthConfigFactory {
+ private final OAuthScopes scopes;
+
+ @Inject(optional = true)
+ @Named(AUDIENCE)
+ private String audience;
+
+ @Inject(optional = true)
+ @Named(RESOURCE)
+ private String resource;
+
+ @Inject
+ OAuthConfigFromProperties(OAuthScopes scopes) {
+ this.scopes = scopes;
+ }
+
+ @Override
+ public OAuthConfig forRequest(HttpRequest input) {
+ return OAuthConfig.create(scopes.forRequest(input), audience, resource);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/624367df/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java
index dccb7f5..9adb848 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java
@@ -18,20 +18,19 @@ package org.jclouds.oauth.v2.filters;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
-import static org.jclouds.oauth.v2.config.OAuthProperties.RESOURCE;
+
+import java.util.UUID;
import javax.inject.Inject;
import javax.inject.Named;
-import java.util.List;
-import java.util.UUID;
import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpException;
import org.jclouds.http.HttpRequest;
import org.jclouds.location.Provider;
import org.jclouds.oauth.v2.AuthorizationApi;
-import org.jclouds.oauth.v2.config.OAuthScopes;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory.OAuthConfig;
import org.jclouds.oauth.v2.domain.ClientCredentialsAuthArgs;
import org.jclouds.oauth.v2.domain.ClientCredentialsClaims;
import org.jclouds.oauth.v2.domain.Token;
@@ -54,22 +53,16 @@ import com.google.common.cache.LoadingCache;
public class ClientCredentialsJWTBearerTokenFlow implements OAuthFilter {
private static final Joiner ON_SPACE = Joiner.on(" ");
- private final String resource;
- private final String audience;
private final Supplier<Credentials> credentialsSupplier;
- private final OAuthScopes scopes;
+ private final OAuthConfigFactory oauthConfigFactory;
private final LoadingCache<ClientCredentialsAuthArgs, Token> tokenCache;
@Inject
ClientCredentialsJWTBearerTokenFlow(AuthorizeToken loader, @Named(PROPERTY_SESSION_INTERVAL) long tokenDuration,
@Provider Supplier<Credentials> credentialsSupplier,
- OAuthScopes scopes,
- @Named(AUDIENCE) String audience,
- @Named(RESOURCE) String resource) {
+ OAuthConfigFactory oauthConfigFactory) {
this.credentialsSupplier = credentialsSupplier;
- this.scopes = scopes;
- this.audience = audience;
- this.resource = resource;
+ this.oauthConfigFactory = oauthConfigFactory;
// since the session interval is also the token expiration time requested to the server make the token expire a
// bit before the deadline to make sure there aren't session expiration exceptions
long cacheExpirationSeconds = tokenDuration > 30 ? tokenDuration - 30 : tokenDuration;
@@ -104,11 +97,11 @@ public class ClientCredentialsJWTBearerTokenFlow implements OAuthFilter {
}
@Override public HttpRequest filter(HttpRequest request) throws HttpException {
- List<String> configuredScopes = scopes.forRequest(request);
+ OAuthConfig oauthConfig = oauthConfigFactory.forRequest(request);
ClientCredentialsClaims claims = ClientCredentialsClaims.create( //
credentialsSupplier.get().identity, // iss
credentialsSupplier.get().identity, // sub
- audience, // aud
+ oauthConfig.audience(), // aud
-1, // placeholder exp for the cache
-1, // placeholder nbf for the cache
null // placeholder jti for the cache
@@ -116,8 +109,8 @@ public class ClientCredentialsJWTBearerTokenFlow implements OAuthFilter {
ClientCredentialsAuthArgs authArgs = ClientCredentialsAuthArgs.create(
credentialsSupplier.get().identity,
claims,
- resource == null ? "" : resource,
- configuredScopes.isEmpty() ? null : ON_SPACE.join(configuredScopes)
+ oauthConfig.resource(),
+ oauthConfig.scopes().isEmpty() ? null : ON_SPACE.join(oauthConfig.scopes())
);
Token token = tokenCache.getUnchecked(authArgs);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/624367df/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java
index d721865..85f4309 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java
@@ -16,31 +16,28 @@
*/
package org.jclouds.oauth.v2.filters;
-import java.util.List;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import com.google.common.base.Joiner;
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import javax.inject.Named;
-import org.jclouds.oauth.v2.AuthorizationApi;
-import org.jclouds.oauth.v2.domain.ClientSecret;
-import org.jclouds.oauth.v2.config.OAuthScopes;
-import org.jclouds.oauth.v2.domain.Token;
import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpException;
import org.jclouds.http.HttpRequest;
import org.jclouds.location.Provider;
+import org.jclouds.oauth.v2.AuthorizationApi;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory.OAuthConfig;
+import org.jclouds.oauth.v2.domain.ClientSecret;
+import org.jclouds.oauth.v2.domain.Token;
-import javax.inject.Named;
-
+import com.google.common.base.Joiner;
+import com.google.common.base.Supplier;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import com.google.inject.Inject;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.oauth.v2.config.OAuthProperties.RESOURCE;
-
/**
* Authorizes new Bearer Tokens at runtime by sending up for the http request.
*
@@ -56,16 +53,14 @@ public class ClientCredentialsSecretFlow implements OAuthFilter {
private final Supplier<Credentials> credentialsSupplier;
private final LoadingCache<ClientSecret, Token> tokenCache;
- private final String resource;
- private final OAuthScopes scopes;
+ private final OAuthConfigFactory oauthConfigFactory;
@Inject
ClientCredentialsSecretFlow(AuthorizeToken loader, @Named(PROPERTY_SESSION_INTERVAL) long tokenDuration,
- @Provider Supplier<Credentials> credentialsSupplier, OAuthScopes scopes,
- @Named(RESOURCE) String resource) {
+ @Provider Supplier<Credentials> credentialsSupplier,
+ OAuthConfigFactory oauthConfigFactory) {
this.credentialsSupplier = credentialsSupplier;
- this.scopes = scopes;
- this.resource = resource;
+ this.oauthConfigFactory = oauthConfigFactory;
// since the session interval is also the token expiration time requested to the server make the token expire a
// bit before the deadline to make sure there aren't session expiration exceptions
long cacheExpirationSeconds = tokenDuration > 30 ? tokenDuration - 30 : tokenDuration;
@@ -85,12 +80,12 @@ public class ClientCredentialsSecretFlow implements OAuthFilter {
}
@Override public HttpRequest filter(HttpRequest request) throws HttpException {
- List<String> configuredScopes = scopes.forRequest(request);
+ OAuthConfig oauthConfig = oauthConfigFactory.forRequest(request);
ClientSecret client = ClientSecret.create(
credentialsSupplier.get().identity,
credentialsSupplier.get().credential,
- resource == null ? "" : resource,
- configuredScopes.isEmpty() ? null : ON_SPACE.join(configuredScopes)
+ oauthConfig.resource(),
+ oauthConfig.scopes().isEmpty() ? null : ON_SPACE.join(oauthConfig.scopes())
);
Token token = tokenCache.getUnchecked(client);
String authorization = String.format("%s %s", token.tokenType(), token.accessToken());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/624367df/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
index 43ec549..39bcace 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
@@ -18,7 +18,6 @@ package org.jclouds.oauth.v2.filters;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
import javax.inject.Inject;
import javax.inject.Named;
@@ -28,7 +27,8 @@ import org.jclouds.http.HttpException;
import org.jclouds.http.HttpRequest;
import org.jclouds.location.Provider;
import org.jclouds.oauth.v2.AuthorizationApi;
-import org.jclouds.oauth.v2.config.OAuthScopes;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory.OAuthConfig;
import org.jclouds.oauth.v2.domain.Claims;
import org.jclouds.oauth.v2.domain.Token;
@@ -51,16 +51,14 @@ import com.google.common.cache.LoadingCache;
public class JWTBearerTokenFlow implements OAuthFilter {
private static final Joiner ON_COMMA = Joiner.on(",");
- private final String audience;
private final Supplier<Credentials> credentialsSupplier;
- private final OAuthScopes scopes;
+ private final OAuthConfigFactory oauthConfigFactory;
private final LoadingCache<TokenCacheKey, Token> tokenCache;
@Inject JWTBearerTokenFlow(AuthorizeToken loader, @Named(PROPERTY_SESSION_INTERVAL) long tokenDuration,
- @Provider Supplier<Credentials> credentialsSupplier, OAuthScopes scopes, @Named(AUDIENCE) String audience) {
+ @Provider Supplier<Credentials> credentialsSupplier, OAuthConfigFactory oauthConfigFactory) {
this.credentialsSupplier = credentialsSupplier;
- this.scopes = scopes;
- this.audience = audience;
+ this.oauthConfigFactory = oauthConfigFactory;
// since the session interval is also the token expiration time requested to the server make the token expire a
// bit before the deadline to make sure there aren't session expiration exceptions
long cacheExpirationSeconds = tokenDuration > 30 ? tokenDuration - 30 : tokenDuration;
@@ -89,10 +87,11 @@ public class JWTBearerTokenFlow implements OAuthFilter {
@Override public HttpRequest filter(HttpRequest request) throws HttpException {
long now = currentTimeSeconds();
+ OAuthConfig oauthConfig = oauthConfigFactory.forRequest(request);
Claims claims = Claims.create( //
credentialsSupplier.get().identity, // iss
- ON_COMMA.join(scopes.forRequest(request)), // scope
- audience, // aud
+ ON_COMMA.join(oauthConfig.scopes()), // scope
+ oauthConfig.audience(), // aud
-1, // placeholder exp for the cache
-1 // placeholder iat for the cache
);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/624367df/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java
index f28e980..23ac7df 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java
@@ -17,22 +17,21 @@
package org.jclouds.oauth.v2.filters;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
import javax.inject.Inject;
import javax.inject.Named;
import org.jclouds.domain.Credentials;
import org.jclouds.location.Provider;
-import org.jclouds.oauth.v2.config.OAuthScopes;
+import org.jclouds.oauth.v2.config.OAuthConfigFactory;
import com.google.common.base.Supplier;
public class TestJWTBearerTokenFlow extends JWTBearerTokenFlow {
@Inject TestJWTBearerTokenFlow(AuthorizeToken loader, @Named(PROPERTY_SESSION_INTERVAL) long tokenDuration,
- @Provider Supplier<Credentials> credentialsSupplier, OAuthScopes scopes, @Named(AUDIENCE) String audience) {
- super(loader, tokenDuration, credentialsSupplier, scopes, audience);
+ @Provider Supplier<Credentials> credentialsSupplier, OAuthConfigFactory oauthConfigFactory) {
+ super(loader, tokenDuration, credentialsSupplier, oauthConfigFactory);
}
/** Constant time for testing. */
[3/4] jclouds git commit: Fix GCE live tests
Posted by na...@apache.org.
Fix GCE live tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/715994b1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/715994b1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/715994b1
Branch: refs/heads/master
Commit: 715994b1254d32ebb2404f1ab0d302f21eab5118
Parents: a0f659f
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Nov 29 10:36:04 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Nov 30 09:06:23 2017 +0100
----------------------------------------------------------------------
.../compute/functions/ResetWindowsPassword.java | 146 ++++++++++++-------
...desWithGroupEncodedIntoNameThenAddToSet.java | 42 +++---
.../googlecomputeengine/domain/Image.java | 2 +-
.../functions/ResetWindowsPasswordTest.java | 5 +-
.../features/AddressApiLiveTest.java | 2 +-
.../features/BackendServiceApiLiveTest.java | 2 +-
.../features/DiskApiLiveTest.java | 2 +-
.../features/FirewallApiLiveTest.java | 2 +-
.../features/ForwardingRuleApiLiveTest.java | 2 +-
.../GlobalForwardingRuleApiLiveTest.java | 2 +-
.../features/InstanceApiLiveTest.java | 2 +-
.../features/InstanceApiWindowsLiveTest.java | 2 +-
.../features/NetworkApiLiveTest.java | 2 +-
.../features/ProjectApiLiveTest.java | 2 +-
.../features/RouteApiLiveTest.java | 2 +-
.../features/SnapshotApiLiveTest.java | 2 +-
.../features/TargetPoolApiLiveTest.java | 2 +-
.../src/test/resources/logback-test.xml | 2 +-
18 files changed, 134 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java
index 3d38189..7fbef6d 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java
@@ -16,32 +16,11 @@
*/
package org.jclouds.googlecomputeengine.compute.functions;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.BaseEncoding;
-import com.google.common.util.concurrent.Atomics;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.crypto.Crypto;
-import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
-import org.jclouds.googlecomputeengine.domain.Instance;
-import org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput;
-import org.jclouds.googlecomputeengine.domain.Metadata;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.features.InstanceApi;
-import org.jclouds.logging.Logger;
-import org.jclouds.util.Predicates2;
+import static com.google.common.base.Predicates.notNull;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.transform;
+import static com.google.common.collect.Iterables.tryFind;
-import javax.annotation.Resource;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.inject.Inject;
-import javax.inject.Named;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.security.InvalidKeyException;
@@ -53,13 +32,42 @@ import java.security.spec.RSAPublicKeySpec;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
-import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Resource;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.crypto.Crypto;
+import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
+import org.jclouds.googlecomputeengine.domain.Instance;
+import org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput;
+import org.jclouds.googlecomputeengine.domain.Metadata;
+import org.jclouds.googlecomputeengine.domain.Operation;
+import org.jclouds.googlecomputeengine.features.InstanceApi;
+import org.jclouds.json.Json;
+import org.jclouds.logging.Logger;
+import org.jclouds.util.Predicates2;
+
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.base.Splitter;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.BaseEncoding;
+import com.google.common.util.concurrent.Atomics;
+import com.google.gson.GsonBuilder;
+import com.google.inject.TypeLiteral;
/**
* References:
@@ -92,12 +100,15 @@ public class ResetWindowsPassword implements Function<Map<String, ?>, String> {
private final GoogleComputeEngineApi api;
private final Crypto crypto;
private final Predicate<AtomicReference<Operation>> operationDone;
+ private final Json json;
@Inject
- protected ResetWindowsPassword(GoogleComputeEngineApi api, Crypto crypto, Predicate<AtomicReference<Operation>> operationDone) {
+ protected ResetWindowsPassword(GoogleComputeEngineApi api, Crypto crypto,
+ Predicate<AtomicReference<Operation>> operationDone, Json json) {
this.api = api;
this.crypto = crypto;
this.operationDone = operationDone;
+ this.json = json;
}
@Override
@@ -135,31 +146,64 @@ public class ResetWindowsPassword implements Function<Map<String, ?>, String> {
operation.get().httpErrorMessage());
}
- try {
- final Map<String, String> passwordDict = new HashMap<String, String>();
- boolean passwordRetrieved = Predicates2.retry(new Predicate<Instance>() {
- public boolean apply(Instance instance) {
- String serialPortContents = instanceApi.getSerialPortOutput(instance.name(), 4).contents();
- if (!serialPortContents.startsWith("{\"ready\":true")) {
- return false;
- }
- String[] contentEntries = serialPortContents.split("\n");
- passwordDict.clear();
- passwordDict.putAll(new Gson().fromJson(contentEntries[contentEntries.length - 1], Map.class));
- passwordDict.put("passwordDictContentEntries", contentEntries[contentEntries.length - 1]);
- return passwordDict.get("encryptedPassword") != null;
- }
- }, 10 * 60, 30, TimeUnit.SECONDS).apply(instance.get()); // Notice that timeoutDuration should be less than EXPIRE_DURATION
- if (passwordRetrieved) {
- return decryptPassword(checkNotNull(passwordDict.get("encryptedPassword"), "encryptedPassword shouldn't be null"), keys);
- } else {
- throw new IllegalStateException("encryptedPassword shouldn't be null: " + passwordDict.get("passwordDictContentEntries"));
- }
- } catch (Exception e) {
- throw Throwables.propagate(e);
- }
+ try {
+ final AtomicReference<String> encryptedPassword = Atomics.newReference();
+ boolean passwordRetrieved = Predicates2.retry(new Predicate<Instance>() {
+ public boolean apply(Instance instance) {
+ String serialPortContents = instanceApi.getSerialPortOutput(instance.name(), 4).contents();
+ List<String> contentEntries = Splitter.on('\n').splitToList(serialPortContents);
+
+ Optional<String> retrievedPassword = tryFind(
+ filter(transform(contentEntries, deserializeSerialOutput(json)), notNull()), HasEncryptedPassword)
+ .transform(ExtractEncryptedPassword);
+
+ if (retrievedPassword.isPresent()) {
+ encryptedPassword.set(retrievedPassword.get());
+ }
+
+ return retrievedPassword.isPresent();
+ }
+ // Notice that timeoutDuration should be less than EXPIRE_DURATION
+ }, 10 * 60, 30, TimeUnit.SECONDS).apply(instance.get());
+
+ if (passwordRetrieved) {
+ return decryptPassword(encryptedPassword.get(), keys);
+ } else {
+ throw new IllegalStateException("Did not find the encrypted password in the serial port output");
+ }
+ } catch (Exception e) {
+ throw Throwables.propagate(e);
+ }
+ }
+
+ private static Function<String, Map<String, Object>> deserializeSerialOutput(final Json json) {
+ return new Function<String, Map<String, Object>>() {
+ @Override
+ public Map<String, Object> apply(String input) {
+ try {
+ return json.fromJson(input, new TypeLiteral<Map<String, Object>>() {
+ }.getType());
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+ };
}
+ private static final Predicate<Map<String, Object>> HasEncryptedPassword = new Predicate<Map<String, Object>>() {
+ @Override
+ public boolean apply(Map<String, Object> input) {
+ return input.containsKey("encryptedPassword");
+ }
+ };
+
+ private static final Function<Map<String, Object>, String> ExtractEncryptedPassword = new Function<Map<String, Object>, String>() {
+ @Override
+ public String apply(Map<String, Object> input) {
+ return (String) input.get("encryptedPassword");
+ }
+ };
+
/**
* Decrypts the given password - the encrypted text is base64-encoded.
* As per the GCE docs, assumes it was encrypted with algorithm "RSA/NONE/OAEPPadding", and UTF-8.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
index b60a5f0..ba4b6fd 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
@@ -208,34 +208,32 @@ public final class CreateNodesWithGroupEncodedIntoNameThenAddToSet extends
}
int[] inboundPorts = templateOptions.getInboundPorts();
- if ((inboundPorts == null) || inboundPorts.length == 0){
- return;
- }
-
- List<String> ports = simplifyPorts(inboundPorts);
- String name = naming.name(ports);
- Firewall firewall = firewallApi.get(name);
- AtomicReference<Operation> operation = null;
- String interiorRange = subnet.isPresent() ? subnet.get().ipCidrRange() : DEFAULT_INTERNAL_NETWORK_RANGE;
-
- if (firewall == null) {
- List<Rule> rules = ImmutableList.of(Rule.create("tcp", ports), Rule.create("udp", ports));
- FirewallOptions firewallOptions = new FirewallOptions().name(name).network(network.selfLink())
+ if (inboundPorts != null && inboundPorts.length > 0) {
+ List<String> ports = simplifyPorts(inboundPorts);
+ String name = naming.name(ports);
+ Firewall firewall = firewallApi.get(name);
+ AtomicReference<Operation> operation = null;
+
+ String interiorRange = subnet.isPresent() ? subnet.get().ipCidrRange() : DEFAULT_INTERNAL_NETWORK_RANGE;
+
+ if (firewall == null) {
+ List<Rule> rules = ImmutableList.of(Rule.create("tcp", ports), Rule.create("udp", ports));
+ FirewallOptions firewallOptions = new FirewallOptions().name(name).network(network.selfLink())
.allowedRules(rules).sourceTags(templateOptions.getTags())
- .sourceRanges(of(interiorRange, EXTERIOR_RANGE))
- .targetTags(ImmutableList.of(name));
+ .sourceRanges(of(interiorRange, EXTERIOR_RANGE)).targetTags(ImmutableList.of(name));
- operation = Atomics.newReference(firewallApi
- .createInNetwork(firewallOptions.name(), network.selfLink(), firewallOptions));
+ operation = Atomics.newReference(firewallApi.createInNetwork(firewallOptions.name(), network.selfLink(),
+ firewallOptions));
- operationDone.apply(operation);
- checkState(operation.get().httpErrorStatusCode() == null, "Could not insert firewall, operation failed %s",
- operation);
+ operationDone.apply(operation);
+ checkState(operation.get().httpErrorStatusCode() == null, "Could not insert firewall, operation failed %s",
+ operation);
+ }
- // Add tags for firewalls
- tags.add(name);
+ tags.add(name); // Add tags for the inbound ports firewall
}
+
templateOptions.tags(tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
index b055ee2..09a3d55 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
@@ -82,7 +82,7 @@ public abstract class Image {
public abstract Status status();
- public abstract Long archiveSizeBytes();
+ @Nullable public abstract Long archiveSizeBytes();
public abstract Long diskSizeGb();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPasswordTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPasswordTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPasswordTest.java
index 23f24d9..4ec5f20 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPasswordTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPasswordTest.java
@@ -20,6 +20,8 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.BaseEncoding;
+import com.google.gson.Gson;
+
import org.jclouds.crypto.Crypto;
import org.jclouds.encryption.bouncycastle.BouncyCastleCrypto;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
@@ -29,6 +31,7 @@ import org.jclouds.googlecomputeengine.domain.Metadata;
import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.features.InstanceApi;
import org.jclouds.googlecomputeengine.parse.ParseInstanceTest;
+import org.jclouds.json.internal.GsonWrapper;
import org.testng.annotations.Test;
import javax.crypto.Cipher;
@@ -93,7 +96,7 @@ public class ResetWindowsPasswordTest {
replay(api, instanceApi, operation, serialPortOutput, crypto, keyPairGenerator);
- ResetWindowsPassword generator = new ResetWindowsPassword(api, crypto, operationDone);
+ ResetWindowsPassword generator = new ResetWindowsPassword(api, crypto, operationDone, new GsonWrapper(new Gson()));
String result = generator.apply(ImmutableMap.of("instance", new AtomicReference<Instance>(instance), "zone", zone, "email", "test@google.com", "userName", "test"));
verify(api, instanceApi, operation, serialPortOutput);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java
index cee41f6..c64c150 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java
@@ -53,7 +53,7 @@ public class AddressApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertEquals(addresses.next().size(), 1);
}
- @Test(groups = "live", dependsOnMethods = "testListAddress")
+ @Test(groups = "live", dependsOnMethods = "testListAddress", alwaysRun = true)
public void testDeleteAddress() {
assertOperationDoneSuccessfully(api().delete(ADDRESS_NAME));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/BackendServiceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/BackendServiceApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/BackendServiceApiLiveTest.java
index 9ed6ceb..4434a2a 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/BackendServiceApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/BackendServiceApiLiveTest.java
@@ -103,7 +103,7 @@ public class BackendServiceApiLiveTest extends BaseGoogleComputeEngineApiLiveTes
}
*/
- @Test(groups = "live", dependsOnMethods = "testListBackendService")
+ @Test(groups = "live", dependsOnMethods = "testListBackendService", alwaysRun = true)
public void testDeleteBackendService() {
assertOperationDoneSuccessfully(api().delete(BACKEND_SERVICE_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java
index ec020bc..b84eca4 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java
@@ -64,7 +64,7 @@ public class DiskApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertDiskEquals(disksAsList.get(0));
}
- @Test(groups = "live", dependsOnMethods = "testListDisk")
+ @Test(groups = "live", dependsOnMethods = "testListDisk", alwaysRun = true)
public void testDeleteDisk() {
assertOperationDoneSuccessfully(api().delete(DISK_NAME));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java
index 794f27e..0ed4b57 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java
@@ -107,7 +107,7 @@ public class FirewallApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertEquals(firewalls.next().size(), 1);
}
- @Test(groups = "live", dependsOnMethods = "testListFirewall")
+ @Test(groups = "live", dependsOnMethods = "testListFirewall", alwaysRun = true)
public void testDeleteFirewall() {
assertOperationDoneSuccessfully(api().delete(FIREWALL_NAME));
assertOperationDoneSuccessfully(api.networks().delete(FIREWALL_NETWORK_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java
index 625c958..ce48641 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java
@@ -73,7 +73,7 @@ public class ForwardingRuleApiLiveTest extends BaseGoogleComputeEngineApiLiveTes
address = addressApi().get(ADDRESS_NAME);
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public void tearDown() {
assertOperationDoneSuccessfully(targetPoolApi().delete(TARGETPOOL_NAME));
assertOperationDoneSuccessfully(targetPoolApi().delete(TARGETPOOL_NAME_NEW));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalForwardingRuleApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalForwardingRuleApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalForwardingRuleApiLiveTest.java
index 7aefc25..2d4da05 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalForwardingRuleApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalForwardingRuleApiLiveTest.java
@@ -104,7 +104,7 @@ public class GlobalForwardingRuleApiLiveTest extends BaseGoogleComputeEngineApiL
assertEquals(forwardingRules.size(), 1);
}
- @Test(groups = "live", dependsOnMethods = "testListGlobalForwardingRule")
+ @Test(groups = "live", dependsOnMethods = "testListGlobalForwardingRule", alwaysRun = true)
public void testDeleteGlobalForwardingRule() {
assertOperationDoneSuccessfully(api().delete(GLOBAL_FORWARDING_RULE_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
index 7b56456..bbdb215 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
@@ -354,7 +354,7 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertEquals(resultTags, expectedTags);
}
- @AfterClass(groups = { "integration", "live" })
+ @AfterClass(groups = { "integration", "live" }, alwaysRun = true)
protected void tearDownContext() {
try {
waitOperationDone(api().delete(INSTANCE_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java
index 381711a..bb96e43 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java
@@ -119,7 +119,7 @@ public class InstanceApiWindowsLiveTest extends BaseGoogleComputeEngineApiLiveTe
assertFalse(Strings.isNullOrEmpty(result), "Password shouldn't be empty");
}
- @AfterClass(groups = { "integration", "live" })
+ @AfterClass(groups = { "integration", "live" }, alwaysRun = true)
protected void tearDownContext() {
try {
waitOperationDone(api().delete(INSTANCE_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
index cec92de..98863ff 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java
@@ -61,7 +61,7 @@ public class NetworkApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertNetworkEquals(networksAsList.get(0));
}
- @Test(groups = "live", dependsOnMethods = "testListNetwork")
+ @Test(groups = "live", dependsOnMethods = "testListNetwork", alwaysRun = true)
public void testDeleteNetwork() {
assertOperationDoneSuccessfully(api().delete(NETWORK_NAME));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java
index 632766b..79e60c1 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java
@@ -64,7 +64,7 @@ public class ProjectApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertNotNull(project.commonInstanceMetadata().fingerprint());
}
- @Test(groups = "live", dependsOnMethods = "addItemToMetadata")
+ @Test(groups = "live", dependsOnMethods = "addItemToMetadata", alwaysRun = true)
public void testDeleteItemFromMetadata() {
Metadata metadata = project.commonInstanceMetadata().remove(METADATA_ITEM_KEY);
assertOperationDoneSuccessfully(api.project().setCommonInstanceMetadata(metadata));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java
index 002a79e..d47576f 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java
@@ -75,7 +75,7 @@ public class RouteApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertRouteEquals(routesAsList.get(0));
}
- @Test(groups = "live", dependsOnMethods = "testListRoute")
+ @Test(groups = "live", dependsOnMethods = "testListRoute", alwaysRun = true)
public void testDeleteRoute() {
assertOperationDoneSuccessfully(api().delete(ROUTE_NAME));
assertOperationDoneSuccessfully(api.networks().delete(ROUTE_NETWORK_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java
index 57c76cb..179a2a3 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java
@@ -71,7 +71,7 @@ public class SnapshotApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertSnapshotEquals(snapshotsAsList.get(0));
}
- @Test(groups = "live", dependsOnMethods = "testListSnapshot")
+ @Test(groups = "live", dependsOnMethods = "testListSnapshot", alwaysRun = true)
public void testDeleteDisk() {
assertOperationDoneSuccessfully(diskApi().delete(DISK_NAME));
assertOperationDoneSuccessfully(api().delete(SNAPSHOT_NAME));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java
index ea742a9..38dfd1e 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java
@@ -258,7 +258,7 @@ public class TargetPoolApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
assertOperationDoneSuccessfully(api().delete(BACKUP_TARGETPOOL_NAME));
}
- @AfterClass(groups = { "integration", "live" })
+ @AfterClass(groups = { "integration", "live" }, alwaysRun = true)
public void testCleanup(){
InstanceApi instanceApi = api.instancesInZone(DEFAULT_ZONE_NAME);
HttpHealthCheckApi httpHealthCheckApi = api.httpHeathChecks();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/715994b1/providers/google-compute-engine/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/resources/logback-test.xml b/providers/google-compute-engine/src/test/resources/logback-test.xml
index cb55d49..b9e9616 100644
--- a/providers/google-compute-engine/src/test/resources/logback-test.xml
+++ b/providers/google-compute-engine/src/test/resources/logback-test.xml
@@ -13,7 +13,7 @@
</encoder>
</appender>
<appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/jclouds-compute.log</file>
+ <file>target/test-data/jclouds-compute.log</file>
<encoder>
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
</encoder>
[2/4] jclouds git commit: Fix DigitalOcean DropletApiLiveTest
Posted by na...@apache.org.
Fix DigitalOcean DropletApiLiveTest
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a0f659fa
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a0f659fa
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a0f659fa
Branch: refs/heads/master
Commit: a0f659faedaeec05000effc99a4bb655b0cec0d1
Parents: 6f7e4b9
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Nov 28 11:58:51 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Nov 30 09:05:28 2017 +0100
----------------------------------------------------------------------
providers/digitalocean2/pom.xml | 2 +-
.../jclouds/digitalocean2/DigitalOcean2ApiMetadata.java | 2 +-
.../main/java/org/jclouds/digitalocean2/domain/Image.java | 10 +++++++---
.../compute/DigitalOcean2TemplateBuilderLiveTest.java | 2 +-
.../compute/functions/DropletToNodeMetadataTest.java | 4 ++--
.../compute/functions/ImageInRegionToImageTest.java | 2 +-
.../digitalocean2/features/DropletApiLiveTest.java | 2 +-
.../internal/BaseDigitalOcean2ApiLiveTest.java | 4 ++--
8 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/pom.xml
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/pom.xml b/providers/digitalocean2/pom.xml
index fc81952..1a8e495 100644
--- a/providers/digitalocean2/pom.xml
+++ b/providers/digitalocean2/pom.xml
@@ -38,7 +38,7 @@
<test.digitalocean2.api-version>2</test.digitalocean2.api-version>
<test.digitalocean2.identity>FIXME</test.digitalocean2.identity>
<test.digitalocean2.credential>FIXME</test.digitalocean2.credential>
- <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true,osVersionMatches=14.*</test.digitalocean2.template>
+ <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true,osVersionMatches=16.*</test.digitalocean2.template>
<jclouds.osgi.export>org.jclouds.digitalocean2*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
org.jclouds.compute.internal;version="${project.version}",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/DigitalOcean2ApiMetadata.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/DigitalOcean2ApiMetadata.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/DigitalOcean2ApiMetadata.java
index 9aedaaa..4630b52 100644
--- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/DigitalOcean2ApiMetadata.java
+++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/DigitalOcean2ApiMetadata.java
@@ -68,7 +68,7 @@ public class DigitalOcean2ApiMetadata extends BaseHttpApiMetadata<DigitalOcean2A
properties.put(AUDIENCE, "https://cloud.digitalocean.com/v1/oauth/token");
properties.put(CREDENTIAL_TYPE, BEARER_TOKEN_CREDENTIALS.toString());
properties.put(PROPERTY_SESSION_INTERVAL, 3600);
- properties.put(TEMPLATE, "osFamily=UBUNTU,os64Bit=true,osVersionMatches=14.*");
+ properties.put(TEMPLATE, "osFamily=UBUNTU,os64Bit=true,osVersionMatches=16.*");
properties.put(POLL_INITIAL_PERIOD, 5000);
properties.put(POLL_MAX_PERIOD, 20000);
// Node operations in DigitalOcean can be quite slow. Use a 5 minutes
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Image.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Image.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Image.java
index dd2c3b6..47bba71 100644
--- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Image.java
+++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Image.java
@@ -37,11 +37,15 @@ public abstract class Image {
public abstract boolean isPublic();
public abstract List<String> regions();
public abstract Date createdAt();
+ public abstract float minDiskSize();
+ public abstract float sizeGBs();
- @SerializedNames({ "id", "name", "type", "distribution", "slug", "public", "regions", "created_at" })
+ @SerializedNames({ "id", "name", "type", "distribution", "slug", "public", "regions", "created_at", "min_disk_size",
+ "size_gigabytes" })
public static Image create(int id, String name, String type, String distribution, String slug, boolean isPublic,
- List<String> regions, Date createdAt) {
- return new AutoValue_Image(id, name, type, distribution, slug, isPublic, copyOf(regions), createdAt);
+ List<String> regions, Date createdAt, float minDiskSize, float sizeGBs) {
+ return new AutoValue_Image(id, name, type, distribution, slug, isPublic, copyOf(regions), createdAt, minDiskSize,
+ sizeGBs);
}
Image() {}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/DigitalOcean2TemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/DigitalOcean2TemplateBuilderLiveTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/DigitalOcean2TemplateBuilderLiveTest.java
index 698483a..b7738c0 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/DigitalOcean2TemplateBuilderLiveTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/DigitalOcean2TemplateBuilderLiveTest.java
@@ -40,7 +40,7 @@ public class DigitalOcean2TemplateBuilderLiveTest extends BaseTemplateBuilderLiv
@Override
public void testDefaultTemplateBuilder() throws IOException {
Template defaultTemplate = view.getComputeService().templateBuilder().build();
- assert defaultTemplate.getImage().getOperatingSystem().getVersion().startsWith("14.") : defaultTemplate
+ assert defaultTemplate.getImage().getOperatingSystem().getVersion().startsWith("16.") : defaultTemplate
.getImage().getOperatingSystem().getVersion();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadataTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadataTest.java
index ba6d3de..93f4bf4 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadataTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadataTest.java
@@ -79,7 +79,7 @@ public class DropletToNodeMetadataTest {
@BeforeMethod
public void setup() {
image = org.jclouds.digitalocean2.domain.Image.create(1, "14.04 x64",
- "distribution", "Ubuntu", "ubuntu-1404-x86", true, ImmutableList.of("sfo1"), new Date());
+ "distribution", "Ubuntu", "ubuntu-1404-x86", true, ImmutableList.of("sfo1"), new Date(), 20, 20);
region = Region.create("sfo1", "San Francisco 1", ImmutableList.of("2gb"), true, ImmutableList.<String> of());
images = ImmutableSet.of(new ImageBuilder()
@@ -146,7 +146,7 @@ public class DropletToNodeMetadataTest {
public void testConvertDropletOldImage() throws ParseException {
// Use an image id that is not in the list of images
org.jclouds.digitalocean2.domain.Image image = org.jclouds.digitalocean2.domain.Image.create(2, "14.04 x64",
- "distribution", "Ubuntu", "ubuntu2-1404-x86", true, ImmutableList.of("sfo1"), new Date());
+ "distribution", "Ubuntu", "ubuntu2-1404-x86", true, ImmutableList.of("sfo1"), new Date(), 20, 20);
Droplet droplet = Droplet.create(
1,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImageTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImageTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImageTest.java
index f1072d6..38b4662 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImageTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImageTest.java
@@ -75,7 +75,7 @@ public class ImageInRegionToImageTest {
@Test
public void testConvertImage() {
Image image = Image.create(1, "14.04 x64", "distribution", "Ubuntu", "ubuntu-1404-x86", true,
- ImmutableList.of("sfo1", "lon1"), new Date());
+ ImmutableList.of("sfo1", "lon1"), new Date(), 20, 20);
org.jclouds.compute.domain.Image expected = new ImageBuilder()
.id("lon1/ubuntu-1404-x86") // Location scoped images have the location encoded in the id
.providerId("1")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/features/DropletApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/features/DropletApiLiveTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/features/DropletApiLiveTest.java
index f18a24f..62f40f4 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/features/DropletApiLiveTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/features/DropletApiLiveTest.java
@@ -57,8 +57,8 @@ public class DropletApiLiveTest extends BaseDigitalOcean2ApiLiveTest {
@BeforeClass
public void setupDroplet() {
region = firstAvailableRegion();
- size = cheapestSizeInRegion(region);
image = ubuntuImageInRegion(region);
+ size = cheapestSizeInRegionForImage(region, image);
Map<String, String> keyPair = SshKeys.generate();
key = api.keyApi().create(prefix + "-droplet-livetest", keyPair.get("public"));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a0f659fa/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiLiveTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiLiveTest.java
index 722ef97..4b7b0ec 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiLiveTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiLiveTest.java
@@ -104,11 +104,11 @@ public class BaseDigitalOcean2ApiLiveTest extends BaseApiLiveTest<DigitalOcean2A
}).get();
}
- protected Size cheapestSizeInRegion(final Region region) {
+ protected Size cheapestSizeInRegionForImage(final Region region, final Image image) {
return sizesByPrice().min(api.sizeApi().list().concat().filter(new Predicate<Size>() {
@Override
public boolean apply(Size input) {
- return input.available() && input.regions().contains(region.slug());
+ return input.available() && input.regions().contains(region.slug()) && input.disk() >= image.minDiskSize();
}
}));
}