From 7478507281d43f162bfee58901554097aa843c8e Mon Sep 17 00:00:00 2001 From: Eduardo Rodrigues Date: Thu, 26 Jan 2023 15:56:45 +0100 Subject: [PATCH] chore: ensure test-util feature is applied to dev dependencies --- .../rustsdk/endpoints/OperationInputTestGenerator.kt | 3 ++- .../amazon/smithy/rustsdk/EndpointsCredentialsTest.kt | 9 +++++---- .../smithy/endpoint/generators/EndpointTestGenerator.kt | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/endpoints/OperationInputTestGenerator.kt b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/endpoints/OperationInputTestGenerator.kt index 37ecbad73c..1ef69e922d 100644 --- a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/endpoints/OperationInputTestGenerator.kt +++ b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/endpoints/OperationInputTestGenerator.kt @@ -24,6 +24,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.rust import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock 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.rustlang.DependencyScope import software.amazon.smithy.rust.codegen.core.smithy.PublicImportSymbolProvider import software.amazon.smithy.rust.codegen.core.smithy.RustCrate import software.amazon.smithy.rust.codegen.core.smithy.generators.setterName @@ -147,7 +148,7 @@ class OperationInputTestGenerator(_ctx: ClientCodegenContext, private val test: #{assertion} """, "capture_request" to CargoDependency.smithyClient(runtimeConfig) - .withFeature("test-util").toType().resolve("test_connection::capture_request"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("test_connection::capture_request"), "conf" to config(testOperationInput), "invoke_operation" to operationInvocation(testOperationInput), "assertion" to writable { diff --git a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointsCredentialsTest.kt b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointsCredentialsTest.kt index 1df1a0c0e0..89362d58e0 100644 --- a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointsCredentialsTest.kt +++ b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointsCredentialsTest.kt @@ -8,6 +8,7 @@ package software.amazon.smithy.rustsdk import org.junit.jupiter.api.Test 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.rustlang.DependencyScope import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel import software.amazon.smithy.rust.codegen.core.testutil.integrationTest import software.amazon.smithy.rust.codegen.core.testutil.tokioTest @@ -97,9 +98,9 @@ class EndpointsCredentialsTest { assert!(auth_header.contains("/us-west-2/foobaz/aws4_request"), "{}", auth_header); """, "capture_request" to CargoDependency.smithyClient(context.runtimeConfig) - .withFeature("test-util").toType().resolve("test_connection::capture_request"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("test_connection::capture_request"), "Credentials" to AwsCargoDependency.awsCredentialTypes(context.runtimeConfig) - .withFeature("test-util").toType().resolve("Credentials"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("Credentials"), "Region" to AwsRuntimeType.awsTypes(context.runtimeConfig).resolve("region::Region"), ) } @@ -121,9 +122,9 @@ class EndpointsCredentialsTest { assert!(auth_header.contains("/region-custom-auth/name-custom-auth/aws4_request"), "{}", auth_header); """, "capture_request" to CargoDependency.smithyClient(context.runtimeConfig) - .withFeature("test-util").toType().resolve("test_connection::capture_request"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("test_connection::capture_request"), "Credentials" to AwsCargoDependency.awsCredentialTypes(context.runtimeConfig) - .withFeature("test-util").toType().resolve("Credentials"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("Credentials"), "Region" to AwsRuntimeType.awsTypes(context.runtimeConfig).resolve("region::Region"), ) } diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointTestGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointTestGenerator.kt index 183e25d33e..f45a42a9d2 100644 --- a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointTestGenerator.kt +++ b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointTestGenerator.kt @@ -23,6 +23,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.rust import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock 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.rustlang.DependencyScope import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType import software.amazon.smithy.rust.codegen.core.util.PANIC @@ -49,7 +50,7 @@ internal class EndpointTestGenerator( "Document" to RuntimeType.document(runtimeConfig), "HashMap" to RuntimeType.HashMap, "capture_request" to CargoDependency.smithyClient(runtimeConfig) - .withFeature("test-util").toType().resolve("test_connection::capture_request"), + .copy(features = setOf("test-util"), scope = DependencyScope.Dev).toType().resolve("test_connection::capture_request"), ) private val instantiator = clientInstantiator(codegenContext)