diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ff3eac403eb..e7adbbbb5b7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -32,7 +32,7 @@ jobs: ) - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable + toolchain: "1.70.0" components: clippy, rustfmt - uses: actions/checkout@v3 - name: Rust format diff --git a/rust_dev_preview/cross_service/detect_faces/Cargo.toml b/rust_dev_preview/cross_service/detect_faces/Cargo.toml index 0627676b889..842f4625b09 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 = "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-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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/cross_service/detect_labels/Cargo.toml b/rust_dev_preview/cross_service/detect_labels/Cargo.toml index f883392eb83..d8032667381 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml b/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml index 63b49c2b350..3362125ac06 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 = "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 = [ +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 = [ "test-util", ] } -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-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_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 2471c6d6a8d..1517255f554 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 = "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-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" } 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 9d6da1fe581..c7155d81981 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 = "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" } +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" } chrono = { version = "0.4.22", default-features = false, features = [ "clock", "serde", diff --git a/rust_dev_preview/cross_service/rust-toolchain.toml b/rust_dev_preview/cross_service/rust-toolchain.toml index 0ec68c05821..d9289af0602 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 = "stable" +channel = "1.70.0" diff --git a/rust_dev_preview/cross_service/telephone/Cargo.toml b/rust_dev_preview/cross_service/telephone/Cargo.toml index 00c5404d588..abfefd3f599 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 = "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" } +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" } 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 7a919451adf..93d4d1ca9bd 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 = "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 = [ +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 = [ "convert-chrono", ] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml b/rust_dev_preview/examples/apigatewaymanagement/Cargo.toml index cb4885eac17..741213b2d2b 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 = "next" } -aws-sdk-apigatewaymanagement = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } http = "0.2.5" tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/applicationautoscaling/Cargo.toml b/rust_dev_preview/examples/applicationautoscaling/Cargo.toml index 0c5eaefa239..3b6cbfb2f12 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 = "next" } -aws-sdk-applicationautoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/autoscaling/Cargo.toml b/rust_dev_preview/examples/autoscaling/Cargo.toml index 55a0b99b24b..00f66b85cef 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 = "next" } -aws-sdk-autoscaling = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/autoscalingplans/Cargo.toml b/rust_dev_preview/examples/autoscalingplans/Cargo.toml index c8a69e21991..0c4b35258b9 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/batch/Cargo.toml b/rust_dev_preview/examples/batch/Cargo.toml index 37b22f127f4..bb710d71c90 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 = "next" } -aws-sdk-batch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/cloudformation/Cargo.toml b/rust_dev_preview/examples/cloudformation/Cargo.toml index b41424e399e..3cb8956741e 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 = "next" } -aws-sdk-cloudformation = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/cloudwatch/Cargo.toml b/rust_dev_preview/examples/cloudwatch/Cargo.toml index bfcdcb058d2..065f33b1bbf 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 = "next" } -aws-sdk-cloudwatch = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml b/rust_dev_preview/examples/cloudwatchlogs/Cargo.toml index 18e86dfc62b..a7dc47d395f 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/cognitoidentity/Cargo.toml b/rust_dev_preview/examples/cognitoidentity/Cargo.toml index 3b9a0c66fc1..7f9aa28fcfd 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 = "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 = [ +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 = [ "convert-chrono", ] } chrono = "0.4" diff --git a/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml b/rust_dev_preview/examples/cognitoidentityprovider/Cargo.toml index 91b52cc9f9e..81670f59ab0 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 = "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 = [ +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 = [ "convert-chrono", ] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/cognitosync/Cargo.toml b/rust_dev_preview/examples/cognitosync/Cargo.toml index 1bed3c346e0..54f896ee54a 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 = "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 = [ +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 = [ "convert-chrono", ] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/config/Cargo.toml b/rust_dev_preview/examples/config/Cargo.toml index a02f0d64d01..ef758bd8132 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 = "next" } -aws-sdk-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/custom-root-certificates/Cargo.toml b/rust_dev_preview/examples/custom-root-certificates/Cargo.toml index a961c5e711e..a0f2ef6df47 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 = "next" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } # bringing our own HTTPs so no need for the default features -aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } +aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main", 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 94ce4ec7a45..9b02c45c0ca 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 = "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 = [ +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 = [ "client-hyper", "rustls", "rt-tokio", ] } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ +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 = "next" } +aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } axum = "0.5.16" http = "0.2.5" futures = "0.3" diff --git a/rust_dev_preview/examples/ebs/Cargo.toml b/rust_dev_preview/examples/ebs/Cargo.toml index 2d511673e84..f50b6f771b5 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 = "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" } +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" } 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 f1e3575f66b..2638f56665e 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/ecr/Cargo.toml b/rust_dev_preview/examples/ecr/Cargo.toml index b39cf19ed24..2d243d9910f 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/ecs/Cargo.toml b/rust_dev_preview/examples/ecs/Cargo.toml index a0d4291f43a..fd2a59d8a98 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 = "next" } -aws-sdk-ecs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/eks/Cargo.toml b/rust_dev_preview/examples/eks/Cargo.toml index e0e9dc6d1e3..4233138e6c5 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/firehose/Cargo.toml b/rust_dev_preview/examples/firehose/Cargo.toml index 43eebf0acf8..8d079b104ee 100644 --- a/rust_dev_preview/examples/firehose/Cargo.toml +++ b/rust_dev_preview/examples/firehose/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 = "next" } -aws-sdk-firehose = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/globalaccelerator/Cargo.toml b/rust_dev_preview/examples/globalaccelerator/Cargo.toml index 7f8dd7a01c1..466b24f46c5 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 = "next" } -aws-sdk-globalaccelerator = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } tokio-stream = "0.1.8" clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/glue/Cargo.toml b/rust_dev_preview/examples/glue/Cargo.toml index cc746495b4d..fd428e1d7d5 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 = "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 = [ +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 = [ "client-hyper", "rustls", "rt-tokio", ] } -aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ +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 = "next" } -aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } 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 99fbd085b9b..c5124fb8423 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 = "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" } +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" } tokio = { version = "1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.5", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/iam/Cargo.toml b/rust_dev_preview/examples/iam/Cargo.toml index 1ae201bd600..f09cb1578de 100644 --- a/rust_dev_preview/examples/iam/Cargo.toml +++ b/rust_dev_preview/examples/iam/Cargo.toml @@ -17,11 +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 = "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" } +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-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" } sdk-examples-test-utils = { path = "../../test-utils" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/iot/Cargo.toml b/rust_dev_preview/examples/iot/Cargo.toml index bfb822f2bc4..ed01927bad6 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/kinesis/Cargo.toml b/rust_dev_preview/examples/kinesis/Cargo.toml index 58c0b5b9007..8b8e37916b8 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 = "next" } -aws-sdk-kinesis = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/kms/Cargo.toml b/rust_dev_preview/examples/kms/Cargo.toml index 74717fdc895..77311c7eb41 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 = "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 = [ +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 = [ "client-hyper", "rustls", "rt-tokio", diff --git a/rust_dev_preview/examples/lambda/Cargo.toml b/rust_dev_preview/examples/lambda/Cargo.toml index 654cce1517b..299f0f3fb8c 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 = "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" } +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" } clap = { version = "~4.2", 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 89d6895933e..3bbe80da8bd 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 = "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" } +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" } 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 b74c10122c7..5db71d6864c 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 = "next" } -aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } # 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 e5ff64e0393..96221a1bda4 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 = "next" } -aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } clap = { version = "~4.2", 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 d426fb0abc8..13ada0a1a29 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 = "next" } -aws-sdk-medialive = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/mediapackage/Cargo.toml b/rust_dev_preview/examples/mediapackage/Cargo.toml index e2b20a595ff..0197a9f0b7c 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 = "next" } -aws-sdk-mediapackage = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/polly/Cargo.toml b/rust_dev_preview/examples/polly/Cargo.toml index 47e9923a230..ebee988d9ef 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 = "next" } -aws-sdk-polly = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } bytes = "1" clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/qldb/Cargo.toml b/rust_dev_preview/examples/qldb/Cargo.toml index eec1e220767..a5a81190627 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } tokio-stream = { version = "0.1.9", features = ["default"] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/rds/Cargo.toml b/rust_dev_preview/examples/rds/Cargo.toml index eb9673d580a..a805e34b5de 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 = "next" } -aws-sdk-rds = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/rdsdata/Cargo.toml b/rust_dev_preview/examples/rdsdata/Cargo.toml index 42fede9ceea..c6041ac9a01 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 = "next" } -aws-sdk-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/route53/Cargo.toml b/rust_dev_preview/examples/route53/Cargo.toml index bd1e4354712..a9df7313c23 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 = "next" } -aws-sdk-route53 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/rust-toolchain.toml b/rust_dev_preview/examples/rust-toolchain.toml index 41755a2bed6..d9289af0602 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.69.0" +channel = "1.70.0" diff --git a/rust_dev_preview/examples/s3/Cargo.toml b/rust_dev_preview/examples/s3/Cargo.toml index c15aab14f48..336894dc954 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 = "next" } +aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } # snippet-start:[s3.rust.s3-object-lambda-cargo.toml] -aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } # snippet-end:[s3.rust.s3-object-lambda-cargo.toml] -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 = [ +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 = [ "test-util", ] } -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" } +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" } 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/sagemaker/Cargo.toml b/rust_dev_preview/examples/sagemaker/Cargo.toml index a4f67959b1b..c1bbbbe079c 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 = "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 = [ +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 = [ "convert-chrono", ] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/sdk-config/Cargo.toml b/rust_dev_preview/examples/sdk-config/Cargo.toml index 9f9901b72b3..68f115ba094 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 = "next" } -aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/secretsmanager/Cargo.toml b/rust_dev_preview/examples/secretsmanager/Cargo.toml index 0a99c81805a..09168bba1ed 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 = "next" } -aws-sdk-secretsmanager = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml index 1f013781a88..3e0f1b239c2 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 = "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" } +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" } 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 71af726db33..c4278a7197f 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 = "next" } -aws-sdk-sesv2 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/sitewise/Cargo.toml b/rust_dev_preview/examples/sitewise/Cargo.toml index c5f2cbc48dc..0bfa3d88735 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 = "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 = [ +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 = [ "convert-chrono", ] } clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/snowball/Cargo.toml b/rust_dev_preview/examples/snowball/Cargo.toml index 9ced58e12f7..0646f658b70 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 = "next" } -aws-sdk-snowball = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/sns/Cargo.toml b/rust_dev_preview/examples/sns/Cargo.toml index 12f3ef05fb2..2633b6aec7c 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 = "next" } -aws-sdk-sns = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/sqs/Cargo.toml b/rust_dev_preview/examples/sqs/Cargo.toml index b89cad6e580..c7ff7f3cafb 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 = "next" } -aws-sdk-sqs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/ssm/Cargo.toml b/rust_dev_preview/examples/ssm/Cargo.toml index 41d13d31cab..0703410cb0f 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 = "next" } -aws-sdk-ssm = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/stepfunction/Cargo.toml b/rust_dev_preview/examples/stepfunction/Cargo.toml index 73d59a27ec2..fc843848b57 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 = "next" } -aws-sdk-sfn = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/sts/Cargo.toml b/rust_dev_preview/examples/sts/Cargo.toml index 4905d26a212..481b43133d5 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 = "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" } +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" } tokio = { version = "1.20.1", features = ["full"] } clap = { version = "~4.2", features = ["derive"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/rust_dev_preview/examples/testing/Cargo.toml b/rust_dev_preview/examples/testing/Cargo.toml index 4cc5e3ae78e..4aae2da4c8d 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 = "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 = [ +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 = [ "test-util", ] } -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 = [ +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 = [ "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 225f4a7618b..c99001060e6 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 = "next" } -aws-sdk-textract = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } 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 1600814f87c..4e310fbc883 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 = "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 } +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 } webpki-roots = "0.22.4" tokio = { version = "1.20.1", features = ["full"] } rustls = "0.20.6" diff --git a/rust_dev_preview/examples/transcribestreaming/Cargo.toml b/rust_dev_preview/examples/transcribestreaming/Cargo.toml index 8d5b8358626..9a2a2e7018d 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 = "next" } -aws-sdk-transcribestreaming = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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" } 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 d47f1eebb20..193cfd73c01 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 = "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" } +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" } lambda_runtime = "0.8.0" clap = { version = "~4.2", 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 25b0e0ddfe8..6009ab2d6df 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 = "next" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ +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 = [ "test-util", ] } -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-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } +aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main"} http = "0.2" [lib] diff --git a/rust_dev_preview/tools/requirements.txt b/rust_dev_preview/tools/requirements.txt new file mode 100644 index 00000000000..7715f2b8f14 --- /dev/null +++ b/rust_dev_preview/tools/requirements.txt @@ -0,0 +1 @@ +tomlkit==0.12.1 diff --git a/rust_dev_preview/tools/set_rust_version.py b/rust_dev_preview/tools/set_rust_version.py new file mode 100755 index 00000000000..479fa4960c3 --- /dev/null +++ b/rust_dev_preview/tools/set_rust_version.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 + +try: + import tomlkit +except: + print("Couldn't import tomlkit, either install it directly or instantiate a venv.") + exit(1) + +from glob import glob +import argparse +import logging +import pathlib + + +def read_toml(path: pathlib.Path) -> tomlkit.TOMLDocument: + with open(path, "rt") as file: + return tomlkit.parse(file.read()) + + +def write_toml(path: pathlib.Path, toml: tomlkit.TOMLDocument): + with open(path, "wt") as file: + tomlkit.dump(toml, file) + + +def update_toolchains(root: pathlib.Path, channel: str, dry_run: bool): + for file in glob(f"{root}/rust_dev_preview/**/rust-toolchain.toml", recursive=True): + toolchain_toml = read_toml(file) + logging.debug( + f"Setting {file} to {channel} from {toolchain_toml['toolchain']['channel']}" + ) + toolchain_toml["toolchain"]["channel"] = channel + if not dry_run: + write_toml(file, toolchain_toml) + + +def update_actions(root: pathlib.Path, channel: str, dry_run: bool): + rust_yaml = root / ".github" / "workflows" / "rust.yml" + with open(rust_yaml, "rt") as file: + action = file.readlines() + found = None + for i, line in enumerate(action): + if "toolchain:" in line: + sep = line.find(":") + found = i, line[sep + 2 :] + action[i] = f'{line[: sep + 1]} "{channel}"\n' + if found == None: + raise Exception(f"Did not find toolchain entry in {rust_yaml}") + logging.debug(f"Setting {rust_yaml} to {channel} from {found}") + if not dry_run: + with open(rust_yaml, "wt") as file: + file.writelines(action) + + +argument_parser = argparse.ArgumentParser() +argument_parser.add_argument( + "--root", + type=pathlib.Path, + default=pathlib.Path(__file__).absolute().parent.parent.parent, + help="Root path for aws-doc-sdk-examples. Default ../../ assumes running this script from its location in tools.", +) +argument_parser.add_argument( + "channel", help="Toolchain channel to use for Rust code examples." +) +argument_parser.add_argument( + "--dry-run", + dest="dry_run", + action="store_true", + default=False, + help="Don't write updated files.", +) +argument_parser.add_argument( + "--verbose", action="store_true", default=False, help="Write verbose logging" +) + + +def main(): + args = argument_parser.parse_args() + if args.verbose: + logging.basicConfig(level=logging.DEBUG) + update_toolchains(args.root, args.channel, args.dry_run) + update_actions(args.root, args.channel, args.dry_run) + + +if __name__ == "__main__": + main() diff --git a/rust_dev_preview/tools/toggle_sdk_branch.py b/rust_dev_preview/tools/toggle_sdk_branch.py new file mode 100755 index 00000000000..9614239ab57 --- /dev/null +++ b/rust_dev_preview/tools/toggle_sdk_branch.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 + +try: + from tomlkit import dumps, parse, TOMLDocument +except: + print("Couldn't import tomlkit, either install it directly or instantiate a venv.") + exit(1) + +from argparse import ArgumentParser +from glob import glob +from typing import Union +import logging + +SDK_ORIGIN = "https://github.com/awslabs/aws-sdk-rust" + + +def list_cargos(pathname: str): + for file in glob(f"{pathname}/**/Cargo.toml", recursive=True): + yield file + + +def read_cargo(pathname: str) -> TOMLDocument: + with open(pathname, "+rt") as cargo: + return parse(cargo.read()) + + +def write_cargo(pathname: str, cargo: TOMLDocument) -> None: + with open(pathname, "+wt") as file: + file.write(dumps(cargo)) + + +def update_sdk_dependencies(cargo: TOMLDocument, branch: Union["main", "next"]) -> None: + dependencies = cargo.get("dependencies", []) + for name in dependencies: + if isinstance(name, str): + dependency = dependencies[name] + if ( + not isinstance(dependency, str) + and dependency.get("git", None) == SDK_ORIGIN + and dependency.get("branch", None) is not None + ): + logging.debug( + f"Found SDK crate {name} currently on {dependency['branch']}" + ) + dependency["branch"] = branch + + +def update_cargo(pathname: str, branch: Union["main", "next"], dry_run=False): + logging.debug(f"Found Cargo.toml at {pathname}") + cargo = read_cargo(pathname) + update_sdk_dependencies(cargo, branch) + if not dry_run: + logging.debug(f"Writing new content to {pathname}") + write_cargo(pathname, cargo) + + +arg_parser = ArgumentParser() +arg_parser.add_argument( + "--root", + default="../", + help="Root path for rust_dev_preview cargos. Default ../ assumes running this script from its location in tools. Update single examples by setting root to their folder directly.", +) +arg_parser.add_argument( + "--branch", default="main", choices=["main", "next"], help="Branch to use" +) +arg_parser.add_argument( + "--dry-run", + dest="dry_run", + action="store_true", + default=False, + help="Don't write updated Cargo files.", +) +arg_parser.add_argument( + "--verbose", action="store_true", default=False, help="Write verbose logging" +) + + +def main(): + args = arg_parser.parse_args() + if args.verbose: + logging.basicConfig(level=logging.DEBUG) + for f in list_cargos(args.root): + update_cargo(f, args.branch, dry_run=args.dry_run) + + +if __name__ == "__main__": + main() diff --git a/rust_dev_preview/webassembly/Cargo.toml b/rust_dev_preview/webassembly/Cargo.toml index 823f0744c69..ddc827cef9c 100644 --- a/rust_dev_preview/webassembly/Cargo.toml +++ b/rust_dev_preview/webassembly/Cargo.toml @@ -10,13 +10,13 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -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" } -aws-smithy-async = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } +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-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-smithy-async = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "main" } async-trait = "0.1.63" console_error_panic_hook = "0.1.7" http = "0.2.8"