From 791d477d49faf8ec7c5a581678fe234d05f37090 Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Thu, 19 Oct 2023 20:17:35 -0400
Subject: [PATCH] Moved Aurora, bump the clap version, and add Aurora metadata.

---
 .doc_gen/metadata/aurora_metadata.yaml        | 169 +++++++++++++++++-
 .../cross_service/detect_faces/Cargo.toml     |   2 +-
 .../cross_service/detect_labels/Cargo.toml    |   2 +-
 .../cross_service/telephone/Cargo.toml        |   2 +-
 rust_dev_preview/examples/Cargo.toml          |   1 +
 .../examples/apigateway/Cargo.toml            |   2 +-
 .../examples/apigatewaymanagement/Cargo.toml  |   2 +-
 .../applicationautoscaling/Cargo.toml         |   2 +-
 rust_dev_preview/examples/aurora/Cargo.toml   |  25 +++
 rust_dev_preview/examples/aurora/README.md    |  69 +++++++
 .../src/aurora_scenario/mod.rs                |  20 ++-
 .../src/aurora_scenario/tests.rs              |  23 +++
 .../src/bin/aurora-scenario.rs                |   0
 .../examples/{rds => aurora}/src/lib.rs       |   0
 .../examples/{rds => aurora}/src/rds.rs       |  30 ++++
 .../examples/auto-scaling/Cargo.toml          |   2 +-
 .../examples/autoscalingplans/Cargo.toml      |   2 +-
 rust_dev_preview/examples/batch/Cargo.toml    |   2 +-
 .../examples/cloudformation/Cargo.toml        |   2 +-
 .../examples/cloudwatch/Cargo.toml            |   2 +-
 .../examples/cloudwatchlogs/Cargo.toml        |   2 +-
 .../examples/cognitoidentity/Cargo.toml       |   2 +-
 .../cognitoidentityprovider/Cargo.toml        |   2 +-
 .../examples/cognitosync/Cargo.toml           |   2 +-
 .../examples/concurrency/Cargo.toml           |   2 +-
 rust_dev_preview/examples/config/Cargo.toml   |   2 +-
 rust_dev_preview/examples/dynamodb/Cargo.toml |   2 +-
 rust_dev_preview/examples/ebs/Cargo.toml      |   2 +-
 rust_dev_preview/examples/ec2/Cargo.toml      |   2 +-
 rust_dev_preview/examples/ecr/Cargo.toml      |   2 +-
 rust_dev_preview/examples/ecs/Cargo.toml      |   2 +-
 rust_dev_preview/examples/eks/Cargo.toml      |   2 +-
 rust_dev_preview/examples/firehose/Cargo.toml |   2 +-
 .../examples/globalaccelerator/Cargo.toml     |   2 +-
 rust_dev_preview/examples/glue/Cargo.toml     |   2 +-
 .../examples/greengrassv2/Cargo.toml          |   2 +-
 rust_dev_preview/examples/iam/Cargo.toml      |   2 +-
 rust_dev_preview/examples/iot/Cargo.toml      |   2 +-
 rust_dev_preview/examples/kinesis/Cargo.toml  |   2 +-
 rust_dev_preview/examples/kms/Cargo.toml      |   2 +-
 rust_dev_preview/examples/lambda/Cargo.toml   |   2 +-
 .../examples/logging/logger/Cargo.toml        |   2 +-
 .../examples/logging/tracing/Cargo.toml       |   2 +-
 .../examples/medialive/Cargo.toml             |   2 +-
 .../examples/mediapackage/Cargo.toml          |   2 +-
 rust_dev_preview/examples/polly/Cargo.toml    |   2 +-
 rust_dev_preview/examples/qldb/Cargo.toml     |   2 +-
 rust_dev_preview/examples/rds/Cargo.toml      |   2 +-
 rust_dev_preview/examples/rds/README.md       |  26 ++-
 rust_dev_preview/examples/rdsdata/Cargo.toml  |   2 +-
 rust_dev_preview/examples/route53/Cargo.toml  |   2 +-
 rust_dev_preview/examples/s3/Cargo.toml       |   2 +-
 .../examples/sagemaker/Cargo.toml             |   2 +-
 .../examples/sdk-config/Cargo.toml            |   2 +-
 .../examples/secretsmanager/Cargo.toml        |   2 +-
 .../sending-presigned-requests/Cargo.toml     |   2 +-
 rust_dev_preview/examples/ses/Cargo.toml      |   2 +-
 rust_dev_preview/examples/sitewise/Cargo.toml |   2 +-
 rust_dev_preview/examples/snowball/Cargo.toml |   2 +-
 rust_dev_preview/examples/sns/Cargo.toml      |   2 +-
 rust_dev_preview/examples/sqs/Cargo.toml      |   2 +-
 rust_dev_preview/examples/ssm/Cargo.toml      |   2 +-
 .../examples/stepfunction/Cargo.toml          |   2 +-
 rust_dev_preview/examples/sts/Cargo.toml      |   2 +-
 rust_dev_preview/examples/testing/Cargo.toml  |   2 +-
 .../examples/transcribestreaming/Cargo.toml   |   2 +-
 rust_dev_preview/lambda/calculator/Cargo.toml |   2 +-
 67 files changed, 397 insertions(+), 80 deletions(-)
 create mode 100644 rust_dev_preview/examples/aurora/Cargo.toml
 create mode 100644 rust_dev_preview/examples/aurora/README.md
 rename rust_dev_preview/examples/{rds => aurora}/src/aurora_scenario/mod.rs (95%)
 rename rust_dev_preview/examples/{rds => aurora}/src/aurora_scenario/tests.rs (97%)
 rename rust_dev_preview/examples/{rds => aurora}/src/bin/aurora-scenario.rs (100%)
 rename rust_dev_preview/examples/{rds => aurora}/src/lib.rs (100%)
 rename rust_dev_preview/examples/{rds => aurora}/src/rds.rs (79%)

diff --git a/.doc_gen/metadata/aurora_metadata.yaml b/.doc_gen/metadata/aurora_metadata.yaml
index bd7bb4948bd..a8799c9efb0 100644
--- a/.doc_gen/metadata/aurora_metadata.yaml
+++ b/.doc_gen/metadata/aurora_metadata.yaml
@@ -34,6 +34,15 @@ aurora_Hello:
             - description: Code for the hello_aurora.cpp source file.
               snippet_tags:
                 - cpp.example_code.aurora.hello_aurora
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.get_cluster.usage
+                - rust.aurora.describe_db_clusters.wrapper
+                - rust.aurora.get_cluster.test
   services:
     aurora: {DescribeDBClusters}
 aurora_DescribeDBClusterParameterGroups:
@@ -165,6 +174,15 @@ aurora_CreateDBClusterParameterGroup:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.CreateDBClusterParameterGroup
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.set_engine.usage
+                - rust.aurora.create_db_cluster_parameter_group.wrapper
+                - rust.aurora.set_engine.test
   services:
     aurora: {CreateDBClusterParameterGroup}
 aurora_DeleteDBClusterParameterGroup:
@@ -230,6 +248,15 @@ aurora_DeleteDBClusterParameterGroup:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DeleteDBClusterParameterGroup
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.clean_up.usage
+                - rust.aurora.delete_db_cluster_parameter_group.wrapper
+                - rust.aurora.clean_up.test
   services:
     aurora: {DeleteDBClusterParameterGroup}
 aurora_DescribeDBClusterParameters:
@@ -295,6 +322,15 @@ aurora_DescribeDBClusterParameters:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DescribeDBClusterParameters
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.cluster_parameter.usage
+                - rust.aurora.describe_db_cluster_parameters.wrapper
+                - rust.aurora.cluster_parameter.test
   services:
     aurora: {DescribeDBClusterParameters}
 aurora_ModifyDBClusterParameterGroup:
@@ -360,6 +396,15 @@ aurora_ModifyDBClusterParameterGroup:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.ModifyDBClusterParameterGroup
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.update_auto_increment.usage
+                - rust.aurora.modify_db_cluster_parameter_group.wrapper
+                - rust.aurora.update_auto_increment.test
   services:
     aurora: {ModifyDBClusterParameterGroup}
 aurora_DescribeDBClusters:
@@ -425,6 +470,15 @@ aurora_DescribeDBClusters:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DescribeDBClusters
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.start_cluster_and_instance.usage
+                - rust.aurora.describe_db_clusters.wrapper
+                - rust.aurora.start_cluster_and_instance.test
   services:
     aurora: {DescribeDBClusters}
 aurora_CreateDBCluster:
@@ -490,6 +544,15 @@ aurora_CreateDBCluster:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.CreateDBCluster
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.start_cluster_and_instance.usage
+                - rust.aurora.create_db_cluster.wrapper
+                - rust.aurora.start_cluster_and_instance.test
   services:
     aurora: {CreateDBCluster}
 aurora_DeleteDBCluster:
@@ -555,6 +618,15 @@ aurora_DeleteDBCluster:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DeleteDBCluster
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.clean_up.usage
+                - rust.aurora.delete_db_cluster.wrapper
+                - rust.aurora.clean_up.test
   services:
     aurora: {DeleteDBCluster}
 aurora_CreateDBClusterSnapshot:
@@ -620,6 +692,15 @@ aurora_CreateDBClusterSnapshot:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.CreateDBClusterSnapshot
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.start_cluster_and_instance.usage
+                - rust.aurora.create_db_cluster_snapshot.wrapper
+                - rust.aurora.start_cluster_and_instance.test
   services:
     aurora: {CreateDBClusterSnapshot}
 aurora_DescribeDBClusterSnapshots:
@@ -750,6 +831,15 @@ aurora_CreateDBInstance:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.CreateDBInstance
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.start_cluster_and_instance.usage
+                - rust.aurora.create_db_instance.wrapper
+                - rust.aurora.start_cluster_and_instance.test
   services:
     aurora: {CreateDBInstance}
 aurora_DescribeDBEngineVersions:
@@ -815,6 +905,15 @@ aurora_DescribeDBEngineVersions:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DescribeDBEngineVersions
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.get_engines.usage
+                - rust.aurora.describe_db_engine_versions.wrapper
+                - rust.aurora.get_engines.test
   services:
     aurora: {DescribeDBEngineVersions}
 aurora_DescribeOrderableDBInstanceOptions:
@@ -871,6 +970,15 @@ aurora_DescribeOrderableDBInstanceOptions:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DescribeOrderableDBInstanceOptions
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.get_instance_classes.usage
+                - rust.aurora.describe_orderable_db_instance_options.wrapper
+                - rust.aurora.get_instance_classes.test
   services:
     aurora: {DescribeOrderableDBInstanceOptions}
 aurora_DescribeDBInstances:
@@ -936,6 +1044,15 @@ aurora_DescribeDBInstances:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DescribeDBInstances
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.clean_up.usage
+                - rust.aurora.describe_db_instances.wrapper
+                - rust.aurora.clean_up.test
   services:
     aurora: {DescribeDBInstances}
 aurora_DeleteDBInstance:
@@ -1001,6 +1118,15 @@ aurora_DeleteDBInstance:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.client
                 - cpp.example_code.aurora.DeleteDBInstance
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - snippet_tags:
+                - rust.aurora.clean_up.usage
+                - rust.aurora.delete_db_instance.wrapper
+                - rust.aurora.clean_up.test
   services:
     aurora: {DeleteDBInstance}
 aurora_Scenario_GetStartedClusters:
@@ -1079,9 +1205,42 @@ aurora_Scenario_GetStartedClusters:
               snippet_tags:
                 - cpp.example_code.aurora.client_configuration
                 - cpp.example_code.aurora.get_started_clusters
+    Rust:
+      versions:
+        - sdk_version: 1
+          github: rust_dev_preview/examples/aurora
+          excerpts:
+            - description: A library containing the scenario-specific functions for the Aurora Scenario.
+              snippet_files:
+                - rust_dev_preview/examples/aurora/src/aurora_scenario/mod.rs
+            - description: Tests for the library using automocks around the RDS Client wrapper.
+              snippet_files:
+                - rust_dev_preview/examples/aurora/src/aurora_scenario/test.rs
+            - description: A binary to run the scenario from front to end, using inquirer to allow the user to make some decisions.
+              snippet_files:
+                - rust_dev_preview/examples/aurora/src/bin/aurora-scenario.rs
+            - description: A wrapper around the RDS service that allows automocking for tests.
+              snippet_files:
+                - rust_dev_preview/examples/aurora/src/rds.rs
+            - description: The Cargo.toml with dependencies used in this scenario.
+              snippet_files:
+                - rust_dev_preview/examples/aurora/Cargo.toml
   services:
-    aurora: {CreateDBCluster, CreateDBClusterParameterGroup, CreateDBClusterSnapshot,
-             CreateDBInstance, DeleteDBCluster, DeleteDBClusterParameterGroup, DeleteDBInstance,
-             DescribeDBClusterParameterGroups, DescribeDBClusterSnapshots, DescribeDBClusters,
-             DescribeDBEngineVersions, DescribeDBInstances, DescribeOrderableDBInstanceOptions,
-             DescribeDBClusterParameters, ModifyDBClusterParameterGroup}
+    aurora:
+      {
+        CreateDBCluster,
+        CreateDBClusterParameterGroup,
+        CreateDBClusterSnapshot,
+        CreateDBInstance,
+        DeleteDBCluster,
+        DeleteDBClusterParameterGroup,
+        DeleteDBInstance,
+        DescribeDBClusterParameterGroups,
+        DescribeDBClusterSnapshots,
+        DescribeDBClusters,
+        DescribeDBEngineVersions,
+        DescribeDBInstances,
+        DescribeOrderableDBInstanceOptions,
+        DescribeDBClusterParameters,
+        ModifyDBClusterParameterGroup,
+      }
diff --git a/rust_dev_preview/cross_service/detect_faces/Cargo.toml b/rust_dev_preview/cross_service/detect_faces/Cargo.toml
index 0627676b889..c64afe985e7 100644
--- a/rust_dev_preview/cross_service/detect_faces/Cargo.toml
+++ b/rust_dev_preview/cross_service/detect_faces/Cargo.toml
@@ -14,5 +14,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/cross_service/detect_labels/Cargo.toml b/rust_dev_preview/cross_service/detect_labels/Cargo.toml
index f883392eb83..19aeb35bad8 100644
--- a/rust_dev_preview/cross_service/detect_labels/Cargo.toml
+++ b/rust_dev_preview/cross_service/detect_labels/Cargo.toml
@@ -16,6 +16,6 @@ aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch
 aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 kamadak-exif = "0.5.4"
diff --git a/rust_dev_preview/cross_service/telephone/Cargo.toml b/rust_dev_preview/cross_service/telephone/Cargo.toml
index 00c5404d588..f4597665bde 100644
--- a/rust_dev_preview/cross_service/telephone/Cargo.toml
+++ b/rust_dev_preview/cross_service/telephone/Cargo.toml
@@ -16,5 +16,5 @@ tokio = { version = "1.20.1", features = ["full"] }
 bytes = "1"
 reqwest = "0.11.4"
 serde_json = "1.0"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/Cargo.toml b/rust_dev_preview/examples/Cargo.toml
index ee214b256cd..bab032a57bf 100644
--- a/rust_dev_preview/examples/Cargo.toml
+++ b/rust_dev_preview/examples/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "apigateway",
     "apigatewaymanagement",
     "applicationautoscaling",
+    "aurora",
     "auto-scaling",
     "autoscalingplans",
     "batch",
diff --git a/rust_dev_preview/examples/apigateway/Cargo.toml b/rust_dev_preview/examples/apigateway/Cargo.toml
index 7a919451adf..ee8ead63b19 100644
--- a/rust_dev_preview/examples/apigateway/Cargo.toml
+++ b/rust_dev_preview/examples/apigateway/Cargo.toml
@@ -11,7 +11,7 @@ aws-sdk-apigateway = { git = "https://github.com/awslabs/aws-sdk-rust", branch =
 aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
\ No newline at end of file
diff --git a/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml b/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml
index cb4885eac17..0aacb7f2a26 100644
--- a/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml
+++ b/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml
@@ -14,5 +14,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-apigatewaymanagement = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 http = "0.2.5"
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/applicationautoscaling/Cargo.toml b/rust_dev_preview/examples/applicationautoscaling/Cargo.toml
index 0c5eaefa239..51e4c21f90a 100644
--- a/rust_dev_preview/examples/applicationautoscaling/Cargo.toml
+++ b/rust_dev_preview/examples/applicationautoscaling/Cargo.toml
@@ -12,5 +12,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-applicationautoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/aurora/Cargo.toml b/rust_dev_preview/examples/aurora/Cargo.toml
new file mode 100644
index 00000000000..fc563f8996c
--- /dev/null
+++ b/rust_dev_preview/examples/aurora/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "aurora-code-examples"
+authors = [
+  "David Souther <dpsouth@amazon.com>", 
+]
+edition = "2021"
+version = "0.1.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.75"
+assert_matches = "1.5.0"
+aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-runtime-api = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-rds = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+inquire = "0.6.2"
+mockall = "0.11.4"
+phf = { version = "0.11.2", features = ["std", "macros"] }
+sdk-examples-test-utils = { path = "../../test-utils" }
+secrecy = "0.8.0"
+tokio = { version = "1.20.1", features = ["full", "test-util"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/aurora/README.md b/rust_dev_preview/examples/aurora/README.md
new file mode 100644
index 00000000000..64d156cc19c
--- /dev/null
+++ b/rust_dev_preview/examples/aurora/README.md
@@ -0,0 +1,69 @@
+<!--Generated by WRITEME on 2023-10-19 19:08:39.978292 (UTC)-->
+# Amazon RDS code examples for the SDK for Rust
+
+## Overview
+
+Shows how to use the AWS SDK for Rust to work with Amazon Relational Database Service (Amazon RDS).
+
+<!--custom.overview.start-->
+<!--custom.overview.end-->
+
+*Amazon RDS is a web service that makes it easier to set up, operate, and scale a relational database in the cloud.*
+
+## ⚠ Important
+
+* Running this code might result in charges to your AWS account. For more details, see [AWS Pricing](https://aws.amazon.com/pricing/?aws-products-pricing.sort-by=item.additionalFields.productNameLowercase&aws-products-pricing.sort-order=asc&awsf.Free%20Tier%20Type=*all&awsf.tech-category=*all) and [Free Tier](https://aws.amazon.com/free/?all-free-tier.sort-by=item.additionalFields.SortRank&all-free-tier.sort-order=asc&awsf.Free%20Tier%20Types=*all&awsf.Free%20Tier%20Categories=*all).
+* Running the tests might result in charges to your AWS account.
+* We recommend that you grant your code least privilege. At most, grant only the minimum permissions required to perform the task. For more information, see [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
+* This code is not tested in every AWS Region. For more information, see [AWS Regional Services](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services).
+
+<!--custom.important.start-->
+<!--custom.important.end-->
+
+## Code examples
+
+### Prerequisites
+
+For prerequisites, see the [README](../../README.md#Prerequisites) in the `rust_dev_preview` folder.
+
+
+<!--custom.prerequisites.start-->
+<!--custom.prerequisites.end-->
+
+## Run the examples
+
+### Instructions
+
+
+<!--custom.instructions.start-->
+<!--custom.instructions.end-->
+
+
+
+### Tests
+
+⚠ Running tests might result in charges to your AWS account.
+
+
+To find instructions for running these tests, see the [README](../../README.md#Tests)
+in the `rust_dev_preview` folder.
+
+
+
+<!--custom.tests.start-->
+<!--custom.tests.end-->
+
+## Additional resources
+
+* [Amazon RDS User Guide](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html)
+* [Amazon RDS API Reference](https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/Welcome.html)
+* [SDK for Rust Amazon RDS reference](https://docs.rs/aws-sdk-rds/latest/aws_sdk_rds/)
+
+<!--custom.resources.start-->
+<!--custom.resources.end-->
+
+---
+
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/rust_dev_preview/examples/rds/src/aurora_scenario/mod.rs b/rust_dev_preview/examples/aurora/src/aurora_scenario/mod.rs
similarity index 95%
rename from rust_dev_preview/examples/rds/src/aurora_scenario/mod.rs
rename to rust_dev_preview/examples/aurora/src/aurora_scenario/mod.rs
index c3bd0d6c1bf..a681f9756ca 100644
--- a/rust_dev_preview/examples/rds/src/aurora_scenario/mod.rs
+++ b/rust_dev_preview/examples/aurora/src/aurora_scenario/mod.rs
@@ -141,6 +141,7 @@ impl AuroraScenario {
         }
     }
 
+    // snippet-start:[rust.aurora.get_engines.usage]
     // Get available engine families for Aurora MySql. rds.DescribeDbEngineVersions(Engine='aurora-mysql') and build a set of the 'DBParameterGroupFamily' field values. I get {aurora-mysql8.0, aurora-mysql5.7}.
     pub async fn get_engines(&self) -> Result<HashMap<String, Vec<String>>, ScenarioError> {
         let describe_db_engine_versions = self.rds.describe_db_engine_versions(DB_ENGINE).await;
@@ -175,7 +176,9 @@ impl AuroraScenario {
 
         Ok(versions)
     }
+    // snippet-end:[rust.aurora.get_engines.usage]
 
+    // snippet-start:[rust.aurora.get_instance_classes.usage]
     pub async fn get_instance_classes(&self) -> Result<Vec<String>, ScenarioError> {
         let describe_orderable_db_instance_options_items = self
             .rds
@@ -197,7 +200,9 @@ impl AuroraScenario {
             })
             .map_err(|err| ScenarioError::new("Could not get available instance classes", &err))
     }
+    // snippet-end:[rust.aurora.get_instance_classes.usage]
 
+    // snippet-start:[rust.aurora.set_engine.usage]
     // Select an engine family and create a custom DB cluster parameter group. rds.CreateDbClusterParameterGroup(DBParameterGroupFamily='aurora-mysql8.0')
     pub async fn set_engine(&mut self, engine: &str, version: &str) -> Result<(), ScenarioError> {
         self.engine_family = Some(engine.to_string());
@@ -237,6 +242,7 @@ impl AuroraScenario {
 
         Ok(())
     }
+    // snippet-end:[rust.aurora.set_engine.usage]
 
     pub fn set_instance_class(&mut self, instance_class: Option<String>) {
         self.instance_class = instance_class;
@@ -255,6 +261,7 @@ impl AuroraScenario {
         Ok(format!("mysql -h {endpoint} -P {port} -u {username} -p"))
     }
 
+    // snippet-start:[rust.aurora.get_cluster.usage]
     pub async fn get_cluster(&self) -> Result<DbCluster, ScenarioError> {
         let describe_db_clusters_output = self
             .rds
@@ -276,7 +283,9 @@ impl AuroraScenario {
 
         db_cluster.ok_or_else(|| ScenarioError::with("Did not find the cluster"))
     }
+    // snippet-end:[rust.aurora.get_cluster.usage]
 
+    // snippet-start:[rust.aurora.cluster_parameters.usage]
     // Get the parameter group. rds.DescribeDbClusterParameterGroups
     // Get parameters in the group. This is a long list so you will have to paginate. Find the auto_increment_offset and auto_increment_increment parameters (by ParameterName). rds.DescribeDbClusterParameters
     // Parse the ParameterName, Description, and AllowedValues values and display them.
@@ -303,7 +312,9 @@ impl AuroraScenario {
 
         Ok(parameters)
     }
+    // snippet-end:[rust.aurora.cluster_parameters.usage]
 
+    // snippet-start:[rust.aurora.update_auto_increment.usage]
     // Modify both the auto_increment_offset and auto_increment_increment parameters in one call in the custom parameter group. Set their ParameterValue fields to a new allowable value. rds.ModifyDbClusterParameterGroup.
     pub async fn update_auto_increment(
         &self,
@@ -338,7 +349,9 @@ impl AuroraScenario {
 
         Ok(())
     }
+    // snippet-end:[rust.aurora.update_auto_increment.usage]
 
+    // snippet-start:[rust.aurora.start_cluster_and_instance.usage]
     // Get a list of allowed engine versions. rds.DescribeDbEngineVersions(Engine='aurora-mysql', DBParameterGroupFamily=<the family used to create your parameter group in step 2>)
     // Create an Aurora DB cluster database cluster that contains a MySql database and uses the parameter group you created.
     // Wait for DB cluster to be ready. Call rds.DescribeDBClusters and check for Status == 'available'.
@@ -477,9 +490,9 @@ impl AuroraScenario {
 
         Err(ScenarioError::with("timed out waiting for cluster"))
     }
+    // snippet-end:[rust.aurora.start_cluster_and_instance.usage]
 
-    // Display the connection string that can be used to connect a 'mysql' shell to the cluster. In Python:
-
+    // snippet-start:[rust.aurora.snapshot.usage]
     // Create a snapshot of the DB cluster. rds.CreateDbClusterSnapshot.
     // Wait for the snapshot to create. rds.DescribeDbClusterSnapshots until Status == 'available'.
     pub async fn snapshot(&self, name: &str) -> Result<DbClusterSnapshot, ScenarioError> {
@@ -496,7 +509,9 @@ impl AuroraScenario {
             Err(err) => Err(ScenarioError::new("Failed to create snapshot", &err)),
         }
     }
+    // snippet-end:[rust.aurora.snapshot.usage]
 
+    // snippet-start:[rust.aurora.clean_up.usage]
     pub async fn clean_up(self) -> Result<(), Vec<ScenarioError>> {
         let mut clean_up_errors: Vec<ScenarioError> = vec![];
 
@@ -636,6 +651,7 @@ impl AuroraScenario {
             Err(clean_up_errors)
         }
     }
+    // snippet-end:[rust.aurora.clean_up.usage]
 }
 
 #[cfg(test)]
diff --git a/rust_dev_preview/examples/rds/src/aurora_scenario/tests.rs b/rust_dev_preview/examples/aurora/src/aurora_scenario/tests.rs
similarity index 97%
rename from rust_dev_preview/examples/rds/src/aurora_scenario/tests.rs
rename to rust_dev_preview/examples/aurora/src/aurora_scenario/tests.rs
index 88e6f78197b..5205ad69319 100644
--- a/rust_dev_preview/examples/rds/src/aurora_scenario/tests.rs
+++ b/rust_dev_preview/examples/aurora/src/aurora_scenario/tests.rs
@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
 use crate::rds::MockRdsImpl;
 
 use super::*;
@@ -39,6 +44,7 @@ use aws_smithy_runtime_api::client::orchestrator::HttpResponse;
 use mockall::predicate::eq;
 use secrecy::ExposeSecret;
 
+// snippet-start:[rust.aurora.set_engine.test]
 #[tokio::test]
 async fn test_scenario_set_engine() {
     let mut mock_rds = MockRdsImpl::default();
@@ -107,7 +113,9 @@ async fn test_scenario_set_engine_param_group_exists() {
 
     assert!(set_engine.is_err());
 }
+// snippet-end:[rust.aurora.set_engine.test]
 
+// snippet-start:[rust.aurora.set_engines.test]
 #[tokio::test]
 async fn test_scenario_get_engines() {
     let mut mock_rds = MockRdsImpl::default();
@@ -177,7 +185,9 @@ async fn test_scenario_get_engines_failed() {
         Err(ScenarioError { message, context: _ }) if message == "Failed to retrieve DB Engine Versions"
     );
 }
+// snippet-end:[rust.aurora.set_engines.test]
 
+// snippet-start:[rust.aurora.get_instance_classes.test]
 #[tokio::test]
 async fn test_scenario_get_instance_classes() {
     let mut mock_rds = MockRdsImpl::default();
@@ -249,7 +259,9 @@ async fn test_scenario_get_instance_classes_error() {
         Err(ScenarioError {message, context: _}) if message == "Could not get available instance classes"
     );
 }
+// snippet-end:[rust.aurora.get_instance_classes.test]
 
+// snippet-start:[rust.aurora.get_cluster.test]
 #[tokio::test]
 async fn test_scenario_get_cluster() {
     let mut mock_rds = MockRdsImpl::default();
@@ -325,6 +337,7 @@ async fn test_scenario_get_cluster_error() {
 
     assert_matches!(cluster, Err(ScenarioError { message, context: _ }) if message == "Failed to get cluster");
 }
+// snippet-end:[rust.aurora.get_cluster.test]
 
 #[tokio::test]
 async fn test_scenario_connection_string() {
@@ -355,6 +368,7 @@ async fn test_scenario_connection_string() {
     );
 }
 
+// snippet-start:[rust.aurora.cluster_parameters.test]
 #[tokio::test]
 async fn test_scenario_cluster_parameters() {
     let mut mock_rds = MockRdsImpl::default();
@@ -414,7 +428,9 @@ async fn test_scenario_cluster_parameters_error() {
     let params = scenario.cluster_parameters().await;
     assert_matches!(params, Err(ScenarioError { message, context: _ }) if message == "Failed to retrieve parameters for RustSDKCodeExamplesDBParameterGroup");
 }
+// snippet-end:[rust.aurora.cluster_parameters.test]
 
+// snippet-start:[rust.aurora.update_auto_increment.test]
 #[tokio::test]
 async fn test_scenario_update_auto_increment() {
     let mut mock_rds = MockRdsImpl::default();
@@ -471,7 +487,9 @@ async fn test_scenario_update_auto_increment_error() {
     let update = scenario.update_auto_increment(10, 20).await;
     assert_matches!(update, Err(ScenarioError { message, context: _}) if message == "Failed to modify cluster parameter group");
 }
+// snippet-end:[rust.aurora.update_auto_increment.test]
 
+// snippet-start:[rust.aurora.start_cluster_and_instance.test]
 #[tokio::test]
 async fn test_start_cluster_and_instance() {
     let mut mock_rds = MockRdsImpl::default();
@@ -762,7 +780,9 @@ async fn test_start_cluster_and_instance_wait_hiccup() {
     tokio::time::resume();
     let _ = assertions.await;
 }
+// snippet-end:[rust.aurora.start_cluster_and_instance.test]
 
+// snippet-start:[rust.aurora.clean_up.test]
 #[tokio::test]
 async fn test_scenario_clean_up() {
     let mut mock_rds = MockRdsImpl::default();
@@ -938,7 +958,9 @@ async fn test_scenario_clean_up_errors() {
     tokio::time::resume();
     let _ = assertions.await;
 }
+// snippet-end:[rust.aurora.clean_up.test]
 
+// snippet-start:[rust.aurora.snapshot.test]
 #[tokio::test]
 async fn test_scenario_snapshot() {
     let mut mock_rds = MockRdsImpl::default();
@@ -1003,3 +1025,4 @@ async fn test_scenario_snapshot_invalid() {
     let create_snapshot = scenario.snapshot("MockSnapshot").await;
     assert_matches!(create_snapshot, Err(ScenarioError { message, context: _}) if message == "Missing Snapshot");
 }
+// snippet-end:[rust.aurora.snapshot.test]
diff --git a/rust_dev_preview/examples/rds/src/bin/aurora-scenario.rs b/rust_dev_preview/examples/aurora/src/bin/aurora-scenario.rs
similarity index 100%
rename from rust_dev_preview/examples/rds/src/bin/aurora-scenario.rs
rename to rust_dev_preview/examples/aurora/src/bin/aurora-scenario.rs
diff --git a/rust_dev_preview/examples/rds/src/lib.rs b/rust_dev_preview/examples/aurora/src/lib.rs
similarity index 100%
rename from rust_dev_preview/examples/rds/src/lib.rs
rename to rust_dev_preview/examples/aurora/src/lib.rs
diff --git a/rust_dev_preview/examples/rds/src/rds.rs b/rust_dev_preview/examples/aurora/src/rds.rs
similarity index 79%
rename from rust_dev_preview/examples/rds/src/rds.rs
rename to rust_dev_preview/examples/aurora/src/rds.rs
index 8445c020247..9cb6f1d36ba 100644
--- a/rust_dev_preview/examples/rds/src/rds.rs
+++ b/rust_dev_preview/examples/aurora/src/rds.rs
@@ -55,6 +55,7 @@ impl RdsImpl {
         RdsImpl { inner }
     }
 
+    // snippet-start:[rust.aurora.describe_db_engine_versions.wrapper]
     pub async fn describe_db_engine_versions(
         &self,
         engine: &str,
@@ -65,7 +66,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.describe_db_engine_versions.wrapper]
 
+    // snippet-start:[rust.aurora.describe_orderable_db_instance_options.wrapper]
     pub async fn describe_orderable_db_instance_options(
         &self,
         engine: &str,
@@ -82,7 +85,9 @@ impl RdsImpl {
             .try_collect()
             .await
     }
+    // snippet-end:[rust.aurora.describe_orderable_db_instance_options.wrapper]
 
+    // snippet-start:[rust.aurora.create_db_cluster_parameter_group.wrapper]
     pub async fn create_db_cluster_parameter_group(
         &self,
         name: &str,
@@ -98,7 +103,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.create_db_cluster_parameter_group.wrapper]
 
+    // snippet-start:[rust.aurora.describe_db_clusters.wrapper]
     pub async fn describe_db_clusters(
         &self,
         id: &str,
@@ -109,7 +116,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.describe_db_clusters.wrapper]
 
+    // snippet-start:[rust.aurora.describe_db_cluster_parameters.wrapper]
     pub async fn describe_db_cluster_parameters(
         &self,
         name: &str,
@@ -123,7 +132,9 @@ impl RdsImpl {
             .try_collect()
             .await
     }
+    // snippet-end:[rust.aurora.describe_db_cluster_parameters.wrapper]
 
+    // snippet-start:[rust.aurora.modify_db_cluster_parameter_group.wrapper]
     pub async fn modify_db_cluster_parameter_group(
         &self,
         name: &str,
@@ -137,7 +148,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.modify_db_cluster_parameter_group.wrapper]
 
+    // snippet-start:[rust.aurora.create_db_cluster.wrapper]
     pub async fn create_db_cluster(
         &self,
         name: &str,
@@ -158,7 +171,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.create_db_cluster.wrapper]
 
+    // snippet-start:[rust.aurora.create_db_instance.wrapper]
     pub async fn create_db_instance(
         &self,
         cluster_name: &str,
@@ -175,7 +190,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.create_db_instance.wrapper]
 
+    // snippet-start:[rust.aurora.describe_db_instance.wrapper]
     pub async fn describe_db_instance(
         &self,
         instance_identifier: &str,
@@ -186,7 +203,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.describe_db_instance.wrapper]
 
+    // snippet-start:[rust.aurora.create_db_cluster_snapshot.wrapper]
     pub async fn snapshot_cluster(
         &self,
         db_cluster_identifier: &str,
@@ -199,13 +218,17 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.create_db_cluster_snapshot.wrapper]
 
+    // snippet-start:[rust.aurora.describe_db_instances.wrapper]
     pub async fn describe_db_instances(
         &self,
     ) -> Result<DescribeDbInstancesOutput, SdkError<DescribeDBInstancesError>> {
         self.inner.describe_db_instances().send().await
     }
+    // snippet-end:[rust.aurora.describe_db_instances.wrapper]
 
+    // snippet-start:[rust.aurora.describe_db_cluster_endpoints.wrapper]
     pub async fn describe_db_cluster_endpoints(
         &self,
         cluster_identifier: &str,
@@ -216,7 +239,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.describe_db_cluster_endpoints.wrapper]
 
+    // snippet-start:[rust.aurora.delete_db_instance.wrapper]
     pub async fn delete_db_instance(
         &self,
         instance_identifier: &str,
@@ -228,7 +253,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.delete_db_instance.wrapper]
 
+    // snippet-start:[rust.aurora.delete_db_cluster.wrapper]
     pub async fn delete_db_cluster(
         &self,
         cluster_identifier: &str,
@@ -240,7 +267,9 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.delete_db_cluster.wrapper]
 
+    // snippet-start:[rust.aurora.delete_db_cluster_parameter_group.wrapper]
     pub async fn delete_db_cluster_parameter_group(
         &self,
         name: &str,
@@ -252,4 +281,5 @@ impl RdsImpl {
             .send()
             .await
     }
+    // snippet-end:[rust.aurora.delete_db_cluster_parameter_group.wrapper]
 }
diff --git a/rust_dev_preview/examples/auto-scaling/Cargo.toml b/rust_dev_preview/examples/auto-scaling/Cargo.toml
index 60514e18223..e24873e947d 100644
--- a/rust_dev_preview/examples/auto-scaling/Cargo.toml
+++ b/rust_dev_preview/examples/auto-scaling/Cargo.toml
@@ -12,7 +12,7 @@ aws-sdk-autoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch
 aws-sdk-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 anyhow = "1.0.75"
 tracing = "0.1.37"
diff --git a/rust_dev_preview/examples/autoscalingplans/Cargo.toml b/rust_dev_preview/examples/autoscalingplans/Cargo.toml
index c8a69e21991..29cbf65ecde 100644
--- a/rust_dev_preview/examples/autoscalingplans/Cargo.toml
+++ b/rust_dev_preview/examples/autoscalingplans/Cargo.toml
@@ -14,5 +14,5 @@ aws-sdk-autoscalingplans = { git = "https://github.com/awslabs/aws-sdk-rust", br
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/batch/Cargo.toml b/rust_dev_preview/examples/batch/Cargo.toml
index 37b22f127f4..68079b586ba 100644
--- a/rust_dev_preview/examples/batch/Cargo.toml
+++ b/rust_dev_preview/examples/batch/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-batch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cloudformation/Cargo.toml b/rust_dev_preview/examples/cloudformation/Cargo.toml
index b41424e399e..de701d2ba24 100644
--- a/rust_dev_preview/examples/cloudformation/Cargo.toml
+++ b/rust_dev_preview/examples/cloudformation/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-cloudformation = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cloudwatch/Cargo.toml b/rust_dev_preview/examples/cloudwatch/Cargo.toml
index bfcdcb058d2..71df748c7b4 100644
--- a/rust_dev_preview/examples/cloudwatch/Cargo.toml
+++ b/rust_dev_preview/examples/cloudwatch/Cargo.toml
@@ -14,5 +14,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-cloudwatch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml b/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml
index 18e86dfc62b..deeb2e6a5da 100644
--- a/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml
+++ b/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml
@@ -15,5 +15,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-cloudwatchlogs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cognitoidentity/Cargo.toml b/rust_dev_preview/examples/cognitoidentity/Cargo.toml
index 3b9a0c66fc1..612a15f9592 100644
--- a/rust_dev_preview/examples/cognitoidentity/Cargo.toml
+++ b/rust_dev_preview/examples/cognitoidentity/Cargo.toml
@@ -16,7 +16,7 @@ aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", br
   "convert-chrono",
 ] }
 chrono = "0.4"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml b/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml
index 91b52cc9f9e..884083a312b 100644
--- a/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml
+++ b/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml
@@ -15,7 +15,7 @@ aws-sdk-cognitoidentityprovider = { git = "https://github.com/awslabs/aws-sdk-ru
 aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
\ No newline at end of file
diff --git a/rust_dev_preview/examples/cognitosync/Cargo.toml b/rust_dev_preview/examples/cognitosync/Cargo.toml
index 1bed3c346e0..75ff49f5131 100644
--- a/rust_dev_preview/examples/cognitosync/Cargo.toml
+++ b/rust_dev_preview/examples/cognitosync/Cargo.toml
@@ -15,7 +15,7 @@ aws-sdk-cognitosync = { git = "https://github.com/awslabs/aws-sdk-rust", branch
 aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
\ No newline at end of file
diff --git a/rust_dev_preview/examples/concurrency/Cargo.toml b/rust_dev_preview/examples/concurrency/Cargo.toml
index 1b78945833c..4f7f7c8f524 100644
--- a/rust_dev_preview/examples/concurrency/Cargo.toml
+++ b/rust_dev_preview/examples/concurrency/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 futures = "0.3.25"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing = "0.1.37"
diff --git a/rust_dev_preview/examples/config/Cargo.toml b/rust_dev_preview/examples/config/Cargo.toml
index a02f0d64d01..da03a3ccb5a 100644
--- a/rust_dev_preview/examples/config/Cargo.toml
+++ b/rust_dev_preview/examples/config/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/dynamodb/Cargo.toml b/rust_dev_preview/examples/dynamodb/Cargo.toml
index eadc56e11a9..63a8aff9ef2 100644
--- a/rust_dev_preview/examples/dynamodb/Cargo.toml
+++ b/rust_dev_preview/examples/dynamodb/Cargo.toml
@@ -18,7 +18,7 @@ aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "n
 aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["test-util"] }
 aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 axum = "0.5.16"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 futures = "0.3"
 http = "0.2.5"
 log = "0.4.17"
diff --git a/rust_dev_preview/examples/ebs/Cargo.toml b/rust_dev_preview/examples/ebs/Cargo.toml
index 2d511673e84..40f689bde8e 100644
--- a/rust_dev_preview/examples/ebs/Cargo.toml
+++ b/rust_dev_preview/examples/ebs/Cargo.toml
@@ -16,5 +16,5 @@ aws-sdk-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 tokio = { version = "1.20.1", features = ["full"] }
 base64 = "0.13.0"
 sha2 = "0.9.5"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/ec2/Cargo.toml b/rust_dev_preview/examples/ec2/Cargo.toml
index 400eb63a003..d8bafb16102 100644
--- a/rust_dev_preview/examples/ec2/Cargo.toml
+++ b/rust_dev_preview/examples/ec2/Cargo.toml
@@ -15,5 +15,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/ecr/Cargo.toml b/rust_dev_preview/examples/ecr/Cargo.toml
index b39cf19ed24..02a30cbe237 100644
--- a/rust_dev_preview/examples/ecr/Cargo.toml
+++ b/rust_dev_preview/examples/ecr/Cargo.toml
@@ -12,5 +12,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-ecr = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/ecs/Cargo.toml b/rust_dev_preview/examples/ecs/Cargo.toml
index a0d4291f43a..d4f167ad6a5 100644
--- a/rust_dev_preview/examples/ecs/Cargo.toml
+++ b/rust_dev_preview/examples/ecs/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-ecs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/eks/Cargo.toml b/rust_dev_preview/examples/eks/Cargo.toml
index e0e9dc6d1e3..2b52c925b5b 100644
--- a/rust_dev_preview/examples/eks/Cargo.toml
+++ b/rust_dev_preview/examples/eks/Cargo.toml
@@ -12,5 +12,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-eks = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/firehose/Cargo.toml b/rust_dev_preview/examples/firehose/Cargo.toml
index 43eebf0acf8..17355aca34e 100644
--- a/rust_dev_preview/examples/firehose/Cargo.toml
+++ b/rust_dev_preview/examples/firehose/Cargo.toml
@@ -12,6 +12,6 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-firehose = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 
diff --git a/rust_dev_preview/examples/globalaccelerator/Cargo.toml b/rust_dev_preview/examples/globalaccelerator/Cargo.toml
index 7f8dd7a01c1..bbfc8931f23 100644
--- a/rust_dev_preview/examples/globalaccelerator/Cargo.toml
+++ b/rust_dev_preview/examples/globalaccelerator/Cargo.toml
@@ -11,5 +11,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-globalaccelerator = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
 tokio-stream = "0.1.8"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/glue/Cargo.toml b/rust_dev_preview/examples/glue/Cargo.toml
index 5b6e0daa005..5cd8e2a768b 100644
--- a/rust_dev_preview/examples/glue/Cargo.toml
+++ b/rust_dev_preview/examples/glue/Cargo.toml
@@ -27,7 +27,7 @@ tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 tracing = "0.1.37"
 async_once = "0.2.6"
 lazy_static = "1.4.0"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0.37"
 secrecy = "0.8.0"
 uuid = { version = "1.2.1", features = ["v4"] }
diff --git a/rust_dev_preview/examples/greengrassv2/Cargo.toml b/rust_dev_preview/examples/greengrassv2/Cargo.toml
index 99fbd085b9b..bd42e8c7fa5 100644
--- a/rust_dev_preview/examples/greengrassv2/Cargo.toml
+++ b/rust_dev_preview/examples/greengrassv2/Cargo.toml
@@ -9,5 +9,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-greengrassv2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/iam/Cargo.toml b/rust_dev_preview/examples/iam/Cargo.toml
index 1ae201bd600..3a764467e29 100644
--- a/rust_dev_preview/examples/iam/Cargo.toml
+++ b/rust_dev_preview/examples/iam/Cargo.toml
@@ -24,7 +24,7 @@ aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-sts = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 sdk-examples-test-utils = { path = "../../test-utils" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 uuid = { version = "0.8", features = ["serde", "v4"] }
 tower-service = "0.3.2"
diff --git a/rust_dev_preview/examples/iot/Cargo.toml b/rust_dev_preview/examples/iot/Cargo.toml
index bfb822f2bc4..14baa96e34e 100644
--- a/rust_dev_preview/examples/iot/Cargo.toml
+++ b/rust_dev_preview/examples/iot/Cargo.toml
@@ -11,5 +11,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-iot = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/kinesis/Cargo.toml b/rust_dev_preview/examples/kinesis/Cargo.toml
index 58c0b5b9007..8770ea46185 100644
--- a/rust_dev_preview/examples/kinesis/Cargo.toml
+++ b/rust_dev_preview/examples/kinesis/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-kinesis = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/kms/Cargo.toml b/rust_dev_preview/examples/kms/Cargo.toml
index 4cd0f82d5d3..ba1ebaf9e52 100644
--- a/rust_dev_preview/examples/kms/Cargo.toml
+++ b/rust_dev_preview/examples/kms/Cargo.toml
@@ -13,5 +13,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-kms = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
 base64 = "0.13.0"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/lambda/Cargo.toml b/rust_dev_preview/examples/lambda/Cargo.toml
index 654cce1517b..2352f4c5b35 100644
--- a/rust_dev_preview/examples/lambda/Cargo.toml
+++ b/rust_dev_preview/examples/lambda/Cargo.toml
@@ -13,7 +13,7 @@ aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "ne
 aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 tracing = "0.1.37"
diff --git a/rust_dev_preview/examples/logging/logger/Cargo.toml b/rust_dev_preview/examples/logging/logger/Cargo.toml
index b74c10122c7..90b72ceb937 100644
--- a/rust_dev_preview/examples/logging/logger/Cargo.toml
+++ b/rust_dev_preview/examples/logging/logger/Cargo.toml
@@ -16,6 +16,6 @@ aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "
 # snippet-start:[logging.rust.logger-cargo.toml-env_logger]
 env_logger = "0.9.0"
 # snippet-end:[logging.rust.logger-cargo.toml-env_logger]
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 # snippet-end:[logging.rust.logger-cargo.toml]
diff --git a/rust_dev_preview/examples/logging/tracing/Cargo.toml b/rust_dev_preview/examples/logging/tracing/Cargo.toml
index e5ff64e0393..ace0828c4e1 100644
--- a/rust_dev_preview/examples/logging/tracing/Cargo.toml
+++ b/rust_dev_preview/examples/logging/tracing/Cargo.toml
@@ -13,7 +13,7 @@ version = "0.1.0"
 [dependencies]
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 # snippet-start:[logging.rust.tracing-cargo.toml-tracing_subscriber]
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/medialive/Cargo.toml b/rust_dev_preview/examples/medialive/Cargo.toml
index d426fb0abc8..b662e554659 100644
--- a/rust_dev_preview/examples/medialive/Cargo.toml
+++ b/rust_dev_preview/examples/medialive/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-medialive = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/mediapackage/Cargo.toml b/rust_dev_preview/examples/mediapackage/Cargo.toml
index e2b20a595ff..c91c4f34f5e 100644
--- a/rust_dev_preview/examples/mediapackage/Cargo.toml
+++ b/rust_dev_preview/examples/mediapackage/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-mediapackage = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/polly/Cargo.toml b/rust_dev_preview/examples/polly/Cargo.toml
index 47e9923a230..b8d63f71a64 100644
--- a/rust_dev_preview/examples/polly/Cargo.toml
+++ b/rust_dev_preview/examples/polly/Cargo.toml
@@ -14,5 +14,5 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-polly = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
 bytes = "1"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/qldb/Cargo.toml b/rust_dev_preview/examples/qldb/Cargo.toml
index eec1e220767..e1c64525f17 100644
--- a/rust_dev_preview/examples/qldb/Cargo.toml
+++ b/rust_dev_preview/examples/qldb/Cargo.toml
@@ -15,5 +15,5 @@ aws-sdk-qldb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next
 aws-sdk-qldbsession = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
 tokio-stream = { version = "0.1.9", features = ["default"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/rds/Cargo.toml b/rust_dev_preview/examples/rds/Cargo.toml
index 248e0f131cd..5c8be6e452c 100644
--- a/rust_dev_preview/examples/rds/Cargo.toml
+++ b/rust_dev_preview/examples/rds/Cargo.toml
@@ -18,7 +18,7 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-smithy-runtime-api = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-rds = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 inquire = "0.6.2"
 mockall = "0.11.4"
 phf = { version = "0.11.2", features = ["std", "macros"] }
diff --git a/rust_dev_preview/examples/rds/README.md b/rust_dev_preview/examples/rds/README.md
index 64d156cc19c..4c08dbd97f1 100644
--- a/rust_dev_preview/examples/rds/README.md
+++ b/rust_dev_preview/examples/rds/README.md
@@ -1,4 +1,5 @@
 <!--Generated by WRITEME on 2023-10-19 19:08:39.978292 (UTC)-->
+
 # Amazon RDS code examples for the SDK for Rust
 
 ## Overview
@@ -8,14 +9,14 @@ Shows how to use the AWS SDK for Rust to work with Amazon Relational Database Se
 <!--custom.overview.start-->
 <!--custom.overview.end-->
 
-*Amazon RDS is a web service that makes it easier to set up, operate, and scale a relational database in the cloud.*
+_Amazon RDS is a web service that makes it easier to set up, operate, and scale a relational database in the cloud._
 
 ## ⚠ Important
 
-* Running this code might result in charges to your AWS account. For more details, see [AWS Pricing](https://aws.amazon.com/pricing/?aws-products-pricing.sort-by=item.additionalFields.productNameLowercase&aws-products-pricing.sort-order=asc&awsf.Free%20Tier%20Type=*all&awsf.tech-category=*all) and [Free Tier](https://aws.amazon.com/free/?all-free-tier.sort-by=item.additionalFields.SortRank&all-free-tier.sort-order=asc&awsf.Free%20Tier%20Types=*all&awsf.Free%20Tier%20Categories=*all).
-* Running the tests might result in charges to your AWS account.
-* We recommend that you grant your code least privilege. At most, grant only the minimum permissions required to perform the task. For more information, see [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
-* This code is not tested in every AWS Region. For more information, see [AWS Regional Services](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services).
+- Running this code might result in charges to your AWS account. For more details, see [AWS Pricing](https://aws.amazon.com/pricing/?aws-products-pricing.sort-by=item.additionalFields.productNameLowercase&aws-products-pricing.sort-order=asc&awsf.Free%20Tier%20Type=*all&awsf.tech-category=*all) and [Free Tier](https://aws.amazon.com/free/?all-free-tier.sort-by=item.additionalFields.SortRank&all-free-tier.sort-order=asc&awsf.Free%20Tier%20Types=*all&awsf.Free%20Tier%20Categories=*all).
+- Running the tests might result in charges to your AWS account.
+- We recommend that you grant your code least privilege. At most, grant only the minimum permissions required to perform the task. For more information, see [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
+- This code is not tested in every AWS Region. For more information, see [AWS Regional Services](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services).
 
 <!--custom.important.start-->
 <!--custom.important.end-->
@@ -26,7 +27,6 @@ Shows how to use the AWS SDK for Rust to work with Amazon Relational Database Se
 
 For prerequisites, see the [README](../../README.md#Prerequisites) in the `rust_dev_preview` folder.
 
-
 <!--custom.prerequisites.start-->
 <!--custom.prerequisites.end-->
 
@@ -34,30 +34,24 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `rust_
 
 ### Instructions
 
-
 <!--custom.instructions.start-->
 <!--custom.instructions.end-->
 
-
-
 ### Tests
 
 ⚠ Running tests might result in charges to your AWS account.
 
-
 To find instructions for running these tests, see the [README](../../README.md#Tests)
 in the `rust_dev_preview` folder.
 
-
-
 <!--custom.tests.start-->
 <!--custom.tests.end-->
 
 ## Additional resources
 
-* [Amazon RDS User Guide](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html)
-* [Amazon RDS API Reference](https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/Welcome.html)
-* [SDK for Rust Amazon RDS reference](https://docs.rs/aws-sdk-rds/latest/aws_sdk_rds/)
+- [Amazon RDS User Guide](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html)
+- [Amazon RDS API Reference](https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/Welcome.html)
+- [SDK for Rust Amazon RDS reference](https://docs.rs/aws-sdk-rds/latest/aws_sdk_rds/)
 
 <!--custom.resources.start-->
 <!--custom.resources.end-->
@@ -66,4 +60,4 @@ in the `rust_dev_preview` folder.
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
diff --git a/rust_dev_preview/examples/rdsdata/Cargo.toml b/rust_dev_preview/examples/rdsdata/Cargo.toml
index 42fede9ceea..6591e3ee8f9 100644
--- a/rust_dev_preview/examples/rdsdata/Cargo.toml
+++ b/rust_dev_preview/examples/rdsdata/Cargo.toml
@@ -13,5 +13,5 @@ version = "0.1.0"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/route53/Cargo.toml b/rust_dev_preview/examples/route53/Cargo.toml
index bd1e4354712..7ac833d7e3c 100644
--- a/rust_dev_preview/examples/route53/Cargo.toml
+++ b/rust_dev_preview/examples/route53/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-route53 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/s3/Cargo.toml b/rust_dev_preview/examples/s3/Cargo.toml
index 36c7fdcb42b..3ce1e3d292e 100644
--- a/rust_dev_preview/examples/s3/Cargo.toml
+++ b/rust_dev_preview/examples/s3/Cargo.toml
@@ -36,7 +36,7 @@ http = "0.2.8"
 http-body = "0.4.5"
 md-5 = "0.10.1"
 rand = "0.8.5"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tokio-stream = "0.1.8"
diff --git a/rust_dev_preview/examples/sagemaker/Cargo.toml b/rust_dev_preview/examples/sagemaker/Cargo.toml
index a4f67959b1b..8904a80d4e6 100644
--- a/rust_dev_preview/examples/sagemaker/Cargo.toml
+++ b/rust_dev_preview/examples/sagemaker/Cargo.toml
@@ -15,7 +15,7 @@ aws-sdk-sagemaker = { git = "https://github.com/awslabs/aws-sdk-rust", branch =
 aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sdk-config/Cargo.toml b/rust_dev_preview/examples/sdk-config/Cargo.toml
index 9f9901b72b3..70c56c1fc1c 100644
--- a/rust_dev_preview/examples/sdk-config/Cargo.toml
+++ b/rust_dev_preview/examples/sdk-config/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 lazy_static = "1.4.0"
 async_once = "0.2.6"
diff --git a/rust_dev_preview/examples/secretsmanager/Cargo.toml b/rust_dev_preview/examples/secretsmanager/Cargo.toml
index 0a99c81805a..889f1f74318 100644
--- a/rust_dev_preview/examples/secretsmanager/Cargo.toml
+++ b/rust_dev_preview/examples/secretsmanager/Cargo.toml
@@ -12,5 +12,5 @@ description = "Example usage of the SecretManager service"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-secretsmanager = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml
index 7c3718c1621..7d326721311 100644
--- a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml
+++ b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml
@@ -13,7 +13,7 @@ aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch =
 http = "0.2.6"
 hyper = "0.14"
 reqwest = "0.11"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 hyper-tls = "0.5.0"
diff --git a/rust_dev_preview/examples/ses/Cargo.toml b/rust_dev_preview/examples/ses/Cargo.toml
index 71af726db33..b9ef5b5c0d8 100644
--- a/rust_dev_preview/examples/ses/Cargo.toml
+++ b/rust_dev_preview/examples/ses/Cargo.toml
@@ -11,5 +11,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-sesv2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sitewise/Cargo.toml b/rust_dev_preview/examples/sitewise/Cargo.toml
index c5f2cbc48dc..be1f3aaec1c 100644
--- a/rust_dev_preview/examples/sitewise/Cargo.toml
+++ b/rust_dev_preview/examples/sitewise/Cargo.toml
@@ -12,7 +12,7 @@ aws-sdk-iotsitewise = { git = "https://github.com/awslabs/aws-sdk-rust", branch
 aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] } 
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
\ No newline at end of file
diff --git a/rust_dev_preview/examples/snowball/Cargo.toml b/rust_dev_preview/examples/snowball/Cargo.toml
index 9ced58e12f7..97f9f5e487e 100644
--- a/rust_dev_preview/examples/snowball/Cargo.toml
+++ b/rust_dev_preview/examples/snowball/Cargo.toml
@@ -10,5 +10,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-snowball = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sns/Cargo.toml b/rust_dev_preview/examples/sns/Cargo.toml
index 12f3ef05fb2..57b95ba165d 100644
--- a/rust_dev_preview/examples/sns/Cargo.toml
+++ b/rust_dev_preview/examples/sns/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-sns = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sqs/Cargo.toml b/rust_dev_preview/examples/sqs/Cargo.toml
index b89cad6e580..19d8b3d738f 100644
--- a/rust_dev_preview/examples/sqs/Cargo.toml
+++ b/rust_dev_preview/examples/sqs/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/ssm/Cargo.toml b/rust_dev_preview/examples/ssm/Cargo.toml
index 41d13d31cab..b97f44573fd 100644
--- a/rust_dev_preview/examples/ssm/Cargo.toml
+++ b/rust_dev_preview/examples/ssm/Cargo.toml
@@ -13,5 +13,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-ssm = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/stepfunction/Cargo.toml b/rust_dev_preview/examples/stepfunction/Cargo.toml
index 73d59a27ec2..5925a62ca60 100644
--- a/rust_dev_preview/examples/stepfunction/Cargo.toml
+++ b/rust_dev_preview/examples/stepfunction/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-sfn = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/sts/Cargo.toml b/rust_dev_preview/examples/sts/Cargo.toml
index 4905d26a212..1b92f2a1c52 100644
--- a/rust_dev_preview/examples/sts/Cargo.toml
+++ b/rust_dev_preview/examples/sts/Cargo.toml
@@ -13,6 +13,6 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-sts = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-types = {git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 
diff --git a/rust_dev_preview/examples/testing/Cargo.toml b/rust_dev_preview/examples/testing/Cargo.toml
index 59f75ba26f3..3512027350f 100644
--- a/rust_dev_preview/examples/testing/Cargo.toml
+++ b/rust_dev_preview/examples/testing/Cargo.toml
@@ -20,7 +20,7 @@ aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch
 ] }
 tokio = { version = "1.20.1", features = ["full"] }
 serde_json = "1"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 
 [[bin]]
diff --git a/rust_dev_preview/examples/transcribestreaming/Cargo.toml b/rust_dev_preview/examples/transcribestreaming/Cargo.toml
index 8d5b8358626..9a6492580f6 100644
--- a/rust_dev_preview/examples/transcribestreaming/Cargo.toml
+++ b/rust_dev_preview/examples/transcribestreaming/Cargo.toml
@@ -15,6 +15,6 @@ aws-sdk-transcribestreaming = { git = "https://github.com/awslabs/aws-sdk-rust",
 async-stream = "0.3"
 bytes = "1"
 hound = "3.4"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/lambda/calculator/Cargo.toml b/rust_dev_preview/lambda/calculator/Cargo.toml
index 120ed2fe232..8a3e9c617f2 100644
--- a/rust_dev_preview/lambda/calculator/Cargo.toml
+++ b/rust_dev_preview/lambda/calculator/Cargo.toml
@@ -14,7 +14,7 @@ aws-sdk-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 lambda_runtime = "0.8.0"
-clap = { version = "~4.2", features = ["derive"] }
+clap = { version = "~4.4", features = ["derive"] }
 tokio = { version = "1.20.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter", "json"] }
 time = "0.3"