update default client id to be mqtt5-sample-*

Author: xiazhvera

samples/mqtt/mqtt5_aws_websocket.md

@@ -49,7 +49,7 @@ The AWS IAM permission policy associated with the AWS credentials resolved by th
         "iot:Connect"
       ],
       "Resource": [
-        "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+        "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
       ]
     }
   ]
@@ -60,7 +60,7 @@ Replace with the following with the data from your AWS account:
 * `<region>`: The AWS IoT Core region where you created your AWS IoT Core thing you wish to use with this sample. For example `us-east-1`.
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>
 
@@ -92,7 +92,7 @@ required arguments:
   --signing_region   Signing region for websocket connection (default: None)
 
 optional arguments:
-  --client_id        Client ID (default: mqtt5-sample-809571c8)
+  --client_id        Client ID (default: mqtt5-sample-<uuid>)
   --ca_file          Path to optional CA bundle (PEM) (default: None)
   --topic            Topic (default: test/topic)
   --message          Message payload (default: Hello from mqtt5 sample)

samples/mqtt/mqtt5_custom_auth.md

@@ -51,7 +51,7 @@ Below is a sample policy that provides the necessary privileges.
         "iot:Connect"
       ],
       "Resource": [
-        "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+        "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
       ]
     }
   ]
@@ -62,7 +62,7 @@ Replace with the following with the data from your AWS account:
 * `<region>`: The AWS IoT Core region where you created your AWS IoT Core thing you wish to use with this sample. For example `us-east-1`.
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>
 
@@ -121,7 +121,7 @@ required arguments:
   --auth_password       The password to send when connecting through a custom authorizer (optional) (default: None)
 
 optional arguments:
-  --client_id           Client ID (default: test-f3168b42)
+  --client_id           Client ID (default: mqtt5-sample-<uuid>)
   --topic               Topic (default: test/topic)
   --message             Message payload (default: Hello from mqtt5 sample)
   --count               Messages to publish (0 = infinite) (default: 5)

samples/mqtt/mqtt5_custom_auth_signed.py

@@ -33,7 +33,7 @@
                     help="The password to send when connecting through a custom authorizer (optional)")
 
 # Optional Arguments
-optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"test-{uuid.uuid4().hex[:8]}", 
+optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"mqtt5-sample-{uuid.uuid4().hex[:8]}", 
                       help="Client ID")
 optional.add_argument("--topic", default="test/topic",  metavar="", dest="input_topic", 
                       help="Topic")

samples/mqtt/mqtt5_custom_auth_unsigned.py

@@ -26,7 +26,7 @@
                     help="The password to send when connecting through a custom authorizer")
 
 # Optional Arguments
-optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"test-{uuid.uuid4().hex[:8]}",
+optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"mqtt5-sample-{uuid.uuid4().hex[:8]}",
                       help="Client ID")
 optional.add_argument("--topic", default="test/topic",  metavar="", dest="input_topic",
                       help="Topic")

samples/mqtt/mqtt5_pkcs11_connect.md

@@ -52,7 +52,7 @@ Your IoT Core Thing's [Policy](https://docs.aws.amazon.com/iot/latest/developerg
         "iot:Connect"
       ],
       "Resource": [
-        "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+        "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
       ]
     }
   ]
@@ -63,7 +63,7 @@ Replace with the following with the data from your AWS account:
 * `<region>`: The AWS IoT Core region where you created your AWS IoT Core thing you wish to use with this sample. For example `us-east-1`.
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>
 
@@ -111,7 +111,7 @@ optional arguments:
   --count         Messages to publish (0 = infinite) (default: 5)
   --proxy_host    HTTP proxy host (default: None)
   --proxy_port    HTTP proxy port (default: 0)
-  --client_id     Client ID (default: test-548e4344)
+  --client_id     Client ID (default: mqtt5-sample-<uuid>)
   ```
 
 ### Run sample with SoftHSM

samples/mqtt/mqtt5_pkcs11_connect.py

@@ -46,7 +46,7 @@
                       help="HTTP proxy host")
 optional.add_argument("--proxy_port", type=int, default=0,  metavar="", dest="input_proxy_port",
                       help="HTTP proxy port")
-optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"test-{uuid.uuid4().hex[:8]}",
+optional.add_argument("--client_id",  metavar="", dest="input_clientId", default=f"mqtt5-sample-{uuid.uuid4().hex[:8]}",
                     help="Client ID")
 
 # args contains all the parsed commandline arguments used by the sample

samples/mqtt/mqtt5_x509.md

@@ -51,7 +51,7 @@ Your IoT Core Thing's [Policy](https://docs.aws.amazon.com/iot/latest/developerg
         "iot:Connect"
       ],
       "Resource": [
-        "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+        "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
       ]
     }
   ]
@@ -62,7 +62,7 @@ Replace with the following with the data from your AWS account:
 * `<region>`: The AWS IoT Core region where you created your AWS IoT Core thing you wish to use with this sample. For example `us-east-1`.
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>
 
@@ -96,7 +96,7 @@ required arguments:
   --key         Path to the private key file to use during mTLS connection establishment (default: None)
 
 optional arguments:
-  --client_id   Client ID (default: mqtt5-sample-5873a450)
+  --client_id   Client ID (default: mqtt5-sample-<uuid>)
   --ca_file     Path to optional CA bundle (PEM) (default: None)
   --topic       Topic (default: test/topic)
   --message     Message payload (default: Hello from mqtt5 sample)

samples/service_clients/fleet_provisioning_basic.md

@@ -57,7 +57,7 @@ The [IAM Policy](https://docs.aws.amazon.com/iot/latest/developerguide/iot-polic
     {
       "Effect": "Allow",
       "Action": "iot:Connect",
-      "Resource": "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+      "Resource": "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
     }
   ]
 }
@@ -68,7 +68,7 @@ Replace with the following with the data from your AWS account:
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 * `<templatename>`: The name of your AWS Fleet Provisioning template you want to use to create new AWS IoT Core Things.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>
 

samples/service_clients/fleet_provisioning_basic.py

@@ -49,7 +49,7 @@ def on_lifecycle_stopped(event: mqtt5.LifecycleStoppedData):
         stopped.set_result(True)
 
     connect_options=mqtt5.ConnectPacket(
-        client_id="test-" + uuid.uuid4().hex,
+        client_id="mqtt5-sample-" + uuid.uuid4().hex,
     )
 
     # Create a mqtt5 connection from the command line data

samples/service_clients/fleet_provisioning_csr.md

@@ -57,7 +57,7 @@ The [IAM Policy](https://docs.aws.amazon.com/iot/latest/developerguide/iot-polic
     {
       "Effect": "Allow",
       "Action": "iot:Connect",
-      "Resource": "arn:aws:iot:<b>region</b>:<b>account</b>:client/test-*"
+      "Resource": "arn:aws:iot:<b>region</b>:<b>account</b>:client/mqtt5-sample-*"
     }
   ]
 }
@@ -68,7 +68,7 @@ Replace with the following with the data from your AWS account:
 * `<account>`: Your AWS IoT Core account ID. This is the set of numbers in the top right next to your AWS account name when using the AWS IoT Core website.
 * `<templatename>`: The name of your AWS Fleet Provisioning template you want to use to create new AWS IoT Core Things.
 
-Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `test-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
+Note that in a real application, you may want to avoid the use of wildcards in your ClientID or use them selectively. Please follow best practices when working with AWS on production applications using the SDK. Also, for the purposes of this sample, please make sure your policy allows a client ID of `mqtt5-sample-*` to connect or use `--client_id <client ID here>` to send the client ID your policy supports.
 
 </details>