Unverified Commit 3ad93c85 authored by AWS SDK Rust Bot's avatar AWS SDK Rust Bot Committed by GitHub
Browse files

Merge main into 0.57 (#3132)

parents 20a89c21 722c141f

.github/workflows/pull-request-bot.yml

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ concurrency: 


env:

  java_version: 11

  rust_version: 1.70.0

  rust_toolchain_components: clippy,rustfmt

  apt_dependencies: libssl-dev gnuplot jq

jobs:
@@ -99,7 +98,7 @@ jobs: 
        java-version: ${{ env.java_version }}

    - uses: dtolnay/rust-toolchain@master

      with:

        toolchain: ${{ env.rust_version }}

        toolchain: nightly

    - name: Generate doc preview

      id: generate-preview

      # Only generate three of the smallest services since the doc build can be very large. STS and SSO must be
@@ -119,7 +118,8 @@ jobs: 
        # Add server runtime crates to the workspace

        sed -i 's/"sdk\/sts",/"sdk\/sts","sdk\/aws-smithy-http-server","sdk\/aws-smithy-http-server-python","sdk\/aws-smithy-http-server-typescript",/' Cargo.toml



        cargo doc --no-deps --all-features

        RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features --no-deps



        popd

        ./tools/ci-scripts/generate-doc-preview-index.sh ${{ inputs.base_revision }}

CHANGELOG.next.toml

+7 −1
Original line number Diff line number Diff line
@@ -10,3 +10,9 @@ 
# references = ["smithy-rs#920"]

# meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}

# author = "rcoh"



[[smithy-rs]]

message = "Upgrade `ring` to 0.17.5."

references = ["smithy-rs#3112", "smithy-rs#3116"]

meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }

author = "jdisanti"

aws/rust-runtime/aws-config/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ http = "0.2.4" 


# implementation detail of SSO credential caching

aws-sdk-sso = { path = "../../sdk/build/aws-sdk/sdk/sso", default-features = false, optional = true }

ring = { version = "0.16", optional = true }

ring = { version = "0.17.5", optional = true }

hex = { version = "0.4.3", optional = true }

zeroize = { version = "1", optional = true }

aws/rust-runtime/aws-inlineable/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ bytes = "1" 
hex = "0.4.3"

http = "0.2.9"

http-body = "0.4.5"

ring = "0.16"

ring = "0.17.5"

tokio = "1.23.1"

tracing = "0.1"

aws/rust-runtime/aws-sigv4/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ once_cell = "1.8" 
p256 = { version = "0.11", features = ["ecdsa"], optional = true }

percent-encoding = { version = "2.1", optional = true }

regex = "1.5"

ring = { version = "0.16", optional = true }

ring = { version = "0.17.5", optional = true }

sha2 = "0.10"

time = "0.3.5"

tracing = "0.1"
@@ -52,7 +52,7 @@ serde_json = "1.0.104" 
time = { version = "0.3.5", features = ["parsing"] }



[target.'cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))'.dev-dependencies]

ring = "0.16"

ring = "0.17.5"



[[bench]]

name = "hmac"