Sample and command line refactor

.github/workflows/ci_run_custom_key_ops_cfg.json

@@ -1,8 +1,8 @@
 {
     "language": "Java",
-    "sample_file": "samples/CustomKeyOpsPubSub",
+    "sample_file": "samples/CustomKeyOpsConnect",
     "sample_region": "us-east-1",
-    "sample_main_class": "customkeyopspubsub.CustomKeyOpsPubSub",
+    "sample_main_class": "customkeyopsconnect.CustomKeyOpsConnect",
     "arguments": [
         {
             "name": "--endpoint",

.github/workflows/ci_run_fleet_provisioning_cfg.json

@@ -1,8 +1,8 @@
 {
     "language": "Java",
-    "sample_file": "samples/Identity",
+    "sample_file": "samples/FleetProvisioning",
     "sample_region": "us-east-1",
-    "sample_main_class": "identity.FleetProvisioningSample",
+    "sample_main_class": "fleetprovisioning.FleetProvisioningSample",
     "arguments": [
         {
             "name": "--endpoint",

android/app/build.gradle

@@ -21,7 +21,6 @@ android {
         main {
             java.srcDir '../../samples/BasicPubSub/src/main/java'
             java.srcDir '../../samples/Jobs/src/main/java'
-            java.srcDir '../../samples/PubSubStress/src/main/java'
             java.srcDir '../../samples/Shadow/src/main/java'
             java.srcDir 'src/main/java'
         }

android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt

@@ -17,8 +17,7 @@ import kotlin.concurrent.thread
 val SAMPLES = mapOf(
     "Publish/Subscribe Sample" to "pubsub.PubSub",
     "Jobs Client Sample" to "jobs.JobsSample",
-    "Shadow Client Sample" to "shadow.ShadowSample",
-    "Publish/Subscribe Load Test" to "pubsubstress.PubSubStress"
+    "Shadow Client Sample" to "shadow.ShadowSample"
 )
 
 class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {

codebuild/samples/custom-key-ops-linux.sh

@@ -4,13 +4,13 @@ set -e
 set -o pipefail
 env
 
-pushd $CODEBUILD_SRC_DIR/samples/CustomKeyOpsPubSub
+pushd $CODEBUILD_SRC_DIR/samples/CustomKeyOpsConnect
 
 ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "ci/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
 
 mvn compile
 
 echo "Custom Key Ops test"
-mvn exec:java -Dexec.mainClass="customkeyopspubsub.CustomKeyOpsPubSub" -Daws.crt.ci="True" -Dexec.arguments="--endpoint,$ENDPOINT,--key,/tmp/privatekey_p8.pem,--cert,/tmp/certificate.pem"
+mvn exec:java -Dexec.mainClass="customkeyopsconnect.CustomKeyOpsConnect" -Daws.crt.ci="True" -Dexec.arguments="--endpoint,$ENDPOINT,--key,/tmp/privatekey_p8.pem,--cert,/tmp/certificate.pem"
 
 popd

codebuild/samples/customkeyops-linux.sh

@@ -4,13 +4,13 @@ set -e
 
 env
 
-pushd $CODEBUILD_SRC_DIR/samples/CustomKeyOpsPubSub
+pushd $CODEBUILD_SRC_DIR/samples/CustomKeyOpsConnect
 
 ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "unit-test/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
 
 mvn compile
 
 echo "Custom Key Ops test"
-mvn exec:java -Dexec.mainClass="customkeyopspubsub.CustomKeyOpsPubSub" -Daws.crt.ci="True" -Dexec.arguments="--endpoint,$ENDPOINT,--key,/tmp/privatekey_p8.pem,--cert,/tmp/certificate.pem"
+mvn exec:java -Dexec.mainClass="customkeyopsconnect.CustomKeyOpsConnect" -Daws.crt.ci="True" -Dexec.arguments="--endpoint,$ENDPOINT,--key,/tmp/privatekey_p8.pem,--cert,/tmp/certificate.pem"
 
 popd

documents/MQTT5_Userguide.md

@@ -27,7 +27,7 @@
 
 MQTT5 support is currently in **developer preview**. We encourage feedback at all times, but feedback during the preview window is especially valuable in shaping the final product. During the preview period we may make backwards-incompatible changes to the public API, but in general, this is something we will try our best to avoid.
 
-The MQTT5 client cannot yet be used with the AWS IoT MQTT services (Shadow, Jobs, Identity). We plan to address this in the near future.
+The MQTT5 client cannot yet be used with the AWS IoT MQTT services (Shadow, Jobs, Fleet-Provisioning/Identity). We plan to address this in the near future.
 
 # Introduction
 
@@ -221,7 +221,7 @@ A MQTT5 direct connection can be made with a set of custom private key operation
 ~~~ java
 class MyKeyOperationHandler implements TlsKeyOperationHandler {
 
-    // Implement based on the operation. See CustomKeyOpsPubSub sample for example
+    // Implement based on the operation. See CustomKeyOpsConnect sample for example
     public void performOperation(TlsKeyOperation operation) {
         try {
             throw new RuntimeException("This is just an example!");

pom.xml

@@ -12,19 +12,17 @@
         <module>samples/BasicConnect</module>
         <module>samples/WebsocketConnect</module>
         <module>samples/X509CredentialsProviderConnect</module>
-        <module>samples/RawConnect</module>
         <module>samples/Pkcs11Connect</module>
         <module>samples/CustomAuthorizerConnect</module>
         <module>samples/JavaKeystoreConnect</module>
         <module>samples/CognitoConnect</module>
         <module>samples/Greengrass</module>
         <module>samples/GreengrassIPC</module>
         <module>samples/Jobs</module>
-        <module>samples/PubSubStress</module>
-        <module>samples/CustomKeyOpsPubSub</module>
+        <module>samples/CustomKeyOpsConnect</module>
         <module>samples/WindowsCertConnect</module>
         <module>samples/Shadow</module>
-        <module>samples/Identity</module>
+        <module>samples/FleetProvisioning</module>
         <module>samples/Mqtt5/PubSub</module>
         <module>samples/Mqtt5/SharedSubscription</module>
     </modules>

samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java

@@ -8,29 +8,26 @@
 import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
-import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.crt.mqtt.MqttClientConnection;
 import software.amazon.awssdk.crt.mqtt.MqttClientConnectionEvents;
-import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
+import software.amazon.awssdk.crt.http.HttpProxyOptions;
+import software.amazon.awssdk.iot.AwsIotMqttConnectionBuilder;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletableFuture;
 
 import utils.commandlineutils.CommandLineUtils;
 
 public class BasicConnect {
 
-    // When run normally, we want to exit nicely even if something goes wrong
+    // When run normally, we want to exit nicely even if something goes wrong.
     // When run from CI, we want to let an exception escape which in turn causes the
-    // exec:java task to return a non-zero exit code
+    // exec:java task to return a non-zero exit code.
     static String ciPropValue = System.getProperty("aws.crt.ci");
     static boolean isCI = ciPropValue != null && Boolean.valueOf(ciPropValue);
 
     static CommandLineUtils cmdUtils;
 
-    static void onRejectedError(RejectedError error) {
-        System.out.println("Request rejected: " + error.code.toString() + ": " + error.message);
-    }
-
     /*
      * When called during a CI run, throw an exception that will escape and fail the exec:java task
      * When called otherwise, print what went wrong (if anything) and just continue (return from main)
@@ -45,15 +42,12 @@ static void onApplicationFailure(Throwable cause) {
 
     public static void main(String[] args) {
 
-        cmdUtils = new CommandLineUtils();
-        cmdUtils.registerProgramName("BasicConnect");
-        cmdUtils.addCommonMQTTCommands();
-        cmdUtils.addCommonProxyCommands();
-        cmdUtils.registerCommand("key", "<path>", "Path to your key in PEM format.");
-        cmdUtils.registerCommand("cert", "<path>", "Path to your client certificate in PEM format.");
-        cmdUtils.registerCommand("client_id", "<int>", "Client id to use (optional, default='test-*').");
-        cmdUtils.registerCommand("port", "<int>", "Port to connect to on the endpoint (optional, default='8883').");
-        cmdUtils.sendArguments(args);
+        /**
+         * cmdData is the arguments/input from the command line placed into a single struct for
+         * use in this sample. This handles all of the command line parsing, validating, etc.
+         * See the Utils/CommandLineUtils for more information.
+         */
+        CommandLineUtils.SampleCommandLineData cmdData = CommandLineUtils.getInputForIoTSample("BasicConnect", args);
 
         MqttClientConnectionEvents callbacks = new MqttClientConnectionEvents() {
             @Override
@@ -71,20 +65,54 @@ public void onConnectionResumed(boolean sessionPresent) {
 
         try {
 
-            // Create a connection using a certificate and key
-            // Note: The data for the connection is gotten from cmdUtils.
-            // (see buildDirectMQTTConnection for implementation)
-            MqttClientConnection connection = cmdUtils.buildDirectMQTTConnection(callbacks);
+            /**
+             * Create the MQTT connection from the builder
+             */
+            AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(cmdData.input_cert, cmdData.input_key);
+            if (cmdData.input_ca != "") {
+                builder.withCertificateAuthorityFromPath(null, cmdData.input_ca);
+            }
+            builder.withConnectionEventCallbacks(callbacks)
+                .withClientId(cmdData.input_clientId)
+                .withEndpoint(cmdData.input_endpoint)
+                .withPort((short)cmdData.input_port)
+                .withCleanSession(true)
+                .withProtocolOperationTimeoutMs(60000);
+            if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
+                HttpProxyOptions proxyOptions = new HttpProxyOptions();
+                proxyOptions.setHost(cmdData.input_proxyHost);
+                proxyOptions.setPort(cmdData.input_proxyPort);
+                builder.withHttpProxyOptions(proxyOptions);
+            }
+            MqttClientConnection connection = builder.build();
+            builder.close();
+
+            /**
+             * Verify the connection was created
+             */
             if (connection == null)
             {
                 onApplicationFailure(new RuntimeException("MQTT connection creation failed!"));
             }
 
-            // Connect and disconnect using the connection we created
-            // (see sampleConnectAndDisconnect for implementation)
-            cmdUtils.sampleConnectAndDisconnect(connection);
-
-            // Close the connection now that we are completely done with it.
+            /**
+             * Connect and disconnect
+             */
+            CompletableFuture<Boolean> connected = connection.connect();
+            try {
+                boolean sessionPresent = connected.get();
+                System.out.println("Connected to " + (!sessionPresent ? "new" : "existing") + " session!");
+            } catch (Exception ex) {
+                throw new RuntimeException("Exception occurred during connect", ex);
+            }
+            System.out.println("Disconnecting...");
+            CompletableFuture<Void> disconnected = connection.disconnect();
+            disconnected.get();
+            System.out.println("Disconnected.");
+
+            /**
+             * Close the connection now that it is complete
+             */
             connection.close();
 
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {

samples/BasicPubSub/src/main/java/pubsub/PubSub.java

@@ -8,21 +8,14 @@
 import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
-import software.amazon.awssdk.crt.Log;
-import software.amazon.awssdk.crt.auth.credentials.X509CredentialsProvider;
 import software.amazon.awssdk.crt.http.HttpProxyOptions;
-import software.amazon.awssdk.crt.io.ClientBootstrap;
-import software.amazon.awssdk.crt.io.ClientTlsContext;
-import software.amazon.awssdk.crt.io.TlsContextOptions;
 import software.amazon.awssdk.crt.mqtt.MqttClientConnection;
 import software.amazon.awssdk.crt.mqtt.MqttClientConnectionEvents;
 import software.amazon.awssdk.crt.mqtt.MqttMessage;
 import software.amazon.awssdk.crt.mqtt.QualityOfService;
 import software.amazon.awssdk.iot.AwsIotMqttConnectionBuilder;
-import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
 
 import java.nio.charset.StandardCharsets;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -37,16 +30,8 @@ public class PubSub {
     static String ciPropValue = System.getProperty("aws.crt.ci");
     static boolean isCI = ciPropValue != null && Boolean.valueOf(ciPropValue);
 
-    static String topic = "test/topic";
-    static String message = "Hello World!";
-    static int    messagesToPublish = 10;
-
     static CommandLineUtils cmdUtils;
 
-    static void onRejectedError(RejectedError error) {
-        System.out.println("Request rejected: " + error.code.toString() + ": " + error.message);
-    }
-
     /*
      * When called during a CI run, throw an exception that will escape and fail the exec:java task
      * When called otherwise, print what went wrong (if anything) and just continue (return from main)
@@ -61,20 +46,12 @@ static void onApplicationFailure(Throwable cause) {
 
     public static void main(String[] args) {
 
-        cmdUtils = new CommandLineUtils();
-        cmdUtils.registerProgramName("PubSub");
-        cmdUtils.addCommonMQTTCommands();
-        cmdUtils.addCommonTopicMessageCommands();
-        cmdUtils.registerCommand("key", "<path>", "Path to your key in PEM format.");
-        cmdUtils.registerCommand("cert", "<path>", "Path to your client certificate in PEM format.");
-        cmdUtils.registerCommand("client_id", "<int>", "Client id to use (optional, default='test-*').");
-        cmdUtils.registerCommand("port", "<int>", "Port to connect to on the endpoint (optional, default='8883').");
-        cmdUtils.registerCommand("count", "<int>", "Number of messages to publish (optional, default='10').");
-        cmdUtils.sendArguments(args);
-
-        topic = cmdUtils.getCommandOrDefault("topic", topic);
-        message = cmdUtils.getCommandOrDefault("message", message);
-        messagesToPublish = Integer.parseInt(cmdUtils.getCommandOrDefault("count", String.valueOf(messagesToPublish)));
+        /**
+         * cmdData is the arguments/input from the command line placed into a single struct for
+         * use in this sample. This handles all of the command line parsing, validating, etc.
+         * See the Utils/CommandLineUtils for more information.
+         */
+        CommandLineUtils.SampleCommandLineData cmdData = CommandLineUtils.getInputForIoTSample("PubSub", args);
 
         MqttClientConnectionEvents callbacks = new MqttClientConnectionEvents() {
             @Override
@@ -92,12 +69,29 @@ public void onConnectionResumed(boolean sessionPresent) {
 
         try {
 
-            MqttClientConnection connection = cmdUtils.buildMQTTConnection(callbacks);
-            if (connection == null)
-            {
-                onApplicationFailure(new RuntimeException("MQTT connection creation failed!"));
+            /**
+             * Create the MQTT connection from the builder
+             */
+            AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(cmdData.input_cert, cmdData.input_key);
+            if (cmdData.input_ca != "") {
+                builder.withCertificateAuthorityFromPath(null, cmdData.input_ca);
+            }
+            builder.withConnectionEventCallbacks(callbacks)
+                .withClientId(cmdData.input_clientId)
+                .withEndpoint(cmdData.input_endpoint)
+                .withPort((short)cmdData.input_port)
+                .withCleanSession(true)
+                .withProtocolOperationTimeoutMs(60000);
+            if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
+                HttpProxyOptions proxyOptions = new HttpProxyOptions();
+                proxyOptions.setHost(cmdData.input_proxyHost);
+                proxyOptions.setPort(cmdData.input_proxyPort);
+                builder.withHttpProxyOptions(proxyOptions);
             }
+            MqttClientConnection connection = builder.build();
+            builder.close();
 
+            // Connect the MQTT client
             CompletableFuture<Boolean> connected = connection.connect();
             try {
                 boolean sessionPresent = connected.get();
@@ -106,25 +100,25 @@ public void onConnectionResumed(boolean sessionPresent) {
                 throw new RuntimeException("Exception occurred during connect", ex);
             }
 
-            CountDownLatch countDownLatch = new CountDownLatch(messagesToPublish);
-
-            CompletableFuture<Integer> subscribed = connection.subscribe(topic, QualityOfService.AT_LEAST_ONCE, (message) -> {
+            // Subscribe to the topic
+            CountDownLatch countDownLatch = new CountDownLatch(cmdData.input_count);
+            CompletableFuture<Integer> subscribed = connection.subscribe(cmdData.input_topic, QualityOfService.AT_LEAST_ONCE, (message) -> {
                 String payload = new String(message.getPayload(), StandardCharsets.UTF_8);
                 System.out.println("MESSAGE: " + payload);
                 countDownLatch.countDown();
             });
-
             subscribed.get();
 
+            // Publish to the topic
             int count = 0;
-            while (count++ < messagesToPublish) {
-                CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes(), QualityOfService.AT_LEAST_ONCE, false));
+            while (count++ < cmdData.input_count) {
+                CompletableFuture<Integer> published = connection.publish(new MqttMessage(cmdData.input_topic, cmdData.input_message.getBytes(), QualityOfService.AT_LEAST_ONCE, false));
                 published.get();
                 Thread.sleep(1000);
             }
-
             countDownLatch.await();
 
+            // Disconnect
             CompletableFuture<Void> disconnected = connection.disconnect();
             disconnected.get();