diff --git a/rust_dev_preview/cross_service/detect_faces/Cargo.toml b/rust_dev_preview/cross_service/detect_faces/Cargo.toml index 42433ba1b1f..20b11209615 100644 --- 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.1", 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 e7bee3a390f..cf2f2bfcef9 100644 --- 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.1", 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 index 3362125ac06..63b49c2b350 100644 --- 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 index 1517255f554..2471c6d6a8d 100644 --- 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/rest_ses/Cargo.toml b/rust_dev_preview/cross_service/rest_ses/Cargo.toml index bb36a3822b2..9d6da1fe581 100644 --- 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", @@ -44,8 +44,8 @@ uuid = { version = "1.2.1", features = ["v4", "serde"] } xlsxwriter = "0.6.0" [dev-dependencies] -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["test-util"] } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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 = "next" } fake = { version = "2.5.0", features = ["uuid"] } once_cell = "1.15.0" rand = "0.8.5" diff --git a/rust_dev_preview/cross_service/rust-toolchain.toml b/rust_dev_preview/cross_service/rust-toolchain.toml index c9c99b37851..41755a2bed6 100644 --- a/rust_dev_preview/cross_service/rust-toolchain.toml +++ b/rust_dev_preview/cross_service/rust-toolchain.toml @@ -1,3 +1,3 @@ # This should be kept in sync with https://github.com/awslabs/aws-sdk-rust#supported-rust-versions-msrv [toolchain] -channel = "1.66.1" +channel = "1.69.0" diff --git a/rust_dev_preview/cross_service/telephone/Cargo.toml b/rust_dev_preview/cross_service/telephone/Cargo.toml index fb63557646b..b3729e8bbdf 100644 --- 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/apigateway/Cargo.toml b/rust_dev_preview/examples/apigateway/Cargo.toml index e2630f299f7..2837259d101 100644 --- 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml b/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml index f0bf90aab2d..8e5aa68730c 100644 --- 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/applicationautoscaling/Cargo.toml b/rust_dev_preview/examples/applicationautoscaling/Cargo.toml index 04fc0154fc3..7c5a7731792 100644 --- 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.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/autoscaling/Cargo.toml b/rust_dev_preview/examples/autoscaling/Cargo.toml index b652c43a4e6..97b60dd1827 100644 --- 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.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/autoscalingplans/Cargo.toml b/rust_dev_preview/examples/autoscalingplans/Cargo.toml index 33889c93bff..9f8223cd627 100644 --- 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.1", 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 0d023c2918c..07223ba170f 100644 --- 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.1", 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 3fb29d9d169..79a194a1f4f 100644 --- 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.1", 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 fe53196f36d..9a5af9c7dd7 100644 --- 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.1", 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 e703211de4d..3034ce6d5ce 100644 --- 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.1", 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 94e5a23cf34..7909d6ae5a0 100644 --- a/rust_dev_preview/examples/cognitoidentity/Cargo.toml +++ b/rust_dev_preview/examples/cognitoidentity/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-cognitoidentity = { 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-cognitoidentity = { 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", ] } chrono = "0.4" diff --git a/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml b/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml index a20655d1022..f5aa9c460be 100644 --- a/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml +++ b/rust_dev_preview/examples/cognitoidentityprovider/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-cognitoidentityprovider = { 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-cognitoidentityprovider = { 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/cognitosync/Cargo.toml b/rust_dev_preview/examples/cognitosync/Cargo.toml index 85d38e466ee..46215466eda 100644 --- a/rust_dev_preview/examples/cognitosync/Cargo.toml +++ b/rust_dev_preview/examples/cognitosync/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-cognitosync = { 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-cognitosync = { 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/concurrency/Cargo.toml b/rust_dev_preview/examples/concurrency/Cargo.toml index e979d64b953..7dc57340c88 100644 --- a/rust_dev_preview/examples/concurrency/Cargo.toml +++ b/rust_dev_preview/examples/concurrency/Cargo.toml @@ -21,7 +21,7 @@ tracing = "0.1.37" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } [dev-dependencies] -aws-config = { 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-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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" } +aws-sdk-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } fastrand = "1.8.0" diff --git a/rust_dev_preview/examples/config/Cargo.toml b/rust_dev_preview/examples/config/Cargo.toml index 0a6588be0da..cde7522e902 100644 --- a/rust_dev_preview/examples/config/Cargo.toml +++ b/rust_dev_preview/examples/config/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-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/custom-root-certificates/Cargo.toml b/rust_dev_preview/examples/custom-root-certificates/Cargo.toml index a0f2ef6df47..a961c5e711e 100644 --- a/rust_dev_preview/examples/custom-root-certificates/Cargo.toml +++ b/rust_dev_preview/examples/custom-root-certificates/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" description = "An example demonstrating setting a custom root certificate with rustls" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } # bringing our own HTTPs so no need for the default features -aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", default-features = false } +aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } tokio = { version = "1.21.2", features = ["full"] } rustls = "0.20.7" hyper-rustls = { version = "0.23.0", features = ["http2"] } diff --git a/rust_dev_preview/examples/dynamodb/Cargo.toml b/rust_dev_preview/examples/dynamodb/Cargo.toml index b6266875a56..5ecc3397c9f 100644 --- a/rust_dev_preview/examples/dynamodb/Cargo.toml +++ b/rust_dev_preview/examples/dynamodb/Cargo.toml @@ -11,18 +11,18 @@ 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-http = { 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-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "client-hyper", "rustls", "rt-tokio", ] } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = [ +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "rt-tokio", ] } -aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } axum = "0.5.16" http = "0.2.5" futures = "0.3" diff --git a/rust_dev_preview/examples/dynamodb/src/bin/crud.rs b/rust_dev_preview/examples/dynamodb/src/bin/crud.rs index 076fad36e66..bc33da8f74a 100644 --- a/rust_dev_preview/examples/dynamodb/src/bin/crud.rs +++ b/rust_dev_preview/examples/dynamodb/src/bin/crud.rs @@ -6,15 +6,14 @@ #![allow(clippy::result_large_err)] use aws_config::meta::region::RegionProviderChain; +use aws_sdk_dynamodb::error::SdkError; +use aws_sdk_dynamodb::operation::create_table::CreateTableError; +use aws_sdk_dynamodb::operation::put_item::PutItemError; use aws_sdk_dynamodb::types::{ AttributeDefinition, AttributeValue, KeySchemaElement, KeyType, ProvisionedThroughput, ScalarAttributeType, Select, TableStatus, }; use aws_sdk_dynamodb::{config::Region, meta::PKG_VERSION, Client, Error}; -use aws_smithy_http::result::SdkError; - -use aws_sdk_dynamodb::operation::create_table::CreateTableError; -use aws_sdk_dynamodb::operation::put_item::PutItemError; use clap::Parser; use rand::distributions::Alphanumeric; use rand::{thread_rng, Rng}; diff --git a/rust_dev_preview/examples/dynamodb/src/bin/partiql.rs b/rust_dev_preview/examples/dynamodb/src/bin/partiql.rs index 61add8fac18..09ddf90e95b 100644 --- a/rust_dev_preview/examples/dynamodb/src/bin/partiql.rs +++ b/rust_dev_preview/examples/dynamodb/src/bin/partiql.rs @@ -6,15 +6,14 @@ #![allow(clippy::result_large_err)] use aws_config::meta::region::RegionProviderChain; +use aws_sdk_dynamodb::error::SdkError; +use aws_sdk_dynamodb::operation::create_table::CreateTableError; +use aws_sdk_dynamodb::operation::execute_statement::ExecuteStatementError; use aws_sdk_dynamodb::types::{ AttributeDefinition, AttributeValue, KeySchemaElement, KeyType, ProvisionedThroughput, ScalarAttributeType, TableStatus, }; use aws_sdk_dynamodb::{config::Region, meta::PKG_VERSION, Client, Error}; -use aws_smithy_http::result::SdkError; - -use aws_sdk_dynamodb::operation::create_table::CreateTableError; -use aws_sdk_dynamodb::operation::execute_statement::ExecuteStatementError; use clap::Parser; use rand::distributions::Alphanumeric; use rand::{thread_rng, Rng}; diff --git a/rust_dev_preview/examples/dynamodb/src/scenario/movies/mod.rs b/rust_dev_preview/examples/dynamodb/src/scenario/movies/mod.rs index 6dd8d13544a..9d65dd9f79f 100644 --- a/rust_dev_preview/examples/dynamodb/src/scenario/movies/mod.rs +++ b/rust_dev_preview/examples/dynamodb/src/scenario/movies/mod.rs @@ -1,9 +1,8 @@ -use std::collections::HashMap; - +use aws_sdk_dynamodb::error::SdkError; use aws_sdk_dynamodb::types::{AttributeValue, PutRequest}; -use aws_smithy_client::SdkError; use serde::{Deserialize, Serialize}; use serde_json::Value; +use std::collections::HashMap; use thiserror::Error; pub const TABLE_NAME: &str = "movies"; @@ -39,11 +38,12 @@ impl From for MovieError { } } -impl From> for MovieError +impl From> for MovieError where E: std::fmt::Debug, + R: std::fmt::Debug, { - fn from(err: SdkError) -> Self { + fn from(err: SdkError) -> Self { MovieError::Unknown(format!("{err:?}")) } } diff --git a/rust_dev_preview/examples/ebs/Cargo.toml b/rust_dev_preview/examples/ebs/Cargo.toml index 8c189f7f99c..70aa8d5dac4 100644 --- a/rust_dev_preview/examples/ebs/Cargo.toml +++ b/rust_dev_preview/examples/ebs/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-ebs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-ebs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" diff --git a/rust_dev_preview/examples/ec2/Cargo.toml b/rust_dev_preview/examples/ec2/Cargo.toml index 4214dda6b10..e8254fce485 100644 --- a/rust_dev_preview/examples/ec2/Cargo.toml +++ b/rust_dev_preview/examples/ec2/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-ec2 = { 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-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.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/ecr/Cargo.toml b/rust_dev_preview/examples/ecr/Cargo.toml index 851edf156b8..8e4f490f3c0 100644 --- a/rust_dev_preview/examples/ecr/Cargo.toml +++ b/rust_dev_preview/examples/ecr/Cargo.toml @@ -8,9 +8,9 @@ authors = [ edition = "2021" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-ecr = { 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-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.1", 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 da9d6812b47..b8ab99c67ba 100644 --- a/rust_dev_preview/examples/ecs/Cargo.toml +++ b/rust_dev_preview/examples/ecs/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-ecs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 6f95be6a24e..d679ae7f13f 100644 --- a/rust_dev_preview/examples/eks/Cargo.toml +++ b/rust_dev_preview/examples/eks/Cargo.toml @@ -8,9 +8,9 @@ authors = [ edition = "2021" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-eks = { 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-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.1", 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 e61fae4ed65..937153a71f8 100644 --- a/rust_dev_preview/examples/firehose/Cargo.toml +++ b/rust_dev_preview/examples/firehose/Cargo.toml @@ -9,9 +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-firehose = { 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-firehose = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "4.2.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/firehose/src/bin/put-records-batch.rs b/rust_dev_preview/examples/firehose/src/bin/put-records-batch.rs index 03aa9c40033..13d46099bfd 100644 --- a/rust_dev_preview/examples/firehose/src/bin/put-records-batch.rs +++ b/rust_dev_preview/examples/firehose/src/bin/put-records-batch.rs @@ -10,8 +10,7 @@ use aws_sdk_firehose::error::SdkError; use aws_sdk_firehose::operation::put_record_batch::{PutRecordBatchError, PutRecordBatchOutput}; use aws_sdk_firehose::primitives::Blob; use aws_sdk_firehose::types::Record; -use aws_sdk_firehose::{meta::PKG_VERSION, Client, Error}; -use aws_types::region::Region; +use aws_sdk_firehose::{config::Region, meta::PKG_VERSION, Client, Error}; use clap::Parser; #[derive(Debug, Parser)] diff --git a/rust_dev_preview/examples/globalaccelerator/Cargo.toml b/rust_dev_preview/examples/globalaccelerator/Cargo.toml index dc306ba7440..e0c635dfd79 100644 --- a/rust_dev_preview/examples/globalaccelerator/Cargo.toml +++ b/rust_dev_preview/examples/globalaccelerator/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-globalaccelerator = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/glue/Cargo.toml b/rust_dev_preview/examples/glue/Cargo.toml index e9aae5e5b4c..ad4de02b785 100644 --- a/rust_dev_preview/examples/glue/Cargo.toml +++ b/rust_dev_preview/examples/glue/Cargo.toml @@ -13,20 +13,20 @@ name = "scenario" # 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-glue = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-http = { 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-glue = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "client-hyper", "rustls", "rt-tokio", ] } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = [ +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "rt-tokio", ] } -aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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" } 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/greengrassv2/Cargo.toml b/rust_dev_preview/examples/greengrassv2/Cargo.toml index f6f3a98c767..f8b27112d69 100644 --- a/rust_dev_preview/examples/greengrassv2/Cargo.toml +++ b/rust_dev_preview/examples/greengrassv2/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Aaron Tsui "] edition = "2021" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-greengrassv2 = { 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-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.1", 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 39c276c0f7d..17e88d77264 100644 --- a/rust_dev_preview/examples/iam/Cargo.toml +++ b/rust_dev_preview/examples/iam/Cargo.toml @@ -17,15 +17,11 @@ name = "iam_getting_started" path = "src/bin/iam-getting-started.rs" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["hardcoded-credentials"] } -aws-hyper = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-iam = { 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-sts = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["test-util"] } -aws-smithy-http = { 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-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["hardcoded-credentials"] } +aws-sdk-iam = { 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-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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/iot/Cargo.toml b/rust_dev_preview/examples/iot/Cargo.toml index 3b0f8651a5d..85169d9ec15 100644 --- a/rust_dev_preview/examples/iot/Cargo.toml +++ b/rust_dev_preview/examples/iot/Cargo.toml @@ -7,9 +7,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-iot = { 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-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.1", 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 1d86df1b4f6..d716e9fa037 100644 --- a/rust_dev_preview/examples/kinesis/Cargo.toml +++ b/rust_dev_preview/examples/kinesis/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-kinesis = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 b6f0ea99f0b..37cef3af8c9 100644 --- a/rust_dev_preview/examples/kms/Cargo.toml +++ b/rust_dev_preview/examples/kms/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" description = "Example usage of the KMS service" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-kms = { 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-kms = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "client-hyper", "rustls", "rt-tokio", diff --git a/rust_dev_preview/examples/lambda/Cargo.toml b/rust_dev_preview/examples/lambda/Cargo.toml index 05cf0e98b6d..65057be85a8 100644 --- a/rust_dev_preview/examples/lambda/Cargo.toml +++ b/rust_dev_preview/examples/lambda/Cargo.toml @@ -6,13 +6,13 @@ 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-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-iam = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-types = { 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-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-iam = { 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" } +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.1", features = ["derive"] } tokio = { version = "1.20.1", features = ["full"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/localstack/Cargo.toml b/rust_dev_preview/examples/localstack/Cargo.toml index 3bbe80da8bd..89d6895933e 100644 --- a/rust_dev_preview/examples/localstack/Cargo.toml +++ b/rust_dev_preview/examples/localstack/Cargo.toml @@ -6,9 +6,9 @@ authors = ["Doug Schwartz "] edition = "2021" [dependencies] -aws-config = { 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-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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" } +aws-sdk-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } tokio = { version = "1.20.1", features = ["full"] } http = "0.2" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/logging/logger/Cargo.toml b/rust_dev_preview/examples/logging/logger/Cargo.toml index 62d8da4b1f6..770341ad45c 100644 --- a/rust_dev_preview/examples/logging/logger/Cargo.toml +++ b/rust_dev_preview/examples/logging/logger/Cargo.toml @@ -11,8 +11,8 @@ version = "0.1.0" # 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-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } # snippet-start:[logging.rust.logger-cargo.toml-env_logger] env_logger = "0.9.0" # snippet-end:[logging.rust.logger-cargo.toml-env_logger] diff --git a/rust_dev_preview/examples/logging/tracing/Cargo.toml b/rust_dev_preview/examples/logging/tracing/Cargo.toml index 0a7c0a6c972..40bd39b36fd 100644 --- a/rust_dev_preview/examples/logging/tracing/Cargo.toml +++ b/rust_dev_preview/examples/logging/tracing/Cargo.toml @@ -11,8 +11,8 @@ version = "0.1.0" # 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-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.1", features = ["derive"] } tokio = { version = "1.20.1", features = ["full"] } # snippet-start:[logging.rust.tracing-cargo.toml-tracing_subscriber] diff --git a/rust_dev_preview/examples/medialive/Cargo.toml b/rust_dev_preview/examples/medialive/Cargo.toml index a71b355ce95..62c24c7cef4 100644 --- a/rust_dev_preview/examples/medialive/Cargo.toml +++ b/rust_dev_preview/examples/medialive/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-medialive = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 294ae22a5d3..843f86b6f61 100644 --- a/rust_dev_preview/examples/mediapackage/Cargo.toml +++ b/rust_dev_preview/examples/mediapackage/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-mediapackage = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 a1a2551229d..f7ba6fa96cf 100644 --- a/rust_dev_preview/examples/polly/Cargo.toml +++ b/rust_dev_preview/examples/polly/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-polly = { 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" } tokio = { version = "1.20.1", features = ["full"] } bytes = "1" clap = { version = "4.2.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/qldb/Cargo.toml b/rust_dev_preview/examples/qldb/Cargo.toml index 3182a734dde..302abc27acc 100644 --- a/rust_dev_preview/examples/qldb/Cargo.toml +++ b/rust_dev_preview/examples/qldb/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-qldb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-qldbsession = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/rds/Cargo.toml b/rust_dev_preview/examples/rds/Cargo.toml index 0ad952caf65..4cb9772a076 100644 --- a/rust_dev_preview/examples/rds/Cargo.toml +++ b/rust_dev_preview/examples/rds/Cargo.toml @@ -10,8 +10,8 @@ version = "0.1.0" # 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-rds = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-rds = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "4.2.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/rdsdata/Cargo.toml b/rust_dev_preview/examples/rdsdata/Cargo.toml index b08d5884259..e6c887a0641 100644 --- a/rust_dev_preview/examples/rdsdata/Cargo.toml +++ b/rust_dev_preview/examples/rdsdata/Cargo.toml @@ -10,8 +10,8 @@ version = "0.1.0" # 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-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 26cf9a92f28..a944f614f85 100644 --- a/rust_dev_preview/examples/route53/Cargo.toml +++ b/rust_dev_preview/examples/route53/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-route53 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/rust-toolchain.toml b/rust_dev_preview/examples/rust-toolchain.toml index c9c99b37851..41755a2bed6 100644 --- a/rust_dev_preview/examples/rust-toolchain.toml +++ b/rust_dev_preview/examples/rust-toolchain.toml @@ -1,3 +1,3 @@ # This should be kept in sync with https://github.com/awslabs/aws-sdk-rust#supported-rust-versions-msrv [toolchain] -channel = "1.66.1" +channel = "1.69.0" diff --git a/rust_dev_preview/examples/s3/Cargo.toml b/rust_dev_preview/examples/s3/Cargo.toml index db38a1cc265..2642f0bc3d6 100644 --- a/rust_dev_preview/examples/s3/Cargo.toml +++ b/rust_dev_preview/examples/s3/Cargo.toml @@ -21,16 +21,16 @@ assert_cmd = "2.0" predicates = "3.0.3" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } # snippet-start:[s3.rust.s3-object-lambda-cargo.toml] -aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } # snippet-end:[s3.rust.s3-object-lambda-cargo.toml] -aws-sdk-s3 = { 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-sdk-s3 = { 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", features = ["rt-tokio"] } -aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["rt-tokio"] } +aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } sdk-examples-test-utils = { path = "../../test-utils" } bytes = "1.4.0" futures-util = { version = "0.3.21", features = ["alloc"] } diff --git a/rust_dev_preview/examples/s3/src/bin/if-modified-since.rs b/rust_dev_preview/examples/s3/src/bin/if-modified-since.rs index a29bc5f0af1..9595c1ea96e 100644 --- a/rust_dev_preview/examples/s3/src/bin/if-modified-since.rs +++ b/rust_dev_preview/examples/s3/src/bin/if-modified-since.rs @@ -7,10 +7,9 @@ use aws_sdk_s3::{ error::SdkError, operation::head_object::HeadObjectError, - primitives::{ByteStream, DateTime}, + primitives::{ByteStream, DateTime, DateTimeFormat}, Client, Error, }; -use aws_smithy_types::date_time::Format; use http::StatusCode; use tracing::{error, warn}; @@ -85,7 +84,7 @@ async fn main() -> Result<(), Error> { Ok(output) => (Ok(output.last_modified().cloned()), output.e_tag), Err(err) => match err { SdkError::ServiceError(err) => { - let http = err.raw().http(); + let http = err.raw(); match http.status() { StatusCode::NOT_MODIFIED => ( Ok(Some( @@ -94,7 +93,7 @@ async fn main() -> Result<(), Error> { .get("last-modified") .map(|t| t.to_str().unwrap()) .unwrap(), - Format::HttpDate, + DateTimeFormat::HttpDate, ) .unwrap(), )), diff --git a/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs b/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs index f8d67b77ddd..f21feea2a99 100644 --- a/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs +++ b/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs @@ -1,4 +1,5 @@ use std::{ + convert::Infallible, mem, path::PathBuf, pin::Pin, @@ -60,7 +61,7 @@ impl ProgressBody { // this "change the wheels on the fly" utility. pub fn replace( mut value: http::Request, - ) -> Result, anyhow::Error> { + ) -> Result, Infallible> { let body = mem::replace(value.body_mut(), SdkBody::taken()).map(|body| { let len = body.content_length().expect("upload body sized"); // TODO - panics let body = ProgressBody::new(body, len); @@ -160,7 +161,7 @@ async fn put_object(client: &Client, opts: &Opt) -> Result<(), anyhow::Error> { let customized = request .customize() .await? - .map_request(ProgressBody::::replace)?; + .map_request(ProgressBody::::replace); let out = customized.send().await?; diff --git a/rust_dev_preview/examples/sagemaker/Cargo.toml b/rust_dev_preview/examples/sagemaker/Cargo.toml index 7d62e1b6384..4362474392a 100644 --- a/rust_dev_preview/examples/sagemaker/Cargo.toml +++ b/rust_dev_preview/examples/sagemaker/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-sagemaker = { 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-sagemaker = { 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/sdk-config/Cargo.toml b/rust_dev_preview/examples/sdk-config/Cargo.toml index fd8ea798464..27f4b6c01fb 100644 --- a/rust_dev_preview/examples/sdk-config/Cargo.toml +++ b/rust_dev_preview/examples/sdk-config/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-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-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "4.2.1", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/secretsmanager/Cargo.toml b/rust_dev_preview/examples/secretsmanager/Cargo.toml index 313274aab77..58d4e1f6d74 100644 --- a/rust_dev_preview/examples/secretsmanager/Cargo.toml +++ b/rust_dev_preview/examples/secretsmanager/Cargo.toml @@ -9,8 +9,8 @@ edition = "2021" description = "Example usage of the SecretManager service" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-secretsmanager = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 db2a9ba6de1..04dea6e4c97 100644 --- a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml +++ b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml @@ -7,9 +7,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-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } http = "0.2.6" hyper = "0.14" reqwest = "0.11" diff --git a/rust_dev_preview/examples/ses/Cargo.toml b/rust_dev_preview/examples/ses/Cargo.toml index 03e91ca8d59..3f331231c67 100644 --- a/rust_dev_preview/examples/ses/Cargo.toml +++ b/rust_dev_preview/examples/ses/Cargo.toml @@ -8,8 +8,8 @@ authors = [ edition = "2021" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-sesv2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 5782ca05e98..070d759c07c 100644 --- a/rust_dev_preview/examples/sitewise/Cargo.toml +++ b/rust_dev_preview/examples/sitewise/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" # For more keys and their definitions, see https://doc.rust-lang.org/cargo/reference/manifest.html. [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-iotsitewise = { 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-iotsitewise = { 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.1", features = ["derive"] } diff --git a/rust_dev_preview/examples/snowball/Cargo.toml b/rust_dev_preview/examples/snowball/Cargo.toml index 187dd6d9614..3a62eef1cb2 100644 --- a/rust_dev_preview/examples/snowball/Cargo.toml +++ b/rust_dev_preview/examples/snowball/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-snowball = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 53bb3d79c32..352fd98e698 100644 --- a/rust_dev_preview/examples/sns/Cargo.toml +++ b/rust_dev_preview/examples/sns/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-sns = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 fa8dda7d119..ebed0d28a89 100644 --- a/rust_dev_preview/examples/sqs/Cargo.toml +++ b/rust_dev_preview/examples/sqs/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-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 36f0b5294e4..aeee49c03a3 100644 --- a/rust_dev_preview/examples/ssm/Cargo.toml +++ b/rust_dev_preview/examples/ssm/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-ssm = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 bae0d35f886..0bc497336cf 100644 --- a/rust_dev_preview/examples/stepfunction/Cargo.toml +++ b/rust_dev_preview/examples/stepfunction/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Daniele Frasca "] edition = "2021" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-sfn = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +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.1", 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 f477cc0cdea..ae9aa97dd50 100644 --- a/rust_dev_preview/examples/sts/Cargo.toml +++ b/rust_dev_preview/examples/sts/Cargo.toml @@ -9,9 +9,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-sts = { 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-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.1", 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 44b9f1df164..d733b85b7b6 100644 --- a/rust_dev_preview/examples/testing/Cargo.toml +++ b/rust_dev_preview/examples/testing/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" [dependencies] async-trait = "0.1.51" # snippet-end:[testing.rust.Cargo.toml] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-s3 = { 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-s3 = { 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-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = [ +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "hardcoded-credentials", ] } tokio = { version = "1.20.1", features = ["full"] } diff --git a/rust_dev_preview/examples/textract/Cargo.toml b/rust_dev_preview/examples/textract/Cargo.toml index c99001060e6..225f4a7618b 100644 --- a/rust_dev_preview/examples/textract/Cargo.toml +++ b/rust_dev_preview/examples/textract/Cargo.toml @@ -9,8 +9,8 @@ edition = "2021" # For more keys and their definitions, see https://doc.rust-lang.org/cargo/reference/manifest.html. [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-textract = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-textract = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } tokio = { version = "1.27", features = ["full"] } structopt = { version = "0.3", default-features = false } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/tls/Cargo.toml b/rust_dev_preview/examples/tls/Cargo.toml index 4e310fbc883..1600814f87c 100644 --- a/rust_dev_preview/examples/tls/Cargo.toml +++ b/rust_dev_preview/examples/tls/Cargo.toml @@ -12,9 +12,9 @@ name = "tls" path = "src/lib.rs" [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-kms = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", default-features = false } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-kms = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } webpki-roots = "0.22.4" tokio = { version = "1.20.1", features = ["full"] } rustls = "0.20.6" diff --git a/rust_dev_preview/examples/tls/src/lib.rs b/rust_dev_preview/examples/tls/src/lib.rs index 8cc709df182..9447cd3e421 100644 --- a/rust_dev_preview/examples/tls/src/lib.rs +++ b/rust_dev_preview/examples/tls/src/lib.rs @@ -14,7 +14,6 @@ This example assumes you have set up environment variables for authentication. */ -use aws_config::provider_config::ProviderConfig; use aws_sdk_kms::Error; use aws_smithy_client::hyper_ext; use rustls::RootCertStore; @@ -50,9 +49,7 @@ pub async fn connect_via_tls_13() -> Result<(), Error> { .enable_http2() .build(); - let provider_config = ProviderConfig::default().with_tcp_connector(rustls_connector.clone()); let shared_conf = aws_config::from_env() - .configure(provider_config) .http_connector(hyper_ext::Adapter::builder().build(rustls_connector)) .load() .await; diff --git a/rust_dev_preview/examples/transcribestreaming/Cargo.toml b/rust_dev_preview/examples/transcribestreaming/Cargo.toml index 133e0e85abb..baef4ea4005 100644 --- a/rust_dev_preview/examples/transcribestreaming/Cargo.toml +++ b/rust_dev_preview/examples/transcribestreaming/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-transcribestreaming = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-sdk-transcribestreaming = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } async-stream = "0.3" bytes = "1" hound = "3.4" diff --git a/rust_dev_preview/lambda/calculator/Cargo.toml b/rust_dev_preview/lambda/calculator/Cargo.toml index 9397d22fedd..3fabf43972f 100644 --- a/rust_dev_preview/lambda/calculator/Cargo.toml +++ b/rust_dev_preview/lambda/calculator/Cargo.toml @@ -9,10 +9,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-ec2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-sdk-lambda = { 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-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.1", features = ["derive"] } tokio = { version = "1.20.1", features = ["full"] } diff --git a/rust_dev_preview/test-utils/Cargo.toml b/rust_dev_preview/test-utils/Cargo.toml index 6009ab2d6df..25b0e0ddfe8 100644 --- a/rust_dev_preview/test-utils/Cargo.toml +++ b/rust_dev_preview/test-utils/Cargo.toml @@ -9,12 +9,12 @@ edition = "2021" [workspace] [dependencies] -aws-config = { 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-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-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main"} +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"} http = "0.2" [lib] diff --git a/rust_dev_preview/webassembly/Cargo.toml b/rust_dev_preview/webassembly/Cargo.toml index 6b1b6018c76..df6dcf856a1 100644 --- a/rust_dev_preview/webassembly/Cargo.toml +++ b/rust_dev_preview/webassembly/Cargo.toml @@ -10,13 +10,12 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", default-features = false } -aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["hardcoded-credentials"] } -aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", default-features = false } -aws-smithy-async = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", default-features = false } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", features = ["event-stream"] } -aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } +aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["hardcoded-credentials"] } +aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } +aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } +aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["event-stream"] } +aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } async-trait = "0.1.63" console_error_panic_hook = "0.1.7" http = "0.2.8" diff --git a/rust_dev_preview/webassembly/src/lib.rs b/rust_dev_preview/webassembly/src/lib.rs index 567ba36442f..d5d6cd03029 100644 --- a/rust_dev_preview/webassembly/src/lib.rs +++ b/rust_dev_preview/webassembly/src/lib.rs @@ -5,10 +5,10 @@ use async_trait::async_trait; use aws_credential_types::{cache::CredentialsCache, provider::ProvideCredentials, Credentials}; -use aws_sdk_lambda::{config::Region, meta::PKG_VERSION, Client}; -use aws_smithy_async::rt::sleep::{AsyncSleep, Sleep}; -use aws_smithy_client::erase::DynConnector; -use aws_smithy_http::{body::SdkBody, result::ConnectorError}; +use aws_sdk_lambda::config::{AsyncSleep, Region, SharedAsyncSleep, Sleep}; +use aws_sdk_lambda::primitives::SdkBody; +use aws_sdk_lambda::{meta::PKG_VERSION, Client}; +use aws_smithy_http::result::ConnectorError; use serde::Deserialize; use wasm_bindgen::{prelude::*, JsCast}; @@ -59,10 +59,7 @@ pub async fn main(region: String, verbose: bool) -> Result { .region(Region::new(region)) .credentials_cache(browser_credentials_cache()) .credentials_provider(credentials_provider) - .http_connector(DynConnector::new(Adapter::new( - verbose, - access_key == "access_key", - ))) + .http_connector(Adapter::new(verbose, access_key == "access_key")) .load() .await; let client = Client::new(&shared_config); @@ -110,7 +107,7 @@ fn static_credential_provider() -> impl ProvideCredentials { fn browser_credentials_cache() -> CredentialsCache { CredentialsCache::lazy_builder() - .sleep(std::sync::Arc::new(BrowserSleep)) + .sleep(SharedAsyncSleep::new(BrowserSleep)) .into_credentials_cache() }