Merge pull request #71 from rpmoore/master

Gradle Update and Ds3ClientBuilder from Environment Variables

Author: rpmoore

build.gradle

@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '1.1.0-RC3'
+    version = '1.1.0-RC4'
 }
 
 subprojects {
@@ -38,7 +38,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.3'
+    gradleVersion = '2.4'
 }
 
 project(':ds3-sdk-integration') {

ds3-sdk-integration/src/main/java/com/spectralogic/ds3client/integration/Util.java

@@ -39,42 +39,17 @@ public class Util {
     private Util() {}
 
     public static Ds3Client fromEnv() {
-        final Ds3ClientBuilder builder = clientBuilder();
+        final Ds3ClientBuilder builder = Ds3ClientBuilder.fromEnv();
         builder.withHttps(false);
         return builder.build();
     }
 
     public static Ds3Client insecureFromEnv() {
-        final Ds3ClientBuilder builder = clientBuilder();
+        final Ds3ClientBuilder builder = Ds3ClientBuilder.fromEnv();
         builder.withCertificateVerification(false);
         return builder.build();
     }
 
-    private static Ds3ClientBuilder clientBuilder() {
-        final String endpoint = System.getenv("DS3_ENDPOINT");
-        final String accessKey = System.getenv("DS3_ACCESS_KEY");
-        final String secretKey = System.getenv("DS3_SECRET_KEY");
-        final String httpProxy = System.getenv("http_proxy");
-
-        if (endpoint == null) {
-            throw new IllegalArgumentException("Missing DS3_ENDPOINT");
-        }
-
-        if (accessKey == null) {
-            throw new IllegalArgumentException("Missing DS3_ACCESS_KEY");
-        }
-
-        if (secretKey == null) {
-            throw new IllegalArgumentException("Missing DS3_SECRET_KEY");
-        }
-
-        final Ds3ClientBuilder builder = Ds3ClientBuilder.create(endpoint,new Credentials(accessKey, secretKey));
-        if (httpProxy != null) {
-            builder.withProxy(httpProxy);
-        }
-        return builder;
-    }
-
     private static final String[] BOOKS = {"beowulf.txt", "sherlock_holmes.txt", "tale_of_two_cities.txt", "ulysses.txt"};
     public static void loadBookTestData(final Ds3Client client, final String bucketName) throws IOException, SignatureException, XmlProcessingException, URISyntaxException {
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java

@@ -34,6 +34,10 @@ public class Ds3ClientBuilder implements Builder<Ds3Client> {
 
     static final private Logger LOG = LoggerFactory.getLogger(Ds3ClientBuilder.class);
 
+    static final private String ENDPOINT = "DS3_ENDPOINT";
+    static final private String ACCESS_KEY = "DS3_ACCESS_KEY";
+    static final private String SECRET_KEY = "DS3_SECRET_KEY";
+
     final private String endpoint;
     final private Credentials credentials;
 
@@ -64,6 +68,38 @@ public static Ds3ClientBuilder create(final String endpoint, final Credentials c
         return new Ds3ClientBuilder(endpoint, creds);
     }
 
+    /**
+     * Returns a Build which already has the endpoint and credentials populated from environment variables.
+     * DS3_ENDPOINT, DS3_ACCESS_KEY, and DS3_SECRET_KEY are all used when creating the builder.  This will
+     * also detect if http_proxy is set, and if it is will us it when creating the client and set the proxy
+     * variable accordingly.
+     * @return
+     * @throws IllegalArgumentException
+     */
+    public static Ds3ClientBuilder fromEnv() throws IllegalArgumentException {
+        final String endpoint = System.getenv(ENDPOINT);
+        if (endpoint == null) {
+            throw new IllegalArgumentException("Missing " + ENDPOINT + " environment variable");
+        }
+        final String accessKey = System.getenv(ACCESS_KEY);
+        if (accessKey == null) {
+            throw new IllegalArgumentException("Missing " + ACCESS_KEY + " environment variable");
+        }
+        final String secretKey = System.getenv(SECRET_KEY);
+        if (secretKey == null) {
+            throw new IllegalArgumentException("Missing " + SECRET_KEY + " environment variable");
+        }
+
+        final Ds3ClientBuilder builder = create(endpoint, new Credentials(accessKey, secretKey));
+
+        final String httpProxy = System.getenv("http_proxy");
+
+        if (httpProxy != null) {
+            builder.withProxy(httpProxy);
+        }
+        return builder;
+    }
+
     /**
      * Specifies if the library should use HTTP or HTTPS.  The default is HTTP.
      * @param secure True will use HTTPS, false will use HTTP.

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Mar 26 13:58:18 MDT 2015
+#Thu May 07 09:33:39 MDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip