Handle updates to Rust nullability

Switch to sdk branch = next Handle nullability change for smithy-lang/smithy-rs#2916 Handle nullability change for smithy-lang/smithy-rs#2995
DavidSouther · Sep 29, 2023 · 83c85fe · 83c85fe
1 parent 5b63bb1
commit 83c85fe
Show file tree

Hide file tree

Showing 173 changed files with 668 additions and 714 deletions.
diff --git a/rust_dev_preview/cross_service/Cargo.toml b/rust_dev_preview/cross_service/Cargo.toml
@@ -1,6 +1,7 @@
 # Note: this workspace exists solely for the convenience of 
 # compiling/auto-formatting/testing all the AWS Rust SDK examples together.
 [workspace]
+resolver = "2"
 members = [
     "detect_faces",
     "detect_labels",

diff --git a/rust_dev_preview/cross_service/detect_faces/Cargo.toml b/rust_dev_preview/cross_service/detect_faces/Cargo.toml
@@ -10,9 +10,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 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
@@ -10,11 +10,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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" }
+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" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }

diff --git a/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml b/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml
@@ -14,16 +14,16 @@ _HANDLER = "labels"
 
 [dependencies]
 anyhow = "1.0.70"
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-sns = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = [
+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" }
+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" }
+aws-sdk-sns = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "test-util",
 ] }
-aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-smithy-types-convert ={ git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["convert-chrono"] }
+aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-types-convert ={ git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["convert-chrono"] }
 aws_lambda_events = { version = "0.10.0", features = ["s3", "apigw"], default-features = false }
 bytes = "1.4.0"
 chrono = "0.4.24"

diff --git a/rust_dev_preview/cross_service/photo_asset_management/integration/Cargo.toml b/rust_dev_preview/cross_service/photo_asset_management/integration/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
 
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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" }
+aws-sdk-rekognition = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 photo_asset_management = { path = "../"}
 tokio = { version = "1.27.0", features = ["macros"] }
 tracing = "0.1.37"

diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/handlers/detect_labels.rs b/rust_dev_preview/cross_service/photo_asset_management/src/handlers/detect_labels.rs
@@ -64,7 +64,6 @@ async fn detect_record<'a>(
         .send()
         .await?
         .labels()
-        .ok_or_else(|| anyhow!("missing labels"))?
         .iter()
         .map(|l| l.to_owned())
         .collect();

diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/handlers/labels.rs b/rust_dev_preview/cross_service/photo_asset_management/src/handlers/labels.rs
@@ -84,10 +84,8 @@ async fn get_labels(
         .send()
         .await?;
 
-    let items = scan.items().ok_or_else(|| anyhow!("no scanned items"))?;
-
     let mut labels = Labels::new();
-    for item in items {
+    for item in scan.items() {
         labels.insert(item.try_into()?);
     }
 

diff --git a/rust_dev_preview/cross_service/rest_ses/Cargo.toml b/rust_dev_preview/cross_service/rest_ses/Cargo.toml
@@ -14,10 +14,10 @@ name = "rest_ses"
 [dependencies]
 actix-web = "4"
 actix-web-prom = "0.6.0"
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-cloudwatchlogs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-ses = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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-sdk-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-ses = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 chrono = { version = "0.4.22", default-features = false, features = [
     "clock",
     "serde",

diff --git a/rust_dev_preview/cross_service/rest_ses/src/report.rs b/rust_dev_preview/cross_service/rest_ses/src/report.rs
@@ -92,7 +92,12 @@ pub async fn send_report(
 
     let email = ses
         .send_raw_email()
-        .raw_message(RawMessage::builder().data(data).build())
+        .raw_message(
+            RawMessage::builder()
+                .data(data)
+                .build()
+                .expect("building RawMessage"),
+        )
         .send()
         .await
         .map_err(|err| ReportError::SesError(err.into()))?;

diff --git a/rust_dev_preview/cross_service/rest_ses/tests/api/work_item/happy.rs b/rust_dev_preview/cross_service/rest_ses/tests/api/work_item/happy.rs
@@ -97,11 +97,7 @@ async fn post_workitem_returns_200() {
         .await
         .expect("failed to query rds");
 
-    assert_eq!(
-        result.records().unwrap().len(),
-        1,
-        "should have inserted one record"
-    );
+    assert_eq!(result.records().len(), 1, "should have inserted one record");
 }
 
 /// Create a single item, and assert we can get it back from the list endpoint.

diff --git a/rust_dev_preview/cross_service/telephone/Cargo.toml b/rust_dev_preview/cross_service/telephone/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-polly = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-transcribe = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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" }
+aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-transcribe = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 anyhow = "1"
 tokio = { version = "1.20.1", features = ["full"] }
 bytes = "1"

diff --git a/rust_dev_preview/examples/Cargo.toml b/rust_dev_preview/examples/Cargo.toml
@@ -1,6 +1,7 @@
 # Note: this workspace exists solely for the convenience of 
 # compiling/auto-formatting/testing all the AWS Rust SDK examples together.
 [workspace]
+resolver = "2"
 members = [
     "apigateway",
     "apigatewaymanagement",

diff --git a/rust_dev_preview/examples/apigateway/Cargo.toml b/rust_dev_preview/examples/apigateway/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-apigateway = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = [
+aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-apigateway = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-types-convert = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
   "convert-chrono",
 ] }
 clap = { version = "~4.2", features = ["derive"] }

diff --git a/rust_dev_preview/examples/apigateway/src/bin/get_rest_apis.rs b/rust_dev_preview/examples/apigateway/src/bin/get_rest_apis.rs
@@ -29,7 +29,7 @@ struct Opt {
 async fn show_apis(client: &Client) -> Result<(), Error> {
     let resp = client.get_rest_apis().send().await?;
 
-    for api in resp.items().unwrap_or_default() {
+    for api in resp.items() {
         println!("ID:          {}", api.id().unwrap_or_default());
         println!("Name:        {}", api.name().unwrap_or_default());
         println!("Description: {}", api.description().unwrap_or_default());

diff --git a/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml b/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-apigatewaymanagement = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }

diff --git a/rust_dev_preview/examples/applicationautoscaling/Cargo.toml b/rust_dev_preview/examples/applicationautoscaling/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-applicationautoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/applicationautoscaling/src/bin/describe-scaling-policies.rs b/rust_dev_preview/examples/applicationautoscaling/src/bin/describe-scaling-policies.rs
@@ -29,11 +29,9 @@ async fn show_policies(client: &Client) -> Result<(), Error> {
         .service_namespace(ServiceNamespace::Ec2)
         .send()
         .await?;
-    if let Some(policies) = response.scaling_policies() {
-        println!("Auto Scaling Policies:");
-        for policy in policies {
-            println!("{:?}\n", policy);
-        }
+    println!("Auto Scaling Policies:");
+    for policy in response.scaling_policies() {
+        println!("{:?}\n", policy);
     }
     println!("Next token: {:?}", response.next_token());
 

diff --git a/rust_dev_preview/examples/autoscaling/Cargo.toml b/rust_dev_preview/examples/autoscaling/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-autoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-autoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 tokio = { version = "1.20.1", features = ["full"] }
 clap = { version = "~4.2", features = ["derive"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/autoscaling/src/bin/list-autoscaling-groups.rs b/rust_dev_preview/examples/autoscaling/src/bin/list-autoscaling-groups.rs
@@ -27,21 +27,15 @@ async fn list_groups(client: &Client) -> Result<(), Error> {
 
     println!("Groups:");
 
-    let groups = resp.auto_scaling_groups().unwrap_or_default();
+    let groups = resp.auto_scaling_groups();
 
     for group in groups {
-        println!(
-            "Name:  {}",
-            group.auto_scaling_group_name().unwrap_or("Unknown"),
-        );
+        println!("Name:  {}", group.auto_scaling_group_name(),);
         println!(
             "Arn:   {}",
             group.auto_scaling_group_arn().unwrap_or("unknown"),
         );
-        println!(
-            "Zones: {:?}",
-            group.availability_zones().unwrap_or_default(),
-        );
+        println!("Zones: {:?}", group.availability_zones(),);
         println!();
     }
 

diff --git a/rust_dev_preview/examples/autoscalingplans/Cargo.toml b/rust_dev_preview/examples/autoscalingplans/Cargo.toml
@@ -10,9 +10,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-sdk-autoscalingplans = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+aws-sdk-autoscalingplans = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/autoscalingplans/src/bin/describe-scaling-plans.rs b/rust_dev_preview/examples/autoscalingplans/src/bin/describe-scaling-plans.rs
@@ -25,11 +25,9 @@ struct Opt {
 async fn list_plans(client: &Client) -> Result<(), Error> {
     let response = client.describe_scaling_plans().send().await?;
 
-    if let Some(plans) = response.scaling_plans() {
-        println!("Auto Scaling Plans:");
-        for plan in plans {
-            println!("{:?}\n", plan);
-        }
+    println!("Auto Scaling Plans:");
+    for plan in response.scaling_plans() {
+        println!("{:?}\n", plan);
     }
 
     Ok(())

diff --git a/rust_dev_preview/examples/batch/Cargo.toml b/rust_dev_preview/examples/batch/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-batch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/batch/src/bin/batch-helloworld.rs b/rust_dev_preview/examples/batch/src/bin/batch-helloworld.rs
@@ -25,11 +25,11 @@ struct Opt {
 async fn show_envs(client: &Client) -> Result<(), Error> {
     let rsp = client.describe_compute_environments().send().await?;
 
-    let compute_envs = rsp.compute_environments().unwrap_or_default();
+    let compute_envs = rsp.compute_environments();
     println!("Found {} compute environments:", compute_envs.len());
     for env in compute_envs {
-        let arn = env.compute_environment_arn().unwrap_or_default();
-        let name = env.compute_environment_name().unwrap_or_default();
+        let arn = env.compute_environment_arn();
+        let name = env.compute_environment_name();
 
         println!("  Name : {}", name);
         println!("  ARN:   {}", arn);

diff --git a/rust_dev_preview/examples/cloudformation/Cargo.toml b/rust_dev_preview/examples/cloudformation/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-cloudformation = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cloudformation/src/bin/describe-stack.rs b/rust_dev_preview/examples/cloudformation/src/bin/describe-stack.rs
@@ -32,14 +32,9 @@ async fn describe_stack(client: &Client, name: &str) -> Result<(), Error> {
 
     // Otherwise we get an array of stacks that match the stack_name.
     // The array should only have one item, so just access it via first().
-    let status = resp
-        .stacks()
-        .unwrap_or_default()
-        .first()
-        .unwrap()
-        .stack_status();
-
-    println!("Stack status: {}", status.unwrap().as_ref());
+    let status = resp.stacks().first().unwrap().stack_status();
+
+    println!("Stack status: {}", status.as_str());
 
     println!();
 

diff --git a/rust_dev_preview/examples/cloudformation/src/bin/list-stacks.rs b/rust_dev_preview/examples/cloudformation/src/bin/list-stacks.rs
@@ -25,9 +25,9 @@ struct Opt {
 async fn list_stacks(client: &Client) -> Result<(), Error> {
     let stacks = client.list_stacks().send().await?;
 
-    for stack in stacks.stack_summaries().unwrap_or_default() {
-        println!("{}", stack.stack_name().unwrap_or_default());
-        println!("  Status: {:?}", stack.stack_status().unwrap());
+    for stack in stacks.stack_summaries() {
+        println!("{}", stack.stack_name());
+        println!("  Status: {:?}", stack.stack_status());
         println!();
     }
 

diff --git a/rust_dev_preview/examples/cloudwatch/Cargo.toml b/rust_dev_preview/examples/cloudwatch/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-cloudwatch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/cloudwatch/src/bin/list-metrics.rs b/rust_dev_preview/examples/cloudwatch/src/bin/list-metrics.rs
@@ -26,7 +26,7 @@ async fn show_metrics(
     client: &aws_sdk_cloudwatch::Client,
 ) -> Result<(), aws_sdk_cloudwatch::Error> {
     let rsp = client.list_metrics().send().await?;
-    let metrics = rsp.metrics().unwrap_or_default();
+    let metrics = rsp.metrics();
 
     let num_metrics = metrics.len();
 
@@ -37,8 +37,8 @@ async fn show_metrics(
 
         if let Some(dimension) = metric.dimensions.as_ref() {
             for d in dimension {
-                println!("  Name:  {}", d.name().unwrap_or_default());
-                println!("  Value: {}", d.value().unwrap_or_default());
+                println!("  Name:  {}", d.name());
+                println!("  Value: {}", d.value());
                 println!();
             }
         }

diff --git a/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml b/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-sdk-cloudwatchlogs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
-aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" }
+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"] }
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }