Commit 72134a07 authored by Doug's avatar Doug Committed by Russell Cohen
Browse files

Refactored RDS code examples (#560) 

* Refactored RDS code examples to use common example pattern; re-ordered crates in Cargo.toml

* Updated RDS helloworld code example to use ? instead of expect()
parent f61f6040

aws/sdk/examples/rds/Cargo.toml

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ version = "0.1.0" 
[dependencies]

rds = {package = "aws-sdk-rds", path = "../../build/aws-sdk/rds"}

aws-types = { path = "../../build/aws-sdk/aws-types" }



tokio = {version = "1", features = ["full"]}

structopt = { version = "0.3", default-features = false }

tracing-subscriber = { version = "0.2.16", features = ["fmt"] }
 
 No newline at end of file

aws/sdk/examples/rds/src/bin/rds-helloworld.rs

+9 −15
Original line number Diff line number Diff line
@@ -3,21 +3,17 @@ 
 * SPDX-License-Identifier: Apache-2.0.

 */



use rds::{Client, Config, Region};



use aws_types::region::ProvideRegion;



use rds::{Client, Config, Error, Region, PKG_VERSION};

use structopt::StructOpt;

use tracing_subscriber::fmt::format::FmtSpan;

use tracing_subscriber::fmt::SubscriberBuilder;



#[derive(Debug, StructOpt)]

struct Opt {

    /// The region. Overrides environment variable AWS_DEFAULT_REGION.

    /// The default AWS Region.

    #[structopt(short, long)]

    default_region: Option<String>,



    /// Whether to display additional runtime information

    /// Whether to display additional information.

    #[structopt(short, long)]

    verbose: bool,

}
@@ -30,7 +26,9 @@ struct Opt { 
///    If the environment variable is not set, defaults to **us-west-2**.

/// * `[-v]` - Whether to display additional information.

#[tokio::main]

async fn main() -> Result<(), rds::Error> {

async fn main() -> Result<(), Error> {

    tracing_subscriber::fmt::init();



    let Opt {

        default_region,

        verbose,
@@ -43,13 +41,9 @@ async fn main() -> Result<(), rds::Error> { 
        .unwrap_or_else(|| Region::new("us-west-2"));



    if verbose {

        println!("RDS client version: {}\n", rds::PKG_VERSION);

        println!("RDS version: {}", PKG_VERSION);

        println!("Region:      {:?}", &region);



        SubscriberBuilder::default()

            .with_env_filter("info")

            .with_span_events(FmtSpan::CLOSE)

            .init();

        println!();

    }



    let conf = Config::builder().region(region).build();