update codegen integration tests to use test-util-latest and smithy-h…

…ttp-client directly
smithy-lang · Dec 11, 2024 · ecc7dd7 · ecc7dd7
1 parent 52e4d35
commit ecc7dd7
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 39 deletions.
diff --git a/...k-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointBuiltInsDecoratorTest.kt b/...k-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointBuiltInsDecoratorTest.kt
@@ -129,11 +129,11 @@ class EndpointBuiltInsDecoratorTest {
                     """,
                     "tokio" to CargoDependency.Tokio.toDevDependency().withFeature("rt").withFeature("macros").toType(),
                     "StaticReplayClient" to
-                        CargoDependency.smithyRuntimeTestUtil(codegenContext.runtimeConfig).toType()
-                            .resolve("client::http::test_util::StaticReplayClient"),
+                        CargoDependency.smithyHttpClientTestUtil(codegenContext.runtimeConfig).toType()
+                            .resolve("test_util::StaticReplayClient"),
                     "ReplayEvent" to
-                        CargoDependency.smithyRuntimeTestUtil(codegenContext.runtimeConfig).toType()
-                            .resolve("client::http::test_util::ReplayEvent"),
+                        CargoDependency.smithyHttpClientTestUtil(codegenContext.runtimeConfig).toType()
+                            .resolve("test_util::ReplayEvent"),
                     "SdkBody" to RuntimeType.sdkBody(codegenContext.runtimeConfig),
                 )
             }

diff --git a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/SigV4AuthDecoratorTest.kt b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/SigV4AuthDecoratorTest.kt
@@ -6,6 +6,7 @@ package software.amazon.smithy.rustsdk
 
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.rust.codegen.core.rustlang.Attribute
+import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
 import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
@@ -162,11 +163,11 @@ class SigV4AuthDecoratorTest {
                         "ByteStream" to RuntimeType.byteStream(rc),
                         "Credentials" to AwsRuntimeType.awsCredentialTypesTestUtil(rc).resolve("Credentials"),
                         "Region" to AwsRuntimeType.awsTypes(rc).resolve("region::Region"),
-                        "ReplayEvent" to RuntimeType.smithyRuntimeTestUtil(rc).resolve("ReplayEvent"),
+                        "ReplayEvent" to CargoDependency.smithyHttpClientTestUtil(rc).toType().resolve("test_utiL::ReplayEvent"),
                         "Request" to RuntimeType.HttpRequest,
                         "Response" to RuntimeType.HttpResponse,
                         "SdkBody" to RuntimeType.sdkBody(rc),
-                        "StaticReplayClient" to RuntimeType.smithyRuntimeTestUtil(rc).resolve("StaticReplayClient"),
+                        "StaticReplayClient" to CargoDependency.smithyHttpClientTestUtil(rc).toType().resolve("test_util::StaticReplayClient"),
                         "tracing_subscriber" to RuntimeType.TracingSubscriber,
                     )
                 }

diff --git a/...n/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ServiceGenerator.kt b/...n/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ServiceGenerator.kt
@@ -48,8 +48,8 @@ class ServiceGenerator(
                 )
             serviceConfigGenerator.render(this)
 
-            // Enable users to opt in to the `test-util` feature in the runtime crate
-            rustCrate.mergeFeature(TestUtilFeature.copy(deps = listOf("aws-smithy-runtime/test-util")))
+            // Enable users to opt in to the `test-util-latest` feature in the runtime crate
+            rustCrate.mergeFeature(TestUtilFeature.copy(deps = listOf("aws-smithy-runtime/test-util-latest")))
 
             ServiceRuntimePluginGenerator(codegenContext)
                 .render(this, decorator.serviceRuntimePluginCustomizations(codegenContext, emptyList()))

diff --git a/...azon/smithy/rust/codegen/client/smithy/generators/protocol/ClientProtocolTestGenerator.kt b/...azon/smithy/rust/codegen/client/smithy/generators/protocol/ClientProtocolTestGenerator.kt
@@ -199,8 +199,8 @@ class ClientProtocolTestGenerator(
 
             """,
             "capture_request" to
-                CargoDependency.smithyRuntimeTestUtil(rc).toType()
-                    .resolve("client::http::test_util::capture_request"),
+                CargoDependency.smithyHttpClientTestUtil(rc).toType()
+                    .resolve("test_util::capture_request"),
             "config" to ClientRustModule.config,
             "customParams" to customParams,
         )

diff --git a/...e/amazon/smithy/rust/codegen/client/smithy/customizations/SensitiveOutputDecoratorTest.kt b/...e/amazon/smithy/rust/codegen/client/smithy/customizations/SensitiveOutputDecoratorTest.kt
@@ -23,6 +23,7 @@ class SensitiveOutputDecoratorTest {
                     .resolve("test_util::capture_test_logs::capture_test_logs"),
             "capture_request" to RuntimeType.captureRequest(runtimeConfig),
             "SdkBody" to RuntimeType.sdkBody(runtimeConfig),
+            "http_1x" to CargoDependency.Http1x.toType(),
         )
 
     private val model =
@@ -59,7 +60,7 @@ class SensitiveOutputDecoratorTest {
                     async fn redacting_sensitive_response_body() {
                         let (_logs, logs_rx) = #{capture_test_logs}();
                         let (http_client, _r) = #{capture_request}(Some(
-                            http::Response::builder()
+                            #{http_1x}::Response::builder()
                                 .status(200)
                                 .body(#{SdkBody}::from(""))
                                 .unwrap(),

diff --git a/...tlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/EndpointsDecoratorTest.kt b/...tlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/EndpointsDecoratorTest.kt
@@ -307,8 +307,8 @@ class EndpointsDecoratorTest {
                         }
                         """,
                         "NeverClient" to
-                            CargoDependency.smithyRuntimeTestUtil(clientCodegenContext.runtimeConfig)
-                                .toType().resolve("client::http::test_util::NeverClient"),
+                            CargoDependency.smithyHttpClientTestUtil(clientCodegenContext.runtimeConfig)
+                                .toType().resolve("test_util::NeverClient"),
                         "TokioSleep" to
                             CargoDependency.smithyAsync(clientCodegenContext.runtimeConfig)
                                 .withFeature("rt-tokio").toType().resolve("rt::sleep::TokioSleep"),

diff --git a/.../smithy/rust/codegen/client/smithy/generators/ConfigOverrideRuntimePluginGeneratorTest.kt b/.../smithy/rust/codegen/client/smithy/generators/ConfigOverrideRuntimePluginGeneratorTest.kt
@@ -135,8 +135,8 @@ internal class ConfigOverrideRuntimePluginGeneratorTest {
                         "AsyncSleep" to RuntimeType.smithyAsync(runtimeConfig).resolve("rt::sleep::AsyncSleep"),
                         "capture_request" to RuntimeType.captureRequest(runtimeConfig),
                         "NeverClient" to
-                            CargoDependency.smithyRuntimeTestUtil(runtimeConfig).toType()
-                                .resolve("client::http::test_util::NeverClient"),
+                            CargoDependency.smithyHttpClientTestUtil(runtimeConfig).toType()
+                                .resolve("test_util::NeverClient"),
                         "Timeout" to RuntimeType.smithyAsync(runtimeConfig).resolve("future::timeout::Timeout"),
                         "TokioSleep" to
                             CargoDependency.smithyAsync(runtimeConfig).withFeature("rt-tokio")

diff --git a/...software/amazon/smithy/rust/codegen/client/smithy/generators/EndpointTraitBindingsTest.kt b/...software/amazon/smithy/rust/codegen/client/smithy/generators/EndpointTraitBindingsTest.kt
@@ -205,7 +205,7 @@ internal class EndpointTraitBindingsTest {
                         }
 
                         let (http_client, _r) = capture_request(Some(
-                            http::Response::builder()
+                            #{http_1x}::Response::builder()
                                 .status(200)
                                 .body(SdkBody::from(""))
                                 .unwrap(),
@@ -249,8 +249,9 @@ internal class EndpointTraitBindingsTest {
                     }
                     """,
                     "capture_request" to
-                        CargoDependency.smithyRuntimeTestUtil(clientCodegenContext.runtimeConfig)
-                            .toType().resolve("client::http::test_util::capture_request"),
+                        CargoDependency.smithyHttpClientTestUtil(clientCodegenContext.runtimeConfig)
+                            .toType().resolve("test_util::capture_request"),
+                    "http_1x" to CargoDependency.Http1x.toType(),
                 )
             }
         }

diff --git a/...smithy/rust/codegen/client/smithy/generators/client/CustomizableOperationGeneratorTest.kt b/...smithy/rust/codegen/client/smithy/generators/client/CustomizableOperationGeneratorTest.kt
@@ -53,8 +53,8 @@ class CustomizableOperationGeneratorTest {
                     }
                     """,
                     "NeverClient" to
-                        CargoDependency.smithyRuntimeTestUtil(codegenContext.runtimeConfig).toType()
-                            .resolve("client::http::test_util::NeverClient"),
+                        CargoDependency.smithyHttpClientTestUtil(codegenContext.runtimeConfig).toType()
+                            .resolve("test_util::NeverClient"),
                 )
             }
         }

diff --git a/...e/amazon/smithy/rust/codegen/client/smithy/generators/client/FluentClientGeneratorTest.kt b/...e/amazon/smithy/rust/codegen/client/smithy/generators/client/FluentClientGeneratorTest.kt
@@ -87,8 +87,8 @@ class FluentClientGeneratorTest {
                     }
                     """,
                     "NeverClient" to
-                        CargoDependency.smithyRuntimeTestUtil(codegenContext.runtimeConfig).toType()
-                            .resolve("client::http::test_util::NeverClient"),
+                        CargoDependency.smithyHttpClientTestUtil(codegenContext.runtimeConfig).toType()
+                            .resolve("test_util::NeverClient"),
                 )
             }
         }
@@ -116,8 +116,8 @@ class FluentClientGeneratorTest {
                     }
                     """,
                     "NeverClient" to
-                        CargoDependency.smithyRuntimeTestUtil(codegenContext.runtimeConfig).toType()
-                            .resolve("client::http::test_util::NeverClient"),
+                        CargoDependency.smithyHttpClientTestUtil(codegenContext.runtimeConfig).toType()
+                            .resolve("test_util::NeverClient"),
                 )
             }
         }

diff --git a/...lin/software/amazon/smithy/rust/codegen/client/smithy/protocols/AwsQueryCompatibleTest.kt b/...lin/software/amazon/smithy/rust/codegen/client/smithy/protocols/AwsQueryCompatibleTest.kt
@@ -74,11 +74,11 @@ class AwsQueryCompatibleTest {
                 tokioTest("should_parse_code_and_type_fields") {
                     rustTemplate(
                         """
-                        let response = |_: http::Request<#{SdkBody}>| {
-                            http::Response::builder()
+                        let response = |_: #{http_1x}::Request<#{SdkBody}>| {
+                            #{http_1x}::Response::builder()
                                 .header(
                                     "x-amzn-query-error",
-                                    http::HeaderValue::from_static("AWS.SimpleQueueService.NonExistentQueue;Sender"),
+                                    #{http_1x}::HeaderValue::from_static("AWS.SimpleQueueService.NonExistentQueue;Sender"),
                                 )
                                 .status(400)
                                 .body(
@@ -107,8 +107,9 @@ class AwsQueryCompatibleTest {
                         *RuntimeType.preludeScope,
                         "SdkBody" to RuntimeType.sdkBody(context.runtimeConfig),
                         "infallible_client_fn" to
-                            CargoDependency.smithyRuntimeTestUtil(context.runtimeConfig)
-                                .toType().resolve("client::http::test_util::infallible_client_fn"),
+                            CargoDependency.smithyHttpClientTestUtil(context.runtimeConfig)
+                                .toType().resolve("test_util::infallible_client_fn"),
+                        "http_1x" to CargoDependency.Http1x.toType(),
                     )
                 }
             }
@@ -126,8 +127,8 @@ class AwsQueryCompatibleTest {
                 tokioTest("should_parse_code_from_payload") {
                     rustTemplate(
                         """
-                        let response = |_: http::Request<#{SdkBody}>| {
-                            http::Response::builder()
+                        let response = |_: #{http_1x}::Request<#{SdkBody}>| {
+                            #{http_1x}::Response::builder()
                                 .status(400)
                                 .body(
                                     #{SdkBody}::from(
@@ -152,8 +153,9 @@ class AwsQueryCompatibleTest {
                         *RuntimeType.preludeScope,
                         "SdkBody" to RuntimeType.sdkBody(context.runtimeConfig),
                         "infallible_client_fn" to
-                            CargoDependency.smithyRuntimeTestUtil(context.runtimeConfig)
-                                .toType().resolve("client::http::test_util::infallible_client_fn"),
+                            CargoDependency.smithyHttpClientTestUtil(context.runtimeConfig)
+                                .toType().resolve("test_util::infallible_client_fn"),
+                        "http_1x" to CargoDependency.Http1x.toType(),
                     )
                 }
             }

diff --git a/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt b/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt
@@ -186,7 +186,7 @@ fun InlineDependency.toType() = RuntimeType(module.fullyQualifiedPath(), this)
 
 data class Feature(val name: String, val default: Boolean, val deps: List<String>)
 
-val DEV_ONLY_FEATURES = setOf("test-util")
+val DEV_ONLY_FEATURES = setOf("test-util", "test-util-latest")
 
 /**
  * A dependency on an internal or external Cargo crate
@@ -365,6 +365,9 @@ data class CargoDependency(
 
         fun smithyHttpClient(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-http-client")
 
+        fun smithyHttpClientTestUtil(runtimeConfig: RuntimeConfig) =
+            smithyHttpClient(runtimeConfig).toDevDependency().withFeature("test-util")
+
         fun smithyJson(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-json")
 
         fun smithyProtocolTestHelpers(runtimeConfig: RuntimeConfig) =
@@ -377,7 +380,7 @@ data class CargoDependency(
                 .withFeature("client")
 
         fun smithyRuntimeTestUtil(runtimeConfig: RuntimeConfig) =
-            smithyRuntime(runtimeConfig).toDevDependency().withFeature("test-util")
+            smithyRuntime(runtimeConfig).toDevDependency().withFeature("test-util-latest")
 
         fun smithyRuntimeApi(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-runtime-api")
 

diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt
@@ -498,11 +498,8 @@ data class RuntimeType(val path: String, val dependency: RustDependency? = null)
             return smithyTypes(runtimeConfig).resolve("date_time::Format::$timestampFormat")
         }
 
-        fun smithyRuntimeTestUtil(runtimeConfig: RuntimeConfig) =
-            CargoDependency.smithyRuntimeTestUtil(runtimeConfig).toType().resolve("client::http::test_util")
-
         fun captureRequest(runtimeConfig: RuntimeConfig) =
-            smithyRuntimeTestUtil(runtimeConfig).resolve("capture_request")
+            CargoDependency.smithyHttpClientTestUtil(runtimeConfig).toType().resolve("test_util::capture_request")
 
         fun forInlineDependency(inlineDependency: InlineDependency) =
             RuntimeType("crate::${inlineDependency.name}", inlineDependency)