Merge remote-tracking branch 'origin/main' into atodd/fix-url-overrides

.github/workflows/ci.yml

@@ -65,6 +65,9 @@ jobs:
  with:
  path: smithy-rs
  ref: ${{ inputs.git_ref }}
+ # `generate-smithy-rs-release` requires access to previous tags to determine if a numerical suffix is needed
+ # to make the release tag unique
+ fetch-depth: 0
  # The models from aws-sdk-rust are needed to generate the full SDK for CI
  - uses: actions/checkout@v4
  with:

.github/workflows/release-scripts/create-release.js

@@ -10,7 +10,7 @@ const assert = require("assert");
 const fs = require("fs");
 
 const smithy_rs_repo = {
- owner: "awslabs",
+ owner: "smithy-lang",
  repo: "smithy-rs",
 };
 

.github/workflows/release.yml

@@ -181,12 +181,18 @@ jobs:
  ref: ${{ inputs.commit_sha }}
  path: smithy-rs
  token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
+ fetch-depth: 0
  - name: Generate release artifacts
  uses: ./smithy-rs/.github/actions/docker-build
  with:
  action: generate-smithy-rs-release
  - name: Download all artifacts
  uses: ./smithy-rs/.github/actions/download-all-artifacts
+ # This step is not idempotent, as it pushes release artifacts to the `smithy-rs-release-1.x.y` branch. However,
+ # if this step succeeds but a subsequent step fails, retrying the release workflow is "safe" in that it does not
+ # create any inconsistent states; this step would simply fail because the release branch would be ahead of `main`
+ # due to previously pushed artifacts.
+ # To successfully retry a release, revert the commits in the release branch that pushed the artifacts.
  - name: Push smithy-rs changes
  shell: bash
  working-directory: smithy-rs-release/smithy-rs
@@ -202,7 +208,7 @@ jobs:
  # to retry a release action execution that failed due to a transient issue.
  # In that case, we expect the commit to be releasable as-is, i.e. the changelog should have already
  # been processed.
- git fetch --unshallow
+ git fetch
  if [[ "${DRY_RUN}" == "true" ]]; then
  # During dry-runs, "git push" without "--force" can fail if smithy-rs-release-x.y.z-preview is behind
  # smithy-rs-release-x.y.z, but that does not matter much during dry-runs.
@@ -214,18 +220,7 @@ jobs:
  fi
  fi
  echo "commit_sha=$(git rev-parse HEAD)" > $GITHUB_OUTPUT
- - name: Tag release
- uses: actions/github-script@v7
- with:
- github-token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
- script: |
- const createReleaseScript = require("./smithy-rs/.github/workflows/release-scripts/create-release.js");
- await createReleaseScript({
- github,
- isDryRun: ${{ inputs.dry_run }},
- releaseManifestPath: "smithy-rs-release/smithy-rs-release-manifest.json",
- releaseCommitish: "${{ steps.push-changelog.outputs.commit_sha }}"
- });
+ # This step is idempotent; the `publisher` will not publish a crate if the version is already published on crates.io.
  - name: Publish to crates.io
  shell: bash
  working-directory: smithy-rs-release/crates-to-publish
@@ -247,7 +242,23 @@ jobs:
  else
  publisher publish -y --location .
  fi
+ # This step is not idempotent and MUST be performed last, as it will generate a new release in the `smithy-rs`
+ # repository with the release tag that is always unique and has an increasing numerical suffix.
+ - name: Tag release
+ uses: actions/github-script@v7
+ with:
+ github-token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
+ script: |
+ const createReleaseScript = require("./smithy-rs/.github/workflows/release-scripts/create-release.js");
+ await createReleaseScript({
+ github,
+ isDryRun: ${{ inputs.dry_run }},
+ releaseManifestPath: "smithy-rs-release/smithy-rs-release-manifest.json",
+ releaseCommitish: "${{ steps.push-changelog.outputs.commit_sha }}"
+ });
 
+ # If this step fails for any reason, there's no need to retry the release workflow, as this step is auxiliary
+ # and the release itself was successful. Instead, manually trigger `backport-pull-request.yml`.
  open-backport-pull-request:
  name: Open backport pull request to merge the release branch back to main
  needs:

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

@@ -18,6 +18,7 @@ http_1x = ["dep:http-1x", "dep:http-body-1x", "aws-smithy-runtime-api/http-1x"]
 aws-credential-types = { path = "../aws-credential-types" }
 aws-runtime = { path = "../aws-runtime", features = ["http-02x"] }
 aws-sigv4 = { path = "../aws-sigv4" }
+aws-types = { path = "../aws-types" }
 aws-smithy-async = { path = "../../../rust-runtime/aws-smithy-async", features = ["rt-tokio"] }
 aws-smithy-checksums = { path = "../../../rust-runtime/aws-smithy-checksums" }
 aws-smithy-http = { path = "../../../rust-runtime/aws-smithy-http" }
@@ -37,8 +38,10 @@ ring = "0.17.5"
 sha2 = "0.10"
 tokio = "1.23.1"
 tracing = "0.1"
+url = "2.5.2"
 
 [dev-dependencies]
+aws-credential-types = { path = "../aws-credential-types", features = ["test-util"] }
 aws-smithy-async = { path = "../../../rust-runtime/aws-smithy-async", features = ["test-util"] }
 aws-smithy-http = { path = "../../../rust-runtime/aws-smithy-http", features = ["rt-tokio"] }
 aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["test-util"] }

aws/rust-runtime/aws-inlineable/external-types.toml

@@ -1,5 +1,6 @@
 allowed_external_types = [
- "aws_credential_types::provider::credentials::ProvideCredentials",
+ "aws_types::*",
+ "aws_credential_types::*",
  "aws_smithy_http::*",
  "aws_smithy_runtime_api::*",
 

aws/rust-runtime/aws-inlineable/src/lib.rs

@@ -65,3 +65,5 @@ pub mod s3_expires_interceptor;
 /// allow docs to work
 #[derive(Debug)]
 pub struct Client;
+
+pub mod rds_auth_token;