update sample folder structure

Author: xiazhvera

devicedefender/script/DDTestRun.py

@@ -229,17 +229,17 @@ def delete_thing_with_certi(thingName, certiId, certiArn):
 
     if use_mqtt5:
         # Run the sample:
-        exe_path = "build/samples/device_defender/mqtt5_basic_report/"
+        exe_path = "build/samples/others/device_defender/mqtt5_basic_report/"
         # If running locally, comment out the line above and uncomment the line below:
-        #exe_path = "samples/device_defender/basic_report/build/"
+        #exe_path = "samples/others/device_defender/basic_report/build/"
 
         # Windows has a different build folder structure, but this ONLY runs on Linux currently so we do not need to worry about it
         exe_path = os.path.join(exe_path, "mqtt5-basic-report")
     else:
         # Run the sample:
-        exe_path = "build/samples/device_defender/basic_report/"
+        exe_path = "build/samples/others/device_defender/basic_report/"
         # If running locally, comment out the line above and uncomment the line below:
-        #exe_path = "samples/device_defender/basic_report/build/"
+        #exe_path = "samples/others/device_defender/basic_report/build/"
 
         # Windows has a different build folder structure, but this ONLY runs on Linux currently so we do not need to worry about it
         exe_path = os.path.join(exe_path, "basic-report")

documents/MIGRATION_GUIDE.md

@@ -1369,7 +1369,7 @@ samples.
 
 It's always helpful to look at a working example to see how new functionality works,
 to be able to tweak different options, to compare with existing code.
-For that reason, we implemented a [Publish/Subscribe example](https://github.com/aws/aws-iot-device-sdk-cpp-v2/tree/main/samples/mqtt/mqtt5_x509)
+For that reason, we implemented a [X509 Publish/Subscribe example](https://github.com/aws/aws-iot-device-sdk-cpp-v2/tree/main/samples/mqtt/mqtt5_x509)
 ([source code](https://github.com/aws/aws-iot-device-sdk-cpp-v2/blob/main/samples/mqtt/mqtt5_x509/main.cpp))
 in the v2 SDK similar to a sample provided by the v1 SDK (see a corresponding
 [readme section](https://github.com/aws/aws-iot-device-sdk-cpp/blob/master/samples/README.md) and
@@ -1438,9 +1438,7 @@ method in PublishPacketBuilder class.
 
 **Shared Subscriptions**\
 Shared Subscriptions allow multiple clients to share a subscription to a topic and only one client
-will receive messages published to that topic using a random distribution.\
-For more information, see a [shared subscription sample](https://github.com/aws/aws-iot-device-sdk-cpp-v2/blob/main/samples/mqtt5/mqtt5_shared_subscription/README.md)
-in the v2 SDK.
+will receive messages published to that topic using a random distribution.
 
 > [!NOTE]
 > AWS Iot Core supports Shared Subscriptions for both MQTT3 and MQTT5. For more information, see

documents/Secure_Tunnel_Userguide.md

@@ -249,9 +249,9 @@ secureTunnel->SendMessage(message);
 
 # Secure Tunnel Best Practices
 * You MUST NOT perform blocking operations on any callback, or you will cause a deadlock.
-* If you do not provide a Client Token during creation of the Secure Tunnel, one will be automatically generated for you to use in reconnections. This token is not saved outside of the current Secure Tunnel Client. If the Client is destroyed, the original access tokens must be rotated to connect to the secure tunnel again. Information on rotating tokens can be found here: https://docs.aws.amazon.com/iot/latest/developerguide/iot-secure-tunneling-troubleshooting.html
+* If you do not provide a Client Token during creation of the Secure Tunnel, one will be automatically generated for you to use in reconnection. This token is not saved outside of the current Secure Tunnel Client. If the Client is destroyed, the original access tokens must be rotated to connect to the secure tunnel again. Information on rotating tokens can be found here: https://docs.aws.amazon.com/iot/latest/developerguide/iot-secure-tunneling-troubleshooting.html
 * Client tokens MUST be unique. You cannot for example, pair a Client Token with an Access Token on one secure tunnel, and then use the same Client Token with a different Access Token on a separate secure tunnel. The Secure Tunnel Service will not allow a Client Token to be paired with more than one Access Token.
 * A Secure Tunnel Client that has called `Start()` will continue to attempt to connect the Secure Tunnel Service until `Stop()` is called, even if the Secure Tunnel it is trying to connect with has been closed. You MUST call `Stop()` to cease future connection attempts.
-* The [onStreamStarted](#onstreamstarted) and [onConnectionStarted](#onconnectionstarted) callbacks should be set to detect and store the service id and/or connection id of streams started by a source device for use with messages. The [Secure Tunnel sample](../samples/secure_tunneling/secure_tunnel/README.md) provides an basic example of how this can be done.
+* The [onStreamStarted](#onstreamstarted) and [onConnectionStarted](#onconnectionstarted) callbacks should be set to detect and store the service id and/or connection id of streams started by a source device for use with messages. The [Secure Tunnel sample](../samples/others/secure_tunneling/secure_tunnel/README.md) provides an basic example of how this can be done.
 * Outgoing messages MUST be assigned a service id and/or a connection id if the established stream contains a service id or a connection id or the message will be rejected. e.g. If a stream is started using service id "ssh" and connection id (1), a message sent in response must also include the service id "ssh" and connection id (1) or it will not find an active stream to send it on. Refer to the [Send Message](#send-message) code block for instruction on adding a service id and/or connection id to your message.
 

samples/CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.9...3.31)
 
 project(aws-iot-device-sdk-cpp-v2-samples)
 
-add_subdirectory(device_defender/basic_report)
-add_subdirectory(device_defender/mqtt5_basic_report)
+add_subdirectory(others/device_defender/mqtt5_basic_report)
 add_subdirectory(service_clients/fleet_provisioning/provision-basic)
 add_subdirectory(service_clients/fleet_provisioning/provision-csr)
 add_subdirectory(greengrass/ipc)
@@ -14,7 +13,7 @@ add_subdirectory(mqtt/mqtt5_aws_websocket)
 add_subdirectory(mqtt/mqtt5_custom_auth_signed)
 add_subdirectory(mqtt/mqtt5_custom_auth_unsigned)
 add_subdirectory(mqtt/mqtt5_pkcs11)
-add_subdirectory(secure_tunneling/secure_tunnel)
-add_subdirectory(secure_tunneling/tunnel_notification)
+add_subdirectory(others/secure_tunneling/secure_tunnel)
+add_subdirectory(others/secure_tunneling/tunnel_notification)
 add_subdirectory(service_clients/shadow/shadow_sync)
-add_subdirectory(commands/commands-sandbox)
+add_subdirectory(service_clients/commands/commands-sandbox)

samples/README.md

@@ -30,6 +30,7 @@ This directory contains sample applications for [aws-iot-device-sdk-cpp-v2](../R
 | [Jobs](./service_clients/jobs/jobs-sandbox/README.md) | Receive and execute remote operations sent from the Jobs service. |
 | [Basic Fleet Provisioning](./service_clients/fleet_provisioning/provision-basic/README.md) | Provision a device using the Fleet Provisioning template. |
 | [CSR Fleet Provisioning](./service_clients/fleet_provisioning/provision-csr/README.md) | Demonstrates CSR-based device certificate provisioning. |
+| [Commands](./service_clients/commands/commands-sandbox/README.md) | Receive and process remote instructions using AWS IoT Device Management commands |
 
 
 ### Greengrass Samples
@@ -39,6 +40,16 @@ This directory contains sample applications for [aws-iot-device-sdk-cpp-v2](../R
 | [Greengrass Discovery](./greengrass/basic_discovery/README.md) | Discover and connect to a local Greengrass core. |
 | [Greengrass IPC](./greengrass/ipc/README.md) | Demonstrates Inter-Process Communication (IPC) with Greengrass components. |
 
+### Others
+##### Samples that interact with other AWS IoT Services
+| Sample | Description |
+|--------|-------------|
+| [Device Defender](./others/device_defender/mqtt5_basic_report/README.md) | Monitor the health of your IoT device using AWS IoT Device Defender. |
+| [Secure Tunneling](./others/secure_tunneling/secure_tunnel/README.md) | Connect a destination or a source Secure Tunnel Client to an AWS IoT Secure Tunnel endpoint. |
+| [Secure Tunneling Notification](./others/secure_tunneling/tunnel_notification/README.md) | Receive a tunnel notification using a Secure Tunnel Client. |
+
+
+
 ## Instructions
 
 First build and install aws-iot-devices-sdk-cpp-v2 with following instructions from [Installation](../README.md#Installation).