Rename sample to commands-sandbox

Author: sfodagain

.builder/actions/build_samples.py

@@ -19,6 +19,7 @@ def run(self, env):
 
         steps = []
         samples = [
+            'samples/commands/commands-sandbox',
             'samples/deprecated/fleet_provisioning/fleet_provisioning',
             'samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning',
             'samples/deprecated/jobs/job_execution',

samples/CMakeLists.txt

@@ -24,7 +24,7 @@ add_subdirectory(pub_sub/cycle_pub_sub)
 add_subdirectory(secure_tunneling/secure_tunnel)
 add_subdirectory(secure_tunneling/tunnel_notification)
 add_subdirectory(shadow/shadow_sync)
-add_subdirectory(commands/execute_command)
+add_subdirectory(commands/commands-sandbox)
 
 
 add_subdirectory(deprecated/shadow/shadow_sync)

samples/README.md

@@ -24,6 +24,7 @@
 * [Shadow Sandbox](./shadow/shadow-sandbox/README.md)
 * [Basic Fleet Provisioning](./fleet_provisioning/provision-basic/README.md)
 * [CSR Fleet Provisioning](./fleet_provisioning/provision-csr/README.md)
+* [Commands Sandbox](./commands/commands-sandbox/README.md)
 * [Secure Tunnel](./secure_tunneling/secure_tunnel/README.md)
 * [Secure Tunnel Notification](./secure_tunneling/tunnel_notification/README.md)
 * [Cycle Pub-Sub](./pub_sub/cycle_pub_sub/README.md)

samples/commands/execute_command/CMakeLists.txt renamed to samples/commands/commands-sandbox/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.9...3.31)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
-project(execute-command CXX)
+project(commands-sandbox CXX)
 
 file(GLOB SRC_FILES
        "*.cpp"

samples/commands/execute_command/README.md renamed to samples/commands/commands-sandbox/README.md

@@ -1,4 +1,4 @@
-# Commands Execution
+# Commands Sandbox
 
 [**Return to main sample list**](../../README.md)
 
@@ -154,15 +154,15 @@ cmake --build build/ --target install
 Now build the sample:
 
 ```shell
-cd samples/commands/execute_command
+cd samples/commands/commands-sandbox
 cmake -S . -B build/ -DCMAKE_PREFIX_PATH=<sdk_install_path>
 cmake --build build/
 ```
 
 To run the sample:
 
 ```shell
-./build/execute-command \
+./build/commands-sandbox \
     --endpoint <endpoint> \
     --cert <path to the certificate> \
     --key <path to the private key> \
@@ -243,7 +243,7 @@ Take a notice of the `commandArn` field. It is used in creation of AWS IoT comma
 
 It's time to run the sample (unless you did it already) with the following shell command:
 ```shell
-./build/execute-command \
+./build/commands-sandbox \
     --endpoint <endpoint> \
     --cert <path to the certificate> \
     --key <path to the private key> \

samples/commands/execute_command/command_stream_handler.cpp renamed to samples/commands/commands-sandbox/command_stream_handler.cpp

@@ -57,7 +57,7 @@ namespace Aws
                     }
                     if (event.Payload)
                     {
-                        fprintf(stdout, "  payload size: %lu\n", event.Payload->size());
+                        fprintf(stdout, "  payload size: %zu\n", event.Payload->size());
                     }
 
                     CommandExecutionContext commandExecution{deviceType, deviceId, std::move(event)};

samples/commands/execute_command/command_stream_handler.h renamed to samples/commands/commands-sandbox/command_stream_handler.h

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+#include <aws/crt/Types.h>
 #include <aws/iotcommands/CommandExecutionEvent.h>
 #include <aws/iotcommands/CommandExecutionStatus.h>
 #include <aws/iotcommands/DeviceType.h>
@@ -121,7 +122,7 @@ namespace Aws
             /**
              * Opened streaming operations.
              */
-            std::unordered_map<uint64_t, StreamingOperationWrapper> m_streams;
+            Aws::Crt::UnorderedMap<uint64_t, StreamingOperationWrapper> m_streams;
 
             /**
              * Active command executions that were received on one of the open streams.
@@ -131,7 +132,7 @@ namespace Aws
              * https://docs.aws.amazon.com/iot/latest/developerguide/iot-remote-command-concepts.html#iot-command-execution-status
              * for more information on IoT command statuses.
              */
-            std::unordered_map<Aws::Crt::String, CommandExecutionContext> m_activeCommandExecutions;
+            Aws::Crt::Map<Aws::Crt::String, CommandExecutionContext> m_activeCommandExecutions;
             std::mutex m_activeExecutionsMutex;
         };
 

samples/commands/execute_command/main.cpp renamed to samples/commands/commands-sandbox/main.cpp

@@ -13,14 +13,15 @@
 #include <cinttypes>
 #include <condition_variable>
 #include <iostream>
+#include <memory>
 #include <thread>
 
 #include "../../utils/CommandLineUtils.h"
 
 struct ApplicationContext
 {
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> m_protocolClient;
-    std::unique_ptr<Aws::IotcommandsSample::CommandStreamHandler> commandStreamHandler;
+    std::shared_ptr<Aws::IotcommandsSample::CommandStreamHandler> commandStreamHandler;
     Aws::Crt::String thingName;
     Aws::Crt::String clientId;
 };
@@ -251,7 +252,7 @@ int main(int argc, char *argv[])
 
     auto commandClient = Aws::Iotcommands::NewClientFrom5(*protocolClient, requestResponseOptions);
     auto commandStreamHandler =
-        std::make_unique<Aws::IotcommandsSample::CommandStreamHandler>(std::move(commandClient));
+        std::make_shared<Aws::IotcommandsSample::CommandStreamHandler>(std::move(commandClient));
 
     protocolClient->Start();
     auto isConnected = connectedWaiter.get_future().get();

samples/utils/CommandLineUtils.cpp

@@ -550,7 +550,7 @@ namespace Utils
     cmdData parseSampleInputCommands(int argc, char *argv[], Aws::Crt::ApiHandle *api_handle)
     {
         CommandLineUtils cmdUtils = CommandLineUtils();
-        cmdUtils.RegisterProgramName("execute-commands");
+        cmdUtils.RegisterProgramName("commands-sandbox");
         cmdUtils.AddCommonMQTTCommands();
         cmdUtils.AddCommonKeyCertCommands();
         cmdUtils.RegisterCommand(m_cmd_client_id, "<str>", "Client id to use (optional, default='test-*')");