Merge branch 'main' into RFC30/tests

Author: thomas-k-cameron

.github/workflows/ci-main.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v2.2.0
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions

.github/workflows/ci-merge-queue.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Attempt to load a docker login password
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v2.2.0
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions
@@ -67,7 +67,7 @@ jobs:
         DOCKER_BUILDKIT: 1
       run: ./smithy-rs/.github/scripts/acquire-build-image
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v2.2.0
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions

.github/workflows/ci-pr.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Attempt to load a docker login password
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v2.2.0
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions
@@ -69,7 +69,7 @@ jobs:
         DOCKER_BUILDKIT: 1
       run: ./smithy-rs/.github/scripts/acquire-build-image
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v2.2.0
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions

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

@@ -55,7 +55,7 @@ jobs:
       with:
         action: generate-codegen-diff
         action-arguments: ${{ inputs.base_revision }}
-    - uses: aws-actions/configure-aws-credentials@v1-node16
+    - uses: aws-actions/configure-aws-credentials@v2.2.0
       name: Acquire credentials for uploading to S3
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PULL_REQUEST_CDN_ROLE_ARN }}
@@ -125,7 +125,7 @@ jobs:
         ./tools/ci-scripts/generate-doc-preview-index.sh ${{ inputs.base_revision }}
 
         echo 'bot-message=A [new doc preview](https://d2luzm2xt3nokh.cloudfront.net/docs/'${{ inputs.head_revision }}'/index.html) is ready to view.' >> "${GITHUB_OUTPUT}"
-    - uses: aws-actions/configure-aws-credentials@v1-node16
+    - uses: aws-actions/configure-aws-credentials@v2.2.0
       name: Acquire credentials for uploading to S3
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PULL_REQUEST_CDN_ROLE_ARN }}

CHANGELOG.next.toml

@@ -11,6 +11,24 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
+ [[aws-sdk-rust]]
+ message = "Add accessors to Builders"
+ references = ["smithy-rs#2791"]
+ meta = { "breaking" = false, "tada" = false, "bug" = false }
+ author = "davidsouther"
+
+ [[smithy-rs]]
+ message = "Add accessors to Builders"
+ references = ["smithy-rs#2791"]
+ meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client"}
+ author = "davidsouther"
+
+[[smithy-rs]]
+message = "Avoid intermediate vec allocations in AggregatedBytes::to_vec."
+author = "yotamofek"
+references = ["smithy-rs#2786"]
+meta = { "breaking" = false, "tada" = false, "bug" = false }
+
 [[smithy-rs]]
 message = "Fix bug in AWS JSON 1.x routers where, if a service had more than 14 operations, the router was created without the route for the 15th operation."
 author = "thor-bjorgvinsson"

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

@@ -46,6 +46,9 @@ pub mod glacier_interceptors;
 /// Default middleware stack for AWS services
 pub mod middleware;
 
+/// Strip prefixes from IDs returned by Route53 operations when those IDs are used to construct requests
+pub mod route53_resource_id_preprocessor_middleware;
+
 /// Strip prefixes from IDs returned by Route53 operations when those IDs are used to construct requests
 pub mod route53_resource_id_preprocessor;
 

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

@@ -3,10 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#![allow(dead_code)]
+
+use aws_smithy_runtime_api::client::interceptors::{
+    BeforeSerializationInterceptorContextMut, BoxError, Interceptor,
+};
+use aws_smithy_types::config_bag::ConfigBag;
+use std::fmt;
+use std::marker::PhantomData;
+
 // This function is only used to strip prefixes from resource IDs at the time they're passed as
 // input to a request. Resource IDs returned in responses may or may not include a prefix.
 /// Strip the resource type prefix from resource ID return
-pub fn trim_resource_id(resource_id: &mut Option<String>) {
+fn trim_resource_id(resource_id: &mut Option<String>) {
     const PREFIXES: &[&str] = &[
         "/hostedzone/",
         "hostedzone/",
@@ -28,9 +37,55 @@ pub fn trim_resource_id(resource_id: &mut Option<String>) {
     }
 }
 
+pub(crate) struct Route53ResourceIdInterceptor<G, T>
+where
+    G: for<'a> Fn(&'a mut T) -> &'a mut Option<String>,
+{
+    get_mut_resource_id: G,
+    _phantom: PhantomData<T>,
+}
+
+impl<G, T> fmt::Debug for Route53ResourceIdInterceptor<G, T>
+where
+    G: for<'a> Fn(&'a mut T) -> &'a mut Option<String>,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Route53ResourceIdInterceptor").finish()
+    }
+}
+
+impl<G, T> Route53ResourceIdInterceptor<G, T>
+where
+    G: for<'a> Fn(&'a mut T) -> &'a mut Option<String>,
+{
+    pub(crate) fn new(get_mut_resource_id: G) -> Self {
+        Self {
+            get_mut_resource_id,
+            _phantom: Default::default(),
+        }
+    }
+}
+
+impl<G, T> Interceptor for Route53ResourceIdInterceptor<G, T>
+where
+    G: for<'a> Fn(&'a mut T) -> &'a mut Option<String>,
+    T: fmt::Debug + Send + Sync + 'static,
+{
+    fn modify_before_serialization(
+        &self,
+        context: &mut BeforeSerializationInterceptorContextMut<'_>,
+        _cfg: &mut ConfigBag,
+    ) -> Result<(), BoxError> {
+        let input: &mut T = context.input_mut().downcast_mut().expect("correct type");
+        let field = (self.get_mut_resource_id)(input);
+        trim_resource_id(field);
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod test {
-    use crate::route53_resource_id_preprocessor::trim_resource_id;
+    use super::trim_resource_id;
 
     #[test]
     fn does_not_change_regular_zones() {

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// TODO(enableNewSmithyRuntimeCleanup): Delete this module
+
+// This function is only used to strip prefixes from resource IDs at the time they're passed as
+// input to a request. Resource IDs returned in responses may or may not include a prefix.
+/// Strip the resource type prefix from resource ID return
+pub fn trim_resource_id(resource_id: &mut Option<String>) {
+    const PREFIXES: &[&str] = &[
+        "/hostedzone/",
+        "hostedzone/",
+        "/change/",
+        "change/",
+        "/delegationset/",
+        "delegationset/",
+    ];
+
+    for prefix in PREFIXES {
+        if let Some(id) = resource_id
+            .as_deref()
+            .unwrap_or_default()
+            .strip_prefix(prefix)
+        {
+            *resource_id = Some(id.to_string());
+            return;
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::route53_resource_id_preprocessor_middleware::trim_resource_id;
+
+    #[test]
+    fn does_not_change_regular_zones() {
+        struct OperationInput {
+            resource: Option<String>,
+        }
+
+        let mut operation = OperationInput {
+            resource: Some("Z0441723226OZ66S5ZCNZ".to_string()),
+        };
+        trim_resource_id(&mut operation.resource);
+        assert_eq!(
+            &operation.resource.unwrap_or_default(),
+            "Z0441723226OZ66S5ZCNZ"
+        );
+    }
+
+    #[test]
+    fn sanitizes_prefixed_zone() {
+        struct OperationInput {
+            change_id: Option<String>,
+        }
+
+        let mut operation = OperationInput {
+            change_id: Some("/change/Z0441723226OZ66S5ZCNZ".to_string()),
+        };
+        trim_resource_id(&mut operation.change_id);
+        assert_eq!(
+            &operation.change_id.unwrap_or_default(),
+            "Z0441723226OZ66S5ZCNZ"
+        );
+    }
+
+    #[test]
+    fn allow_no_leading_slash() {
+        struct OperationInput {
+            hosted_zone: Option<String>,
+        }
+
+        let mut operation = OperationInput {
+            hosted_zone: Some("hostedzone/Z0441723226OZ66S5ZCNZ".to_string()),
+        };
+        trim_resource_id(&mut operation.hosted_zone);
+        assert_eq!(
+            &operation.hosted_zone.unwrap_or_default(),
+            "Z0441723226OZ66S5ZCNZ"
+        );
+    }
+}

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

@@ -103,13 +103,25 @@ class AwsFluentClientDecorator : ClientCodegenDecorator {
         baseGenerator.protocolSupport,
         baseGenerator.operationShape,
         renderClientCreation = { params ->
+            rust("let mut ${params.configBuilderName} = ${params.configBuilderName};")
+            if (codegenContext.smithyRuntimeMode.defaultToOrchestrator) {
+                // TODO(enableNewSmithyRuntimeLaunch): A builder field could not be accessed directly in the orchestrator
+                //  mode when this code change was made. smithy-rs#2792 will enable us to use getters in builders.
+                //  Make this `set_region` conditional by checking if `config_builder.region().is_none()` once the PR
+                //  has been merged to main.
+                rust("""${params.configBuilderName}.set_region(Some(crate::config::Region::new("us-east-1")));""")
+            } else {
+                rust(
+                    """
+                    // If the test case was missing endpoint parameters, default a region so it doesn't fail
+                    if ${params.configBuilderName}.region.is_none() {
+                        ${params.configBuilderName}.set_region(Some(crate::config::Region::new("us-east-1")));
+                    }
+                    """,
+                )
+            }
             rustTemplate(
                 """
-                // If the test case was missing endpoint parameters, default a region so it doesn't fail
-                let mut ${params.configBuilderName} = ${params.configBuilderName};
-                if ${params.configBuilderName}.region.is_none() {
-                    ${params.configBuilderName}.set_region(Some(crate::config::Region::new("us-east-1")));
-                }
                 let config = ${params.configBuilderName}.http_connector(${params.connectorName}).build();
                 let ${params.clientName} = #{Client}::from_conf(config);
                 """,

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

@@ -17,6 +17,8 @@ import software.amazon.smithy.rust.codegen.core.rustlang.rust
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
+import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
+import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType.Companion.preludeScope
 import software.amazon.smithy.rust.codegen.core.smithy.customize.AdHocCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.customize.adhocCustomization
 
@@ -53,8 +55,10 @@ class CredentialCacheConfig(codegenContext: ClientCodegenContext) : ConfigCustom
     private val runtimeConfig = codegenContext.runtimeConfig
     private val runtimeMode = codegenContext.smithyRuntimeMode
     private val codegenScope = arrayOf(
+        *preludeScope,
         "CredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig).resolve("cache::CredentialsCache"),
         "DefaultProvider" to defaultProvider(),
+        "SharedAsyncSleep" to RuntimeType.smithyAsync(runtimeConfig).resolve("rt::sleep::SharedAsyncSleep"),
         "SharedCredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig).resolve("cache::SharedCredentialsCache"),
         "SharedCredentialsProvider" to AwsRuntimeType.awsCredentialTypes(runtimeConfig).resolve("provider::SharedCredentialsProvider"),
     )
@@ -95,35 +99,57 @@ class CredentialCacheConfig(codegenContext: ClientCodegenContext) : ConfigCustom
             }
 
             ServiceConfig.BuilderStruct ->
-                rustTemplate("credentials_cache: Option<#{CredentialsCache}>,", *codegenScope)
+                if (runtimeMode.defaultToMiddleware) {
+                    rustTemplate("credentials_cache: #{Option}<#{CredentialsCache}>,", *codegenScope)
+                }
 
             ServiceConfig.BuilderImpl -> {
                 rustTemplate(
                     """
                     /// Sets the credentials cache for this service
                     pub fn credentials_cache(mut self, credentials_cache: #{CredentialsCache}) -> Self {
-                        self.set_credentials_cache(Some(credentials_cache));
+                        self.set_credentials_cache(#{Some}(credentials_cache));
                         self
                     }
 
-                    /// Sets the credentials cache for this service
-                    pub fn set_credentials_cache(&mut self, credentials_cache: Option<#{CredentialsCache}>) -> &mut Self {
-                        self.credentials_cache = credentials_cache;
-                        self
-                    }
                     """,
                     *codegenScope,
                 )
+
+                if (runtimeMode.defaultToOrchestrator) {
+                    rustTemplate(
+                        """
+                        /// Sets the credentials cache for this service
+                        pub fn set_credentials_cache(&mut self, credentials_cache: #{Option}<#{CredentialsCache}>) -> &mut Self {
+                            self.inner.store_or_unset(credentials_cache);
+                            self
+                        }
+                        """,
+                        *codegenScope,
+                    )
+                } else {
+                    rustTemplate(
+                        """
+                        /// Sets the credentials cache for this service
+                        pub fn set_credentials_cache(&mut self, credentials_cache: Option<#{CredentialsCache}>) -> &mut Self {
+                            self.credentials_cache = credentials_cache;
+                            self
+                        }
+                        """,
+                        *codegenScope,
+                    )
+                }
             }
 
             ServiceConfig.BuilderBuild -> {
                 if (runtimeMode.defaultToOrchestrator) {
                     rustTemplate(
                         """
                         layer.store_put(
-                            self.credentials_cache
+                            layer.load::<#{CredentialsCache}>()
+                                .cloned()
                                 .unwrap_or_else({
-                                    let sleep = self.sleep_impl.clone();
+                                    let sleep = layer.load::<#{SharedAsyncSleep}>().cloned();
                                     || match sleep {
                                         Some(sleep) => {
                                             #{CredentialsCache}::lazy_builder()
@@ -133,9 +159,9 @@ class CredentialCacheConfig(codegenContext: ClientCodegenContext) : ConfigCustom
                                         None => #{CredentialsCache}::lazy(),
                                     }
                                 })
-                                .create_cache(self.credentials_provider.unwrap_or_else(|| {
+                                .create_cache(layer.load::<#{SharedCredentialsProvider}>().cloned().unwrap_or_else(|| {
                                     #{SharedCredentialsProvider}::new(#{DefaultProvider})
-                                })),
+                                }))
                         );
                         """,
                         *codegenScope,