Merge branch 'main' into properties-debug

smithy-lang · Apr 24, 2023 · 1b45b80 · 1b45b80
2 parents 072f5be + 2ebbfad
commit 1b45b80
Show file tree

Hide file tree

Showing 43 changed files with 831 additions and 232 deletions.
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -111,6 +111,9 @@ jobs:
   semver-checks:
     name: check the semver status of this PR
     runs-on: smithy_ubuntu-latest_8-core
+    needs:
+    - save-docker-login-token
+    - acquire-base-image
     steps:
     - uses: actions/checkout@v3
       with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ on:
         required: false
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.67.1
   rust_toolchain_components: clippy,rustfmt
   ENCRYPTED_DOCKER_PASSWORD: ${{ secrets.ENCRYPTED_DOCKER_PASSWORD }}
   DOCKER_LOGIN_TOKEN_PASSPHRASE: ${{ secrets.DOCKER_LOGIN_TOKEN_PASSPHRASE }}

diff --git a/.github/workflows/claim-crate-names.yml b/.github/workflows/claim-crate-names.yml
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.67.1
 
 name: Claim unpublished crate names on crates.io
 run-name: ${{ github.workflow }}

diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -1,18 +1,15 @@
 on:
   workflow_dispatch:
-    inputs:
-      opt-in-to-sparse-registry:
-        description: Enable/disable CARGO_UNSTABLE_SPARSE_REGISTRY (https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html)
-        required: true
-        type: boolean
-        default: false
   push:
     branches: [main]
     paths:
     - design/**
 
 name: Update GitHub Pages
 
+env:
+  rust_version: 1.67.1
+
 # Allow only one doc pages build to run at a time for the entire smithy-rs repo
 concurrency:
   group: github-pages-yml
@@ -26,11 +23,12 @@ jobs:
       uses: actions/checkout@v3
       with:
         persist-credentials: false
-    - uses: dtolnay/rust-toolchain@stable
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ env.rust_version }}
     - name: Generate docs
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        CARGO_UNSTABLE_SPARSE_REGISTRY: ${{ inputs.opt-in-to-sparse-registry }}
       run: |
         git config --local user.name "AWS SDK Rust Bot"
         git config --local user.email "[email protected]"

diff --git a/.github/workflows/pull-request-bot.yml b/.github/workflows/pull-request-bot.yml
@@ -28,7 +28,7 @@ concurrency:
 
 env:
   java_version: 11
-  rust_version: 1.66.1
+  rust_version: 1.67.1
   rust_toolchain_components: clippy,rustfmt
   apt_dependencies: libssl-dev gnuplot jq
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.67.1
 
 name: Release smithy-rs
 run-name: ${{ github.workflow }} ${{ inputs.semantic_version }} (${{ inputs.commit_sha }}) - ${{ inputs.dry_run && 'Dry run' || 'Production run' }}

diff --git a/.github/workflows/update-sdk-next.yml b/.github/workflows/update-sdk-next.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Set up Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.66.1
+        toolchain: 1.67.1
     - name: Delete old SDK
       run: |
     - name: Generate a fresh SDK

diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml
@@ -11,14 +11,29 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
+[[smithy-rs]]
+message = """
+Implement layer for servers to handle [ALB health checks](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/target-group-health-checks.html).
+Take a look at `aws_smithy_http_server::plugin::alb_health_check` to learn about it.
+"""
+references = ["smithy-rs#2540"]
+meta = { "breaking" = false, "tada" = true, "bug" = false, "target" = "server" }
+author = "jjant"
+
+[[smithy-rs]]
+message = "Implement `PluginPipeline::http_layer` which allows you to apply a `tower::Layer` to all operations."
+references = ["smithy-rs#2540"]
+meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "server" }
+author = "jjant"
+
 [[aws-sdk-rust]]
-message = "Implement std::error::Error#source() properly for the service meta Error enum"
+message = "Implement std::error::Error#source() properly for the service meta Error enum."
 references = ["aws-sdk-rust#784"]
 meta = { "breaking" = false, "tada" = false, "bug" = false }
 author = "abusch"
 
 [[smithy-rs]]
-message = "Implement std::error::Error#source() properly for the service meta Error enum"
+message = "Implement std::error::Error#source() properly for the service meta Error enum."
 references = ["aws-sdk-rust#784"]
 meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }
 author = "abusch"
@@ -145,8 +160,20 @@ author = "rcoh"
 references = ["smithy-rs#2603"]
 meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }
 
+[[aws-sdk-rust]]
+message = "Update MSRV to Rust 1.67.1"
+references = ["smithy-rs#2611"]
+meta = { "breaking" = true, "tada" = false, "bug" = false }
+author = "jdisanti"
+
+[[smithy-rs]]
+message = "Update MSRV to Rust 1.67.1"
+references = ["smithy-rs#2611"]
+meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "all"}
+author = "jdisanti"
+
 [[smithy-rs]]
 message = "The Debug implementation for PropertyBag now prints a list of the types it contains. This significantly improves debuggability."
 author = "rcoh"
 references = ["smithy-rs#2612"]
-meta = { "breaking" = false, "tada" = false, "bug" = false }
+meta = { "breaking" = false, "tada" = false, "bug" = false }
diff --git a/aws/rust-runtime/aws-config/src/profile/parser/normalize.rs b/aws/rust-runtime/aws-config/src/profile/parser/normalize.rs
@@ -113,7 +113,7 @@ pub(super) fn merge_in(
     }
 }
 
-fn merge_into_base<'a>(target: &mut Profile, profile: HashMap<&str, Cow<'a, str>>) {
+fn merge_into_base(target: &mut Profile, profile: HashMap<&str, Cow<'_, str>>) {
     for (k, v) in profile {
         match validate_identifier(k) {
             Ok(k) => {

diff --git a/aws/rust-runtime/aws-credential-types/Cargo.toml b/aws/rust-runtime/aws-credential-types/Cargo.toml
@@ -28,6 +28,9 @@ env_logger = "0.9.0"
 
 tokio = { version = "1.23.1", features = ["full", "test-util", "rt"] }
 tracing-test = "0.2.1"
+# TODO(https://github.com/awslabs/smithy-rs/issues/2619): Remove this
+# workaround once the fixed is upstreamed.
+regex = { version = "1.0", features = ["unicode-case", "unicode-perl"] }
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/aws/sdk/integration-tests/dynamodb/tests/endpoints.rs b/aws/sdk/integration-tests/dynamodb/tests/endpoints.rs
@@ -7,7 +7,6 @@ use aws_sdk_dynamodb::config::{self, Credentials, Region};
 use aws_types::SdkConfig;
 use http::Uri;
 
-#[track_caller]
 async fn expect_uri(
     conf: SdkConfig,
     uri: &'static str,

diff --git a/aws/sra-test/integration-tests/aws-sdk-s3/Cargo.toml b/aws/sra-test/integration-tests/aws-sdk-s3/Cargo.toml
@@ -6,20 +6,28 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-credential-types = { path = "../../../sdk/build/aws-sdk/sdk/aws-credential-types", features = ["test-util"] }
-aws-http = { path = "../../../sdk/build/aws-sdk/sdk/aws-http" }
-aws-runtime = { path = "../../../sdk/build/aws-sdk/sdk/aws-runtime" }
-aws-sdk-s3 = { path = "../../../sdk/build/aws-sdk/sdk/s3/", features = ["test-util"] }
-aws-sigv4 = { path = "../../../sdk/build/aws-sdk/sdk/aws-sigv4" }
-aws-types = { path = "../../../sdk/build/aws-sdk/sdk/aws-types" }
-aws-smithy-async = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-async", features = ["rt-tokio"] }
-aws-smithy-client = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-client", features = ["test-util"] }
-aws-smithy-types = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-types" }
-aws-smithy-http = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-http" }
-aws-smithy-runtime = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-runtime", features = ["test-util"] }
-aws-smithy-runtime-api = { path = "../../../sdk/build/aws-sdk/sdk/aws-smithy-runtime-api" }
+aws-credential-types = { path = "../../../rust-runtime/aws-credential-types", features = ["test-util"] }
+aws-http = { path = "../../../rust-runtime/aws-http" }
+aws-runtime = { path = "../../../rust-runtime/aws-runtime" }
+aws-sdk-s3 = { path = "../../build/sdk/aws-sdk-s3", features = ["test-util"] }
+aws-sigv4 = { path = "../../../rust-runtime/aws-sigv4" }
+aws-types = { path = "../../../rust-runtime/aws-types" }
+aws-smithy-async = { path = "../../../../rust-runtime/aws-smithy-async", features = ["rt-tokio"] }
+aws-smithy-client = { path = "../../../../rust-runtime/aws-smithy-client", features = ["test-util"] }
+aws-smithy-types = { path = "../../../../rust-runtime/aws-smithy-types" }
+aws-smithy-http = { path = "../../../../rust-runtime/aws-smithy-http" }
+aws-smithy-runtime = { path = "../../../../rust-runtime/aws-smithy-runtime", features = ["test-util"] }
+aws-smithy-runtime-api = { path = "../../../../rust-runtime/aws-smithy-runtime-api" }
+criterion = { version = "0.4", features = ["async_tokio"] }
 tokio = { version = "1.23.1", features = ["macros", "test-util", "rt-multi-thread"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter", "json"] }
 http = "0.2.3"
 http-body = "0.4.5"
+
+[profile.release]
+debug = 1
+
+[[bench]]
+name = "middleware_vs_orchestrator"
+harness = false