Change the default runtime mode to orchestrator

.github/workflows/ci.yml

@@ -84,8 +84,8 @@ jobs:
         test:
         - action: check-aws-sdk-adhoc-tests
           runner: ubuntu-latest
-        # TODO(enableNewSmithyRuntimeCleanup): Remove `check-aws-sdk-orchestrator-impl` when cleaning up middleware
-        - action: check-aws-sdk-orchestrator-impl
+        # TODO(enableNewSmithyRuntimeCleanup): Remove `check-aws-sdk-middleware-impl` when cleaning up middleware
+        - action: check-aws-sdk-middleware-impl
           runner: smithy_ubuntu-latest_8-core
         - action: check-client-codegen-integration-tests
           runner: smithy_ubuntu-latest_8-core

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

@@ -764,7 +764,7 @@ mod loader {
             assert_eq!(Some(&app_name), conf.app_name());
         }
 
-        #[cfg(aws_sdk_orchestrator_mode)]
+        #[cfg(not(aws_sdk_middleware_mode))]
         #[tokio::test]
         async fn disable_default_credentials() {
             let config = from_env().no_credentials().load().await;

aws/sdk-adhoc-test/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
 }
 
-fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "middleware"
+fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "orchestrator"
 
 val allCodegenTests = listOf(
     CodegenTest(

aws/sdk/build.gradle.kts

@@ -61,7 +61,7 @@ val crateVersioner by lazy { aws.sdk.CrateVersioner.defaultFor(rootProject, prop
 
 fun getRustMSRV(): String = properties.get("rust.msrv") ?: throw Exception("Rust MSRV missing")
 fun getPreviousReleaseVersionManifestPath(): String? = properties.get("aws.sdk.previous.release.versions.manifest")
-fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "middleware"
+fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "orchestrator"
 
 fun loadServiceMembership(): Membership {
     val membershipOverride = properties.get("aws.services")?.let { parseMembership(it) }

aws/sdk/integration-tests/dynamodb/benches/deserialization_bench.rs

@@ -6,7 +6,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 fn do_bench() {
-    #[cfg(not(aws_sdk_orchestrator_mode))]
+    #[cfg(aws_sdk_middleware_mode)]
     {
         use aws_sdk_dynamodb::operation::query::Query;
         use aws_smithy_http::response::ParseHttpResponse;

aws/sdk/integration-tests/dynamodb/benches/serialization_bench.rs

@@ -34,7 +34,7 @@ macro_rules! attr_obj {
 }
 
 fn do_bench(_config: &Config, _input: &PutItemInput) {
-    #[cfg(not(aws_sdk_orchestrator_mode))]
+    #[cfg(aws_sdk_middleware_mode)]
     {
         use futures_util::FutureExt;
 

aws/sdk/integration-tests/dynamodb/tests/retries-with-client-rate-limiting.rs

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 mod test {
     use aws_sdk_dynamodb::config::{Credentials, Region, SharedAsyncSleep};
     use aws_sdk_dynamodb::{config::retry::RetryConfig, error::ProvideErrorMetadata};

aws/sdk/integration-tests/kms/tests/retryable_errors.rs

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#[cfg(not(aws_sdk_orchestrator_mode))]
+#[cfg(aws_sdk_middleware_mode)]
 mod middleware_mode_tests {
     use aws_http::retry::AwsResponseRetryClassifier;
     use aws_sdk_kms as kms;
@@ -66,7 +66,7 @@ mod middleware_mode_tests {
     }
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 mod orchestrator_mode_tests {
     use aws_credential_types::Credentials;
     use aws_runtime::retries::classifier::AwsErrorCodeClassifier;

aws/sdk/integration-tests/s3/tests/alternative-async-runtime.rs

@@ -20,7 +20,7 @@ use aws_smithy_types::timeout::TimeoutConfig;
 use std::fmt::Debug;
 use std::time::{Duration, Instant};
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 use aws_smithy_runtime::test_util::capture_test_logs::capture_test_logs;
 
 #[derive(Debug)]
@@ -36,7 +36,7 @@ impl AsyncSleep for SmolSleep {
 
 #[test]
 fn test_smol_runtime_timeouts() {
-    #[cfg(aws_sdk_orchestrator_mode)]
+    #[cfg(not(aws_sdk_middleware_mode))]
     let _guard = capture_test_logs();
 
     if let Err(err) = smol::block_on(async { timeout_test(SharedAsyncSleep::new(SmolSleep)).await })
@@ -48,7 +48,7 @@ fn test_smol_runtime_timeouts() {
 
 #[test]
 fn test_smol_runtime_retry() {
-    #[cfg(aws_sdk_orchestrator_mode)]
+    #[cfg(not(aws_sdk_middleware_mode))]
     let _guard = capture_test_logs();
 
     if let Err(err) = smol::block_on(async { retry_test(SharedAsyncSleep::new(SmolSleep)).await }) {
@@ -68,7 +68,7 @@ impl AsyncSleep for AsyncStdSleep {
 
 #[test]
 fn test_async_std_runtime_timeouts() {
-    #[cfg(aws_sdk_orchestrator_mode)]
+    #[cfg(not(aws_sdk_middleware_mode))]
     let _guard = capture_test_logs();
 
     if let Err(err) = async_std::task::block_on(async {
@@ -81,7 +81,7 @@ fn test_async_std_runtime_timeouts() {
 
 #[test]
 fn test_async_std_runtime_retry() {
-    #[cfg(aws_sdk_orchestrator_mode)]
+    #[cfg(not(aws_sdk_middleware_mode))]
     let _guard = capture_test_logs();
 
     if let Err(err) =

aws/sdk/integration-tests/s3/tests/config-override.rs

@@ -9,7 +9,7 @@ use aws_sdk_s3::Client;
 use aws_smithy_client::test_connection::{capture_request, CaptureRequestReceiver};
 use aws_types::SdkConfig;
 
-// TODO(enableNewSmithyRuntimeCleanup): Remove this attribute once #[cfg(aws_sdk_orchestrator_mode)]
+// TODO(enableNewSmithyRuntimeCleanup): Remove this attribute once #[cfg(aws_sdk_middleware_mode)]
 //  has been removed
 #[allow(dead_code)]
 fn test_client() -> (CaptureRequestReceiver, Client) {
@@ -23,7 +23,7 @@ fn test_client() -> (CaptureRequestReceiver, Client) {
     (captured_request, client)
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn operation_overrides_force_path_style() {
     let (captured_request, client) = test_client();
@@ -42,7 +42,7 @@ async fn operation_overrides_force_path_style() {
     );
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn operation_overrides_fips() {
     let (captured_request, client) = test_client();
@@ -61,7 +61,7 @@ async fn operation_overrides_fips() {
     );
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn operation_overrides_dual_stack() {
     let (captured_request, client) = test_client();
@@ -84,7 +84,7 @@ async fn operation_overrides_dual_stack() {
 //  accessed in ServiceRuntimePlugin::config. Currently, a credentials cache created for a single
 //  operation invocation is not picked up by an identity resolver.
 /*
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn operation_overrides_credentials_provider() {
     let (captured_request, client) = test_client();

aws/sdk/integration-tests/s3/tests/endpoints.rs

@@ -62,7 +62,7 @@ async fn dual_stack() {
     );
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn multi_region_access_points() {
     let (_captured_request, client) = test_client(|b| b);
@@ -84,7 +84,7 @@ async fn multi_region_access_points() {
     );
 }
 
-#[cfg(not(aws_sdk_orchestrator_mode))]
+#[cfg(aws_sdk_middleware_mode)]
 #[tokio::test]
 async fn multi_region_access_points() {
     let (_captured_request, client) = test_client(|b| b);

aws/sdk/integration-tests/sts/tests/signing-it.rs

@@ -25,7 +25,7 @@ async fn assume_role_signed() {
 }
 
 // TODO(enableNewSmithyRuntimeCleanup): Delete the middleware version of this test
-#[cfg(not(aws_sdk_orchestrator_mode))]
+#[cfg(aws_sdk_middleware_mode)]
 #[tokio::test]
 async fn web_identity_unsigned() {
     let creds = Credentials::for_tests();
@@ -44,7 +44,7 @@ async fn web_identity_unsigned() {
     );
 }
 
-#[cfg(aws_sdk_orchestrator_mode)]
+#[cfg(not(aws_sdk_middleware_mode))]
 #[tokio::test]
 async fn web_identity_unsigned() {
     let (server, request) = capture_request(None);

codegen-client-test/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 val smithyVersion: String by project
 val defaultRustDocFlags: String by project
 val properties = PropertyRetriever(rootProject, project)
-fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "middleware"
+fun getSmithyRuntimeMode(): String = properties.get("smithy.runtime.mode") ?: "orchestrator"
 
 val pluginName = "rust-client-codegen"
 val workingDirUnderBuildDir = "smithyprojections/codegen-client-test/"

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/ClientRustSettings.kt

@@ -133,7 +133,7 @@ data class ClientCodegenConfig(
         private const val defaultIncludeFluentClient = true
         private const val defaultAddMessageToErrors = true
         private val defaultEventStreamAllowList: Set<String> = emptySet()
-        private val defaultEnableNewSmithyRuntime = SmithyRuntimeMode.Middleware
+        private val defaultEnableNewSmithyRuntime = SmithyRuntimeMode.Orchestrator
 
         fun fromCodegenConfigAndNode(coreCodegenConfig: CoreCodegenConfig, node: Optional<ObjectNode>) =
             if (node.isPresent) {

tools/ci-scripts/check-aws-sdk-middleware-impl

@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# This script tests the SDK smoke test services against the middleware implementation
+
+C_YELLOW='\033[1;33m'
+C_RESET='\033[0m'
+
+set -eu
+cd smithy-rs
+
+./gradlew aws:sdk:assemble -Psmithy.runtime.mode=middleware
+
+cd aws/sdk/build/aws-sdk/sdk
+for service in */; do
+    pushd "${service}"
+    echo -e "${C_YELLOW}# Running 'cargo test --all-features' on '${service}'${C_RESET}"
+    RUSTFLAGS="${RUSTFLAGS:-} --cfg aws_sdk_middleware_mode" cargo test --all-features --all-targets --no-fail-fast
+    echo -e "${C_YELLOW}# Running 'cargo clippy --all-features' on '${service}'${C_RESET}"
+    RUSTFLAGS="${RUSTFLAGS:-} --cfg aws_sdk_middleware_mode" cargo clippy --all-features
+    popd
+done
+
+echo "SUCCESS"