Merge branch 'master' into shorea-h2

Author: shorea

.changes/next-release/feature-AWSSDKforJavav2-0a2ffb3.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Add a standard User-Agent when making requests to the metadata service.  User-Agent pattern: aws-sdk-java/<version>"
+}

.changes/next-release/feature-AWSSDKforJavav2-f49c286.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Split core module to regions, profiles, auth, aws-core and core modules.[#27](https://github.com/aws/aws-sdk-java-v2/issues/27)"
+}

auth/pom.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>aws-sdk-java-pom</artifactId>
+        <version>2.0.0-preview-10-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>auth</artifactId>
+    <name>AWS Java SDK :: Auth</name>
+    <description>
+        The AWS SDK for Java - Auth module holds the classes that are used for authentication with AWS services
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>regions</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>${wiremock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>nl.jqno.equalsverifier</groupId>
+            <artifactId>equalsverifier</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.unitils</groupId>
+            <artifactId>unitils-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.19.1</version>
+                    <configuration>
+                        <!-- Run multiple tests in parallel. -->
+                        <forkCount>1C</forkCount>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

core/src/it/java/software/amazon/awssdk/core/auth/InstanceProfileCredentialsProviderIntegrationTest.java renamed to auth/src/it/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderIntegrationTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,7 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.util.LogCaptor;
+import software.amazon.awssdk.testutils.LogCaptor;
 
 /**
  * Unit tests for the InstanceProfileCredentialsProvider.
@@ -69,8 +69,10 @@ public void testSessionCredentials_MultipleInstanceProfiles() throws Exception {
         mockServer.setResponseFileName("sessionResponse");
         mockServer.setAvailableSecurityCredentials("test-credentials");
 
-        InstanceProfileCredentialsProvider credentialsProvider = InstanceProfileCredentialsProvider.create();
-        AwsSessionCredentials credentials = (AwsSessionCredentials) credentialsProvider.getCredentials();
+        AwsSessionCredentials credentials;
+        try (InstanceProfileCredentialsProvider credentialsProvider = InstanceProfileCredentialsProvider.create()) {
+            credentials = (AwsSessionCredentials) credentialsProvider.getCredentials();
+        }
 
         assertEquals("ACCESS_KEY_ID", credentials.accessKeyId());
         assertEquals("SECRET_ACCESS_KEY", credentials.secretAccessKey());
@@ -86,13 +88,14 @@ public void testNoInstanceProfiles() throws Exception {
         mockServer.setResponseFileName("sessionResponse");
         mockServer.setAvailableSecurityCredentials("");
 
-        InstanceProfileCredentialsProvider credentialsProvider = InstanceProfileCredentialsProvider.create();
+        try (InstanceProfileCredentialsProvider credentialsProvider = InstanceProfileCredentialsProvider.create()) {
 
-        try {
-            credentialsProvider.getCredentials();
-            fail("Expected an SdkClientException, but wasn't thrown");
-        } catch (SdkClientException ace) {
-            assertNotNull(ace.getMessage());
+            try {
+                credentialsProvider.getCredentials();
+                fail("Expected an SdkClientException, but wasn't thrown");
+            } catch (SdkClientException ace) {
+                assertNotNull(ace.getMessage());
+            }
         }
     }
 }

auth/src/main/java/software/amazon/awssdk/auth/AwsExecutionAttributes.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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 software.amazon.awssdk.auth;
+
+import software.amazon.awssdk.annotations.ReviewBeforeRelease;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttributes;
+import software.amazon.awssdk.core.runtime.auth.Signer;
+import software.amazon.awssdk.regions.Region;
+
+/**
+ * AWS-specific attributes attached to the execution. This information is available to {@link ExecutionInterceptor}s and
+ * {@link Signer}s.
+ */
+@ReviewBeforeRelease("We should also consider making some of the SDK/AWS-owned set of attributes part of the immutable context"
+                     + "if we don't want the interceptors to modify them.")
+public final class AwsExecutionAttributes extends SdkExecutionAttributes {
+    /**
+     * The key under which the request credentials are set.
+     */
+    public static final ExecutionAttribute<AwsCredentials> AWS_CREDENTIALS = new ExecutionAttribute<>("AwsCredentials");
+
+    /**
+     * The AWS {@link Region} the client was configured with.
+     */
+    public static final ExecutionAttribute<Region> AWS_REGION = new ExecutionAttribute<>("AwsRegion");
+
+    private AwsExecutionAttributes() {
+    }
+}

core/src/main/java/software/amazon/awssdk/core/auth/AnonymousCredentialsProvider.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/AnonymousCredentialsProvider.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import software.amazon.awssdk.utils.ToString;
 

core/src/main/java/software/amazon/awssdk/core/auth/AwsCredentials.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentials.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import static software.amazon.awssdk.utils.StringUtils.trimToNull;
 

core/src/main/java/software/amazon/awssdk/core/auth/AwsCredentialsProvider.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProvider.java

@@ -13,7 +13,8 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
+
 
 /**
  * Interface for loading {@link AwsCredentials} that are used for authentication.

core/src/main/java/software/amazon/awssdk/core/auth/AwsCredentialsProviderChain.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChain.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import java.util.ArrayList;
 import java.util.Arrays;

core/src/main/java/software/amazon/awssdk/core/auth/AwsSessionCredentials.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsSessionCredentials.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import java.util.Objects;
 import software.amazon.awssdk.utils.ToString;

core/src/main/java/software/amazon/awssdk/core/auth/CanHandleNullCredentials.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/CanHandleNullCredentials.java

@@ -13,13 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.auth;
+package software.amazon.awssdk.auth.credentials;
 
 import software.amazon.awssdk.core.SignableRequest;
+import software.amazon.awssdk.core.runtime.auth.Signer;
 
 /**
  * Used to explicitly indicate that a {@link Signer} can gracefully handle
- * credentials being null when calling {@link Signer#sign(SignableRequest, AwsCredentials)}
+ * credentials being null when calling {@link Signer#sign(SignableRequest)}
  */
 public interface CanHandleNullCredentials {
 }

core/src/main/java/software/amazon/awssdk/auth/profile/internal/ChildProfileCredentialsProviderFactory.java renamed to auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java

@@ -13,11 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.auth.profile.internal;
+package software.amazon.awssdk.auth.credentials;
 
 import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.auth.profile.Profile;
-import software.amazon.awssdk.core.auth.AwsCredentialsProvider;
+import software.amazon.awssdk.profiles.Profile;
 
 /**
  * A factory for {@link AwsCredentialsProvider}s that are derived from another set of credentials in a profile file.