Request response samples, rebased

.builder/actions/build_samples.py

@@ -19,12 +19,17 @@ def run(self, env):
 
         steps = []
         samples = [
+            'samples/deprecated/fleet_provisioning/fleet_provisioning',
+            'samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning',
+            'samples/deprecated/jobs/job_execution',
+            'samples/deprecated/jobs/mqtt5_job_execution',
+            'samples/deprecated/shadow/shadow_sync',
+            'samples/deprecated/shadow/mqtt5_shadow_sync',
             'samples/greengrass/basic_discovery',
             'samples/greengrass/ipc',
-            'samples/fleet_provisioning/fleet_provisioning',
-            'samples/fleet_provisioning/mqtt5_fleet_provisioning',
-            'samples/jobs/job_execution',
-            'samples/jobs/mqtt5_job_execution',
+            'samples/fleet_provisioning/provision-basic',
+            'samples/fleet_provisioning/provision-csr',
+            'samples/jobs/jobs-sandbox',
             'samples/mqtt/basic_connect',
             'samples/mqtt/custom_authorizer_connect',
             'samples/mqtt/pkcs11_connect',
@@ -40,8 +45,7 @@ def run(self, env):
             "samples/pub_sub/cycle_pub_sub",
             'samples/secure_tunneling/secure_tunnel',
             'samples/secure_tunneling/tunnel_notification',
-            'samples/shadow/shadow_sync',
-            'samples/shadow/mqtt5_shadow_sync',
+            'samples/shadow/shadow-sandbox',
         ]
 
         defender_samples = []

.github/workflows/ci_run_fleet_provisioning_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/fleet_provisioning/fleet_provisioning/fleet-provisioning",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/fleet_provisioning/fleet_provisioning/fleet-provisioning",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/fleet_provisioning/mqtt5_fleet_provisioning/mqtt5-fleet-provisioning",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/mqtt5-fleet-provisioning",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

.github/workflows/ci_run_jobs_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/jobs/job_execution/job-execution",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/jobs/job_execution/job-execution",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

.github/workflows/ci_run_jobs_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/jobs/mqtt5_job_execution/mqtt5-job-execution",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/jobs/mqtt5_job_execution/mqtt5-job-execution",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

.github/workflows/ci_run_shadow_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/shadow/shadow_sync/shadow-sync",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/shadow/shadow_sync/shadow-sync",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

.github/workflows/ci_run_shadow_mqtt5_cfg.json

@@ -1,6 +1,6 @@
 {
     "language": "CPP",
-    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/shadow/mqtt5_shadow_sync/mqtt5-shadow-sync",
+    "sample_file": "./aws-iot-device-sdk-cpp-v2/build/samples/deprecated/shadow/mqtt5_shadow_sync/mqtt5-shadow-sync",
     "sample_region": "us-east-1",
     "sample_main_class": "",
     "arguments": [

codebuild/samples/shadow-linux.sh

@@ -4,7 +4,8 @@ set -e
 
 env
 
-pushd $CODEBUILD_SRC_DIR/samples/shadow/shadow_sync
+# v1 MQTT311 shadow sample
+pushd $CODEBUILD_SRC_DIR/samples/deprecated/shadow/shadow_sync
 
 mkdir _build
 cd _build
@@ -17,3 +18,29 @@ echo "Shadow-Sync test"
 ./shadow-sync --endpoint $ENDPOINT --key /tmp/privatekey.pem --cert /tmp/certificate.pem --thing_name CI_CodeBuild_Thing --is_ci true
 
 popd
+
+# v1 MQTT5 shadow sample
+pushd $CODEBUILD_SRC_DIR/samples/deprecated/shadow/mqtt5_shadow_sync
+
+mkdir _build
+cd _build
+cmake -DCMAKE_PREFIX_PATH=/tmp/install ..
+make -j
+
+ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "ci/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
+
+echo "Shadow-Sync test"
+./mqtt5-shadow-sync --endpoint $ENDPOINT --key /tmp/privatekey.pem --cert /tmp/certificate.pem --thing_name CI_CodeBuild_Thing --is_ci true
+
+popd
+
+# v2 MQTT5 shadow sample - smaple is interactive so build but don't run
+
+pushd $CODEBUILD_SRC_DIR/samples/shadow/shadow-sandbox
+
+mkdir _build
+cd _build
+cmake -DCMAKE_PREFIX_PATH=/tmp/install ..
+make -j
+
+popd

samples/CMakeLists.txt

@@ -4,12 +4,11 @@ project(aws-iot-device-sdk-cpp-v2-samples)
 
 add_subdirectory(device_defender/basic_report)
 add_subdirectory(device_defender/mqtt5_basic_report)
+add_subdirectory(fleet_provisioning/provision-basic)
+add_subdirectory(fleet_provisioning/provision-csr)
 add_subdirectory(greengrass/ipc)
 add_subdirectory(greengrass/basic_discovery)
-add_subdirectory(fleet_provisioning/fleet_provisioning)
-add_subdirectory(fleet_provisioning/mqtt5_fleet_provisioning)
-add_subdirectory(jobs/job_execution)
-add_subdirectory(jobs/mqtt5_job_execution)
+add_subdirectory(jobs/jobs-sandbox)
 add_subdirectory(mqtt/basic_connect)
 add_subdirectory(mqtt/custom_authorizer_connect)
 add_subdirectory(mqtt/pkcs11_connect)
@@ -25,4 +24,11 @@ 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(shadow/mqtt5_shadow_sync)
+
+
+add_subdirectory(deprecated/shadow/shadow_sync)
+add_subdirectory(deprecated/shadow/mqtt5_shadow_sync)
+add_subdirectory(deprecated/fleet_provisioning/fleet_provisioning)
+add_subdirectory(deprecated/fleet_provisioning/mqtt5_fleet_provisioning)
+add_subdirectory(deprecated/jobs/job_execution)
+add_subdirectory(deprecated/jobs/mqtt5_job_execution)

samples/README.md

@@ -9,9 +9,6 @@
     + [MQTT over Websockets with Cognito](./mqtt5/mqtt5_pubsub/README.md#mqtt-over-websockets-with-cognito)
     + [HTTP Proxy](./mqtt5/mqtt5_pubsub/README.md#http-proxy)
 * [Mqtt5 Shared Subscription](./mqtt5/mqtt5_shared_subscription/README.md)
-* [Mqtt5 Jobs](./jobs/mqtt5_job_execution/README.md)
-* [Mqtt5 Shadow](./shadow/mqtt5_shadow_sync/README.md)
-* [Mqtt5 Fleet Provisioning](./fleet_provisioning/mqtt5_fleet_provisioning/README.md)
 ## MQTT311 Samples
 * [Basic Pub-Sub](./pub_sub/basic_pub_sub/README.md)
 * [Basic Connect](./mqtt/basic_connect/README.md)
@@ -22,10 +19,11 @@
 * [Windows Certificate MQTT Connect](./mqtt/windows_cert_connect/README.md)
 * [Custom Authorizer Connect](./mqtt/custom_authorizer_connect/README.md)
 * [Cognito Connect](./mqtt/cognito_connect/README.md)
-* [Shadow](./shadow/shadow_sync/README.md)
-* [Jobs](./jobs/job_execution/README.md)
-* [Fleet provisioning](./fleet_provisioning/fleet_provisioning/README.md)
 ## Other Samples
+* [Jobs Sandbox](./jobs/jobs-sandbox/README.md)
+* [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)
 * [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/deprecated/fleet_provisioning/fleet_provisioning/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.9...3.31)
+# note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
+project(fleet-provisioning CXX)
+
+file(GLOB SRC_FILES
+       "*.cpp"
+       "../../../utils/CommandLineUtils.cpp"
+       "../../../utils/CommandLineUtils.h"
+)
+
+add_executable(${PROJECT_NAME} ${SRC_FILES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    CXX_STANDARD 14)
+
+#set warnings
+if (MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+else ()
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+endif ()
+
+find_package(aws-crt-cpp REQUIRED)
+find_package(IotIdentity-cpp REQUIRED)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
+include(AwsSanitizers)
+enable_language(C)
+aws_add_sanitizers(${PROJECT_NAME})
+
+target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotIdentity-cpp)

samples/fleet_provisioning/fleet_provisioning/README.md → samples/deprecated/fleet_provisioning/fleet_provisioning/README.md

@@ -1,6 +1,6 @@
 # Fleet provisioning
 
-[**Return to main sample list**](../../README.md)
+[**Return to main sample list**](../../../README.md)
 
 This sample uses the AWS IoT [Fleet provisioning](https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html) to provision devices using either a CSR or Keys-And-Certificate and subsequently calls RegisterThing. This allows you to create new AWS IoT Core things using a Fleet Provisioning Template.
 

samples/fleet_provisioning/fleet_provisioning/main.cpp → samples/deprecated/fleet_provisioning/fleet_provisioning/main.cpp

@@ -29,7 +29,7 @@
 
 #include <fstream>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;

samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.9...3.31)
+# note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
+project(mqtt5-fleet-provisioning CXX)
+
+file(GLOB SRC_FILES
+       "*.cpp"
+       "../../../utils/CommandLineUtils.cpp"
+       "../../../utils/CommandLineUtils.h"
+)
+
+add_executable(${PROJECT_NAME} ${SRC_FILES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    CXX_STANDARD 14)
+
+#set warnings
+if (MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+else ()
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+endif ()
+
+find_package(aws-crt-cpp REQUIRED)
+find_package(IotIdentity-cpp REQUIRED)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
+include(AwsSanitizers)
+enable_language(C)
+aws_add_sanitizers(${PROJECT_NAME})
+
+target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotIdentity-cpp)

samples/fleet_provisioning/mqtt5_fleet_provisioning/README.md → samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/README.md

@@ -1,6 +1,6 @@
 # Fleet provisioning
 
-[**Return to main sample list**](../../README.md)
+[**Return to main sample list**](../../../README.md)
 
 This sample uses the AWS IoT [Fleet provisioning](https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html) to provision devices using either a CSR or Keys-And-Certificate and subsequently calls RegisterThing. This allows you to create new AWS IoT Core things using a Fleet Provisioning Template.
 

samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp → samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp

@@ -30,7 +30,7 @@
 
 #include <fstream>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;

samples/deprecated/jobs/job_execution/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.9...3.31)
+# note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
+project(job-execution CXX)
+
+file(GLOB SRC_FILES
+       "*.cpp"
+       "../../../utils/CommandLineUtils.cpp"
+       "../../../utils/CommandLineUtils.h"
+)
+
+add_executable(${PROJECT_NAME} ${SRC_FILES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    CXX_STANDARD 14)
+
+#set warnings
+if (MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+else ()
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+endif ()
+
+find_package(aws-crt-cpp REQUIRED)
+find_package(IotJobs-cpp REQUIRED)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
+include(AwsSanitizers)
+enable_language(C)
+aws_add_sanitizers(${PROJECT_NAME})
+
+target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotJobs-cpp)

samples/jobs/job_execution/README.md → samples/deprecated/jobs/job_execution/README.md

@@ -1,6 +1,6 @@
 # Jobs
 
-[**Return to main sample list**](../../README.md)
+[**Return to main sample list**](../../../README.md)
 
 This sample uses the AWS IoT [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) Service to describe jobs, it also executes them. [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) is a service that allows you to define and respond to remote operation requests defined through the AWS IoT Core website or via any other device (or CLI command) that can access the [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) service.
 

samples/jobs/job_execution/main.cpp → samples/deprecated/jobs/job_execution/main.cpp

@@ -30,7 +30,7 @@
 #include <mutex>
 #include <thread>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotjobs;

samples/jobs/mqtt5_job_execution/CMakeLists.txt → samples/deprecated/jobs/mqtt5_job_execution/CMakeLists.txt

@@ -4,8 +4,8 @@ project(mqtt5-job-execution CXX)
 
 file(GLOB SRC_FILES
        "*.cpp"
-       "../../utils/CommandLineUtils.cpp"
-       "../../utils/CommandLineUtils.h"
+       "../../../utils/CommandLineUtils.cpp"
+       "../../../utils/CommandLineUtils.h"
 )
 
 add_executable(${PROJECT_NAME} ${SRC_FILES})

samples/jobs/mqtt5_job_execution/README.md → samples/deprecated/jobs/mqtt5_job_execution/README.md

@@ -1,6 +1,6 @@
 # Jobs
 
-[**Return to main sample list**](../../README.md)
+[**Return to main sample list**](../../../README.md)
 
 This sample uses the AWS IoT [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) Service to describe jobs to execute, it them executes them. [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) is a service that allows you to define and respond to remote operation requests defined through the AWS IoT Core website or via any other device (or CLI command) that can access the [Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) service.
 

samples/jobs/mqtt5_job_execution/main.cpp → samples/deprecated/jobs/mqtt5_job_execution/main.cpp

@@ -29,7 +29,7 @@
 #include <mutex>
 #include <thread>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotjobs;

samples/shadow/mqtt5_shadow_sync/CMakeLists.txt → samples/deprecated/shadow/mqtt5_shadow_sync/CMakeLists.txt

@@ -4,8 +4,8 @@ project(mqtt5-shadow-sync CXX)
 
 file(GLOB SRC_FILES
        "*.cpp"
-       "../../utils/CommandLineUtils.cpp"
-       "../../utils/CommandLineUtils.h"
+       "../../../utils/CommandLineUtils.cpp"
+       "../../../utils/CommandLineUtils.h"
 )
 
 add_executable(${PROJECT_NAME} ${SRC_FILES})

samples/shadow/mqtt5_shadow_sync/README.md → samples/deprecated/shadow/mqtt5_shadow_sync/README.md

@@ -1,6 +1,6 @@
 # Shadow
 
-[**Return to main sample list**](../../README.md)
+[**Return to main sample list**](../../../README.md)
 
 This sample uses the AWS IoT [Device Shadow](https://docs.aws.amazon.com/iot/latest/developerguide/iot-device-shadows.html) Service to keep a property in sync between device and server. Imagine a light whose color may be changed through an app, or set by a local user.
 

samples/shadow/mqtt5_shadow_sync/main.cpp → samples/deprecated/shadow/mqtt5_shadow_sync/main.cpp

@@ -29,7 +29,7 @@
 #include <mutex>
 #include <thread>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotshadow;