Use ChainProvider for region in Snowball examples (#580)

* Use ChainProvider for region in Snowball examples

* Change default_region to region in Cognito and Snowball examples

Author: jdisanti

aws/sdk/build.gradle.kts

@@ -6,7 +6,6 @@ import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.aws.traits.ServiceTrait
 import kotlin.streams.toList
-import org.jetbrains.kotlin.utils.ifEmpty
 
 extra["displayName"] = "Smithy :: Rust :: AWS-SDK"
 extra["moduleName"] = "software.amazon.smithy.rust.awssdk"

aws/sdk/examples/cognitoidentity/src/bin/list-identity-pools.rs

@@ -9,9 +9,9 @@ use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Opt {
-    /// The default region
+    /// The region
     #[structopt(short, long)]
-    default_region: Option<String>,
+    region: Option<String>,
 
     /// Whether to display additional information
     #[structopt(short, long)]
@@ -21,7 +21,7 @@ struct Opt {
 /// Lists your Amazon Cognito identities
 /// # Arguments
 ///
-/// * `[-d DEFAULT-REGION]` - The region containing the buckets.
+/// * `[-r REGION]` - The region containing the buckets.
 ///   If not supplied, uses the value of the **AWS_DEFAULT_REGION** environment variable.
 ///   If the environment variable is not set, defaults to **us-west-2**.
 /// * `[-g]` - Whether to display buckets in all regions.
@@ -30,12 +30,9 @@ struct Opt {
 async fn main() -> Result<(), Error> {
     tracing_subscriber::fmt::init();
 
-    let Opt {
-        default_region,
-        verbose,
-    } = Opt::from_args();
+    let Opt { region, verbose } = Opt::from_args();
 
-    let region_provider = region::ChainProvider::first_try(default_region.map(Region::new))
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
         .or_default_provider()
         .or_else(Region::new("us-west-2"));
 

aws/sdk/examples/cognitoidentityprovider/src/bin/list-user-pools.rs

@@ -9,9 +9,9 @@ use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Opt {
-    /// The default region
+    /// The region
     #[structopt(short, long)]
-    default_region: Option<String>,
+    region: Option<String>,
 
     /// Whether to display additional information
     #[structopt(short, long)]
@@ -21,7 +21,7 @@ struct Opt {
 /// Lists your Amazon Cognito user pools
 /// # Arguments
 ///
-/// * `[-d DEFAULT-REGION]` - The region containing the buckets.
+/// * `[-r REGION]` - The region containing the buckets.
 ///   If not supplied, uses the value of the **AWS_DEFAULT_REGION** environment variable.
 ///   If the environment variable is not set, defaults to **us-west-2**.
 /// * `[-g]` - Whether to display buckets in all regions.
@@ -30,12 +30,9 @@ struct Opt {
 async fn main() -> Result<(), Error> {
     tracing_subscriber::fmt::init();
 
-    let Opt {
-        default_region,
-        verbose,
-    } = Opt::from_args();
+    let Opt { region, verbose } = Opt::from_args();
 
-    let region_provider = region::ChainProvider::first_try(default_region.map(Region::new))
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
         .or_default_provider()
         .or_else(Region::new("us-west-2"));
 

aws/sdk/examples/cognitosync/src/bin/list-identity-pool-usage.rs

@@ -9,9 +9,9 @@ use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Opt {
-    /// The default region
+    /// The region
     #[structopt(short, long)]
-    default_region: Option<String>,
+    region: Option<String>,
 
     /// Whether to display additional information
     #[structopt(short, long)]
@@ -21,7 +21,7 @@ struct Opt {
 /// Lists identity pools registered with  Amazon Cognito
 /// # Arguments
 ///
-/// * `[-d DEFAULT-REGION]` - The region containing the buckets.
+/// * `[-r REGION]` - The region containing the buckets.
 ///   If not supplied, uses the value of the **AWS_DEFAULT_REGION** environment variable.
 ///   If the environment variable is not set, defaults to **us-west-2**.
 /// * `[-g]` - Whether to display buckets in all regions.
@@ -30,12 +30,9 @@ struct Opt {
 async fn main() -> Result<(), Error> {
     tracing_subscriber::fmt::init();
 
-    let Opt {
-        default_region,
-        verbose,
-    } = Opt::from_args();
+    let Opt { region, verbose } = Opt::from_args();
 
-    let region_provider = region::ChainProvider::first_try(default_region.map(Region::new))
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
         .or_default_provider()
         .or_else(Region::new("us-west-2"));
 

aws/sdk/examples/snowball/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2018"
 [dependencies]
 tokio = { version = "1", features = ["full"]}
 aws-sdk-snowball = { path = "../../build/aws-sdk/snowball" }
-aws-hyper = { path = "../../build/aws-sdk/aws-hyper" }
 aws-types = { path = "../../build/aws-sdk/aws-types" }
 structopt = { version = "0.3", default-features = false }
 tracing-subscriber = { version = "0.2.16", features = ["fmt"] }

aws/sdk/examples/snowball/src/bin/create-address.rs

@@ -5,12 +5,12 @@
 
 use aws_sdk_snowball::model::Address;
 use aws_sdk_snowball::{Config, Region};
-use aws_types::region::{EnvironmentProvider, ProvideRegion};
+use aws_types::region;
 use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Opt {
-    /// The region
+    /// The default region
     #[structopt(short, long)]
     region: Option<String>,
 
@@ -54,6 +54,8 @@ struct Opt {
 
 #[tokio::main]
 async fn main() -> Result<(), aws_sdk_snowball::Error> {
+    tracing_subscriber::fmt::init();
+
     let Opt {
         region,
         city,
@@ -70,10 +72,9 @@ async fn main() -> Result<(), aws_sdk_snowball::Error> {
         street3,
     } = Opt::from_args();
 
-    let region = EnvironmentProvider::new()
-        .region()
-        .or_else(|| region.as_ref().map(|region| Region::new(region.clone())))
-        .unwrap_or_else(|| Region::new("us-west-2"));
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
+        .or_default_provider()
+        .or_else(Region::new("us-west-2"));
 
     let new_address = Address::builder()
         .set_address_id(None)
@@ -92,7 +93,7 @@ async fn main() -> Result<(), aws_sdk_snowball::Error> {
         .set_is_restricted(Some(false))
         .build();
 
-    let conf = Config::builder().region(region).build();
+    let conf = Config::builder().region(region_provider).build();
     let client = aws_sdk_snowball::Client::from_conf(conf);
 
     let result = client.create_address().address(new_address).send().await?;

aws/sdk/examples/snowball/src/bin/describe-addresses.rs

@@ -4,12 +4,29 @@
  */
 
 use aws_sdk_snowball::{Config, Region};
+use aws_types::region;
+use structopt::StructOpt;
+
+#[derive(Debug, StructOpt)]
+struct Opt {
+    /// The region
+    #[structopt(short, long)]
+    region: Option<String>,
+}
 
 #[tokio::main]
 async fn main() -> Result<(), aws_sdk_snowball::Error> {
-    let region = Region::new("us-east-1");
-    let conf = Config::builder().region(region).build();
+    tracing_subscriber::fmt::init();
+
+    let Opt { region } = Opt::from_args();
+
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
+        .or_default_provider()
+        .or_else(Region::new("us-east-1"));
+
+    let conf = Config::builder().region(region_provider).build();
     let client = aws_sdk_snowball::Client::from_conf(conf);
+
     let addresses = client.describe_addresses().send().await?;
     for address in addresses.addresses.unwrap() {
         println!("Address: {:?}", address);

aws/sdk/examples/snowball/src/bin/list-jobs.rs

@@ -4,12 +4,29 @@
  */
 
 use aws_sdk_snowball::{Config, Region};
+use aws_types::region;
+use structopt::StructOpt;
+
+#[derive(Debug, StructOpt)]
+struct Opt {
+    /// The region
+    #[structopt(short, long)]
+    region: Option<String>,
+}
 
 #[tokio::main]
 async fn main() -> Result<(), aws_sdk_snowball::Error> {
-    let region = Region::new("us-east-1");
-    let conf = Config::builder().region(region).build();
+    tracing_subscriber::fmt::init();
+
+    let Opt { region } = Opt::from_args();
+
+    let region_provider = region::ChainProvider::first_try(region.map(Region::new))
+        .or_default_provider()
+        .or_else(Region::new("us-east-1"));
+
+    let conf = Config::builder().region(region_provider).build();
     let client = aws_sdk_snowball::Client::from_conf(conf);
+
     let jobs = client.list_jobs().send().await?;
     for job in jobs.job_list_entries.unwrap() {
         println!("JobId: {:?}", job.job_id);