Iot alpn support (#858)

* Add TLS ALPN support for AWS IoT MQTT connections

* test testconfiguration.json

* Revert "test testconfiguration.json"

This reverts commit b8ad8c2.

* Refactoring the API

* Update config.yml

* Update config.yml

* Change config to run integration tests

* Convert iot module to an android library

* Refactor build.gradle

* Update config.yml

* Unit test fixes

* Undo the config file change

* Add dependency to pom.xml and add integration test for ALPN

* Add reconnect test for connection on 443

* Test for connect followed by a disconnect

* Package iot module as aar

* Reset the circleci config

* Synchronize the socket factory method and refactoring

* Changelog entry for alpn

* Changelog

* Refactoring AWSIotSslUtility class and update the changelog

Author: desokroshan

.circleci/config.yml

@@ -968,7 +968,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: apigateway
           testmodule: aws-android-sdk-apigateway-test
@@ -998,7 +998,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop              
+                - develop
       - integrationtest:
           name: comprehend
           testmodule: aws-android-sdk-comprehend-test
@@ -1041,14 +1041,14 @@ workflows:
                 - develop
       - integrationtest:
           name: iot
-          testmodule: aws-android-sdk-iot-test
+          testmodule: aws-android-sdk-iot
           requires:
             - pre_integrationtest    
           filters:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: kinesis
           testmodule: aws-android-sdk-kinesis-test
@@ -1069,7 +1069,6 @@ workflows:
               only:
                 - master
                 - develop
-
       - integrationtest:
           name: polly
           testmodule: aws-android-sdk-polly-test
@@ -1109,7 +1108,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop                                 
+                - develop
       - integrationtest:
           name: ses
           testmodule: aws-android-sdk-ses-test
@@ -1119,7 +1118,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop                                 
+                - develop
       - integrationtest:
           name: sns
           testmodule: aws-android-sdk-sns-test
@@ -1129,7 +1128,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: sqs
           testmodule: aws-android-sdk-sqs-test
@@ -1139,8 +1138,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
-
+                - develop
       - integrationtest:
           name: transcribe
           testmodule: aws-android-sdk-transcribe-test
@@ -1150,7 +1148,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: translate
           testmodule: aws-android-sdk-translate-test
@@ -1160,7 +1158,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: mobile-client
           testmodule: aws-android-sdk-mobile-client
@@ -1170,7 +1168,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: CognitoIdentityProvider
           testmodule: aws-android-sdk-cognitoidentityprovider-test
@@ -1180,7 +1178,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: Core
           testmodule: aws-android-sdk-core-test
@@ -1190,7 +1188,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop 
+                - develop
       - integrationtest:
           name: CognitoAuth
           testmodule: aws-android-sdk-cognitoauth
@@ -1200,7 +1198,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop              
+                - develop
       # - integrationtest:
       #     name: kinesisvideo
       #     testmodule: aws-android-sdk-kinesisvideo
@@ -1220,7 +1218,7 @@ workflows:
       #       branches:
       #         only:
       #           - master
-      #           - develop         
+      #           - develop
       # - integrationtest:
       #     name: kinesisvideo-archivedmedia
       #     testmodule: aws-android-sdk-kinesisvideo-archivedmedia
@@ -1230,7 +1228,7 @@ workflows:
       #       branches:
       #         only:
       #           - master
-      #           - develop                    
+      #           - develop
       - post_integrationtest:
           requires:
             # - kinesisvideo-archivedmedia
@@ -1387,7 +1385,7 @@ workflows:
               only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/  
       - integrationtest:
           name: iot
-          testmodule: aws-android-sdk-iot-test
+          testmodule: aws-android-sdk-iot
           requires:
             - pre_integrationtest    
           filters:

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log - AWS SDK for Android
 
-## [Release 2.12.7](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.7)
+## [Release 2.13.0](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.13.0)
+
+### Enhancements
+
+* **AWS IoT**
+  * AWS IoT SDK for Android now supports MQTT over TLS with X.509 client certificate authentication on port 443. Previously this combination of protocol and authentication mechanism was only supported on port 8883. `connectUsingALPN()` method allows developers to connect to AWS IoT using client certificate authentication on port 443. Please look at [this blog](https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/) for more details.
+  * **Breaking Change:** Please note that the type of aws-android-sdk-iot artifact is being changed from a`jar` to an `aar`. Also note that the `aar` artifacts needs to be explicitly specified in the dependency as `implementation ("com.amazonaws:aws-android-sdk-iot:2.12.+@aar") { transitive =true }` on some of the older versions of gradle.
 
 ### Enhancements
 

aws-android-sdk-iot-test/build.gradle

@@ -1,21 +1,41 @@
-apply plugin: 'java-library'
+apply plugin: 'com.android.library'
 
+android {
+    compileSdkVersion 27
+
+
+
+    defaultConfig {
+        minSdkVersion 11
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    api project(":aws-android-sdk-core")
+    api (project(":aws-android-sdk-core")){
+        exclude group: "com.google.android", module: "android"
+    }
     implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0"
+    implementation "org.conscrypt:conscrypt-android:2.0.0"
 
     testImplementation "junit:junit:4.12"
     testImplementation "org.robolectric:robolectric:2.4"
     testImplementation "org.mockito:mockito-all:1.10.5"
-}
-test {
-
-    if (project.hasProperty('excludeTests')) { 
-        exclude project.property('excludeTests')
-        //exclude '**/*IntegrationTest.class'
-    }
-}
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
+    androidTestImplementation "junit:junit:4.12"
+    androidTestImplementation "com.android.support.test:runner:1.0.2"
+    androidTestImplementation project(":aws-android-sdk-testutils")
+}

aws-android-sdk-iot-test/proguard-rules.pro

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-android-sdk-iot</artifactId>
-  <packaging>jar</packaging>
+  <packaging>aar</packaging>
   <name>AWS SDK for Android - AWS IoT</name>
   <description>The AWS Android SDK for AWS IoT module holds the client classes that are used for communicating with AWS IoT Service</description>
   <url>http://aws.amazon.com/sdkforandroid</url>
@@ -44,10 +44,28 @@
       <version>1.10.5</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.conscrypt</groupId>
+      <artifactId>conscrypt-android</artifactId>
+      <version>2.0.0</version>
+      <type>aar</type>
+    </dependency>
   </dependencies>
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.simpligility.maven.plugins</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <version>4.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <sdk>
+            <platform>${env.ANDROID_PLATFORM}</platform>
+            <buildTools>${env.ANDROID_BUILDTOOL_VERSION}</buildTools>
+          </sdk>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>

aws-android-sdk-iot/build.gradle

@@ -17,7 +17,7 @@
 
 import android.support.test.InstrumentationRegistry;
 
-import com.amazonaws.iottest.R;
+import com.amazonaws.iot.R;
 import com.amazonaws.testutils.AWSTestBase;
 
 import org.json.JSONObject;