Merge remote-tracking branch 'upstream/main'

Author: hugobast

.github/workflows/release.yml

@@ -23,13 +23,38 @@ on:
         default: true
 
 jobs:
+  # If a release is kicked off before an image is built after push to main,
+  # or if a dry-run release is kicked off against a non-main branch to test
+  # automation changes, we'll need to build a base image to work against.
+  # This job will be a no-op if an image was already built on main.
+  acquire-base-image:
+    name: Acquire Base Image
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        path: smithy-rs
+        fetch-depth: 0
+    - name: Acquire base image
+      id: acquire
+      run: ./smithy-rs/tools/ci-build/acquire-build-image
+    - name: Upload base image
+      uses: actions/upload-artifact@v3
+      with:
+        name: smithy-rs-base-image
+        path: smithy-rs-base-image
+        retention-days: 1
+
   release-ci:
     name: Prerelease checks
+    needs:
+    - acquire-base-image
     uses: ./.github/workflows/ci.yml
 
   release:
     name: Release
     needs:
+    - acquire-base-image
     - release-ci
     runs-on: ubuntu-latest
     steps:

CHANGELOG.next.toml

@@ -11,6 +11,18 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false }
 # author = "rcoh"
 
+[[smithy-rs]]
+message = "Add checksum calculation and validation wrappers for HTTP bodies."
+references = ["smithy-rs#1263"]
+meta = { "breaking" = false, "tada" = false, "bug" = false }
+author = "Velfi"
+
+[[smithy-rs]]
+message = "`aws_smithy_http::header::append_merge_header_maps`, a function for merging two `HeaderMap`s, is now public."
+references = ["smithy-rs#1263"]
+meta = { "breaking" = false, "tada" = false, "bug" = false }
+author = "Velfi"
+
 [[aws-sdk-rust]]
 message = """
 Fix compilation of `aws-config` with `rustls` and `native-tls` disabled. The
@@ -37,6 +49,12 @@ references = ["smithy-rs#1457"]
 meta = { "breaking" = false, "tada" = true, "bug" = false }
 author = "calavera"
 
+[[aws-sdk-rust]]
+message = "Add `From<aws_smithy_client::erase::DynConnector>` impl for `aws_smithy_client::http_connector::HttpConnector`"
+references = ["aws-sdk-rust#581"]
+meta = { "breaking" = false, "tada" = true, "bug" = false }
+author = "Velfi"
+
 [[smithy-rs]]
 message = """
 Updated the smithy client's retry behavior to allow for a configurable initial backoff. Previously, the initial backoff
@@ -86,3 +104,15 @@ async fn main() -> Result<(), aws_sdk_dynamodb::Error> {
 references = ["aws-sdk-rust#567"]
 meta = { "breaking" = false, "tada" = true, "bug" = false }
 author = "Velfi"
+
+[[aws-sdk-rust]]
+message = """
+Until now, SDK crates have all shared the exact same version numbers.
+This changes with this release. From now on, SDK crates will only version
+bump if they have changes. Coincidentally, they may share the same version
+number for some releases since changes to the code generator will cause
+a version bump in all of them, but this should not be relied upon.
+"""
+references = ["smithy-rs#1540"]
+meta = { "breaking" = false, "tada" = false, "bug" = false }
+author = "jdisanti"

aws/SDK_README.md.hb

@@ -3,7 +3,7 @@ This is the README Handlebars template for `aws-sdk-rust`.
 It gets instantiated and copied into the build artifacts by the `aws:sdk:assemble` build target.
 
 Available template arguments:
-- `{{sdk_version}}`: the SDK version number (just the number, no `v` prefix)
+- `{{sdk_version_<crate_name_in_snake_case>}}` (e.g., `{{sdk_version_aws_config}}` for the `aws-config` crate): the version number of the given crate (just the number, no `v` prefix)
 - `{{msrv}}`: The MSRV Rust compiler version (just the number, no `v` prefix)
 --}}
 <!--
@@ -12,17 +12,17 @@ This README file is auto-generated by the build system in awslabs/smithy-rs.
 To update it, edit the `aws/SDK_README.md.hb` Handlebars template in that repository.
 -->
 
-# The AWS SDK for Rust [![Docs](https://img.shields.io/badge/docs-v{{sdk_version}}-blue)](https://awslabs.github.io/aws-sdk-rust/) ![MSRV](https://img.shields.io/badge/msrv-{{msrv}}-red) [![Usage Guide](https://img.shields.io/badge/Developer_Guide-blue)](https://docs.aws.amazon.com/sdk-for-rust/latest/dg/welcome.html)
+# The AWS SDK for Rust [![Docs](https://img.shields.io/badge/docs-blue)](https://awslabs.github.io/aws-sdk-rust/) ![MSRV](https://img.shields.io/badge/msrv-{{msrv}}-red) [![Usage Guide](https://img.shields.io/badge/Developer_Guide-blue)](https://docs.aws.amazon.com/sdk-for-rust/latest/dg/welcome.html)
 
-This repo contains the new AWS SDK for Rust (the SDK) and its [public roadmap](https://github.com/awslabs/aws-sdk-rust/projects/1).
+This repo contains the new AWS SDK for Rust (the SDK) and its [public roadmap](https://github.com/orgs/awslabs/projects/50/views/1).
 
 **Please Note: The SDK is currently released as a developer preview and is intended strictly for feedback purposes only. Do not use this SDK for production workloads.**
 
 The SDK is code generated from [Smithy models](https://awslabs.github.io/smithy/) that represent each AWS service. The code used to generate the SDK can be found in [smithy-rs](https://github.com/awslabs/smithy-rs).
 
 ## Getting Started with the SDK
 
-> Examples are availble for many services and operations, check out the [examples folder](./examples).
+> Examples are available for many services and operations, check out the [examples folder](./examples).
 
 > For a step-by-step guide including several advanced use cases, check out the [Developer Guide](https://docs.aws.amazon.com/sdk-for-rust/latest/dg/welcome.html).
 
@@ -33,8 +33,8 @@ The SDK provides one crate per AWS service. You must add [Tokio](https://crates.
 
     ```toml
     [dependencies]
-    aws-config = "{{sdk_version}}"
-    aws-sdk-dynamodb = "{{sdk_version}}"
+    aws-config = "{{sdk_version_aws_config}}"
+    aws-sdk-dynamodb = "{{sdk_version_aws_sdk_dynamodb}}"
     tokio = { version = "1", features = ["full"] }
     ```
 

aws/sdk-codegen/build.gradle.kts

@@ -31,13 +31,13 @@ dependencies {
     testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion")
 }
 
-val generateAwsSdkVersion by tasks.registering {
+val generateAwsRuntimeCrateVersion by tasks.registering {
     // generate the version of the runtime to use as a resource.
     // this keeps us from having to manually change version numbers in multiple places
     val resourcesDir = "$buildDir/resources/main/software/amazon/smithy/rustsdk"
     val versionFile = file("$resourcesDir/sdk-crate-version.txt")
     outputs.file(versionFile)
-    val crateVersion = project.properties["aws.sdk.version"]?.toString()!!
+    val crateVersion = project.properties["smithy.rs.runtime.crate.version"]?.toString()!!
     inputs.property("crateVersion", crateVersion)
     sourceSets.main.get().output.dir(resourcesDir)
     doLast {
@@ -47,7 +47,7 @@ val generateAwsSdkVersion by tasks.registering {
 
 tasks.compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
-    dependsOn(generateAwsSdkVersion)
+    dependsOn(generateAwsRuntimeCrateVersion)
 }
 
 tasks.compileTestKotlin {

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsReadmeDecorator.kt

@@ -35,6 +35,7 @@ class AwsReadmeDecorator : RustCodegenDecorator<ClientCodegenContext> {
         mapOf("package" to mapOf("readme" to "README.md"))
 
     override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {
+        val awsConfigVersion = SdkSettings.from(codegenContext.settings).awsConfigVersion
         rustCrate.withFile("README.md") { writer ->
             val description = normalizeDescription(
                 codegenContext.moduleName,
@@ -62,7 +63,7 @@ class AwsReadmeDecorator : RustCodegenDecorator<ClientCodegenContext> {
 
                     ```toml
                     [dependencies]
-                    aws-config = "${codegenContext.settings.moduleVersion}"
+                    aws-config = "$awsConfigVersion"
                     $moduleName = "${codegenContext.settings.moduleVersion}"
                     tokio = { version = "1", features = ["full"] }
                     ```

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/SdkSettings.kt

@@ -36,4 +36,9 @@ class SdkSettings private constructor(private val awsSdk: ObjectNode?) {
     /** Path to AWS SDK integration tests */
     val integrationTestPath: String get() =
         awsSdk?.getStringMember("integrationTestPath")?.orNull()?.value ?: "aws/sdk/integration-tests"
+
+    /** Version number of the `aws-config` crate */
+    val awsConfigVersion: String get() =
+        awsSdk?.getStringMember("awsConfigVersion")?.orNull()?.value
+            ?: throw IllegalStateException("missing `awsConfigVersion` codegen setting")
 }

aws/sdk/build.gradle.kts

@@ -55,7 +55,6 @@ val awsServices: AwsServices by lazy { discoverServices(properties.get("aws.sdk.
 val eventStreamAllowList: Set<String> by lazy { eventStreamAllowList() }
 val crateVersioner by lazy { aws.sdk.CrateVersioner.defaultFor(rootProject, properties) }
 
-fun getSdkVersion(): String = properties.get("aws.sdk.version") ?: throw Exception("SDK version missing")
 fun getRustMSRV(): String = properties.get("rust.msrv") ?: throw Exception("Rust MSRV missing")
 fun getPreviousReleaseVersionManifestPath(): String? = properties.get("aws.sdk.previous.release.versions.manifest")
 
@@ -73,8 +72,10 @@ fun eventStreamAllowList(): Set<String> {
 }
 
 fun generateSmithyBuild(services: AwsServices): String {
+    val awsConfigVersion = properties.get("smithy.rs.runtime.crate.version")
+        ?: throw IllegalStateException("missing smithy.rs.runtime.crate.version for aws-config version")
     val serviceProjections = services.services.map { service ->
-        val files = service.files().map { extraFile ->
+        val files = service.modelFiles().map { extraFile ->
             software.amazon.smithy.utils.StringUtils.escapeJavaString(
                 extraFile.absolutePath,
                 ""
@@ -99,14 +100,15 @@ fun generateSmithyBuild(services: AwsServices): String {
                         },
                         "service": "${service.service}",
                         "module": "$moduleName",
-                        "moduleVersion": "${crateVersioner.decideCrateVersion(moduleName)}",
+                        "moduleVersion": "${crateVersioner.decideCrateVersion(moduleName, service)}",
                         "moduleAuthors": ["AWS Rust SDK Team <[email protected]>", "Russell Cohen <[email protected]>"],
                         "moduleDescription": "${service.moduleDescription}",
                         ${service.examplesUri(project)?.let { """"examples": "$it",""" } ?: ""}
                         "moduleRepository": "https://github.com/awslabs/aws-sdk-rust",
                         "license": "Apache-2.0",
                         "customizationConfig": {
                             "awsSdk": {
+                                "awsConfigVersion": "$awsConfigVersion",
                                 "defaultConfigPath": "${services.defaultConfigPath}",
                                 "endpointsConfigPath": "${services.endpointsConfigPath}",
                                 "integrationTestPath": "${project.projectDir.resolve("integration-tests")}"
@@ -242,7 +244,7 @@ tasks.register("relocateAwsRuntime") {
         // Patch the Cargo.toml files
         CrateSet.AWS_SDK_RUNTIME.forEach { moduleName ->
             patchFile(sdkOutputDir.resolve("$moduleName/Cargo.toml")) { line ->
-                rewriteAwsSdkCrateVersion(properties, line.let(::rewritePathDependency))
+                rewriteRuntimeCrateVersion(properties, line.let(::rewritePathDependency))
             }
         }
     }
@@ -253,7 +255,7 @@ tasks.register("relocateRuntime") {
         // Patch the Cargo.toml files
         CrateSet.AWS_SDK_SMITHY_RUNTIME.forEach { moduleName ->
             patchFile(sdkOutputDir.resolve("$moduleName/Cargo.toml")) { line ->
-                rewriteSmithyRsCrateVersion(properties, line)
+                rewriteRuntimeCrateVersion(properties, line)
             }
         }
     }
@@ -312,15 +314,19 @@ tasks.register<ExecRustBuildTool>("fixManifests") {
 tasks.register<ExecRustBuildTool>("hydrateReadme") {
     description = "Run the publisher tool's `hydrate-readme` sub-command to create the final AWS Rust SDK README file"
 
+    dependsOn("generateVersionManifest")
+
     inputs.dir(publisherToolPath)
-    outputs.dir(outputDir)
+    inputs.file(rootProject.projectDir.resolve("aws/SDK_README.md.hb"))
+    outputs.file(outputDir.resolve("README.md").absolutePath)
 
     toolPath = publisherToolPath
     binaryName = "publisher"
     arguments = listOf(
         "hydrate-readme",
-        "--sdk-version", getSdkVersion(),
+        "--versions-manifest", outputDir.resolve("versions.toml").toString(),
         "--msrv", getRustMSRV(),
+        "--input", rootProject.projectDir.resolve("aws/SDK_README.md.hb").toString(),
         "--output", outputDir.resolve("README.md").absolutePath
     )
 }
@@ -352,8 +358,6 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") {
         val previousReleaseManifestPath = getPreviousReleaseVersionManifestPath()?.let { manifestPath ->
             add("--previous-release-versions")
             add(manifestPath)
-            add("--release-tag")
-            add("v" + getSdkVersion())
         }
     }
 }

buildSrc/src/main/kotlin/ManifestPatcher.kt

@@ -10,18 +10,11 @@ fun rewriteCrateVersion(line: String, version: String): String = line.replace(
     "version = \"$version\""
 )
 
-/**
- * AWS runtime crate versions are all `0.0.0-smithy-rs-head`. When copying over to the AWS SDK,
- * these should be changed to the AWS SDK version.
- */
-fun rewriteAwsSdkCrateVersion(properties: PropertyRetriever, line: String): String =
-    rewriteCrateVersion(line, properties.get("aws.sdk.version")!!)
-
 /**
  * Smithy runtime crate versions in smithy-rs are all `0.0.0-smithy-rs-head`. When copying over to the AWS SDK,
  * these should be changed to the smithy-rs version.
  */
-fun rewriteSmithyRsCrateVersion(properties: PropertyRetriever, line: String): String =
+fun rewriteRuntimeCrateVersion(properties: PropertyRetriever, line: String): String =
     rewriteCrateVersion(line, properties.get("smithy.rs.runtime.crate.version")!!)
 
 /** Patches a file with the result of the given `operation` being run on each line */