Merge branch 'smithy-rs-release-0.56.x' of github.com:awslabs/smithy-rs into 0.56-backport-v2 (c0d07731) · Commits · Public Repositories / Smithy Rust

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

+16 −3

Original line number	Diff line number	Diff line
		@@ -44,10 +44,17 @@ class CredentialCacheConfig(codegenContext: ClientCodegenContext) : ConfigCustom
		private val codegenScope = arrayOf(
		*preludeScope,
		"CredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig).resolve("cache::CredentialsCache"),
		"CredentialsIdentityResolver" to AwsRuntimeType.awsRuntime(runtimeConfig)
		.resolve("identity::credentials::CredentialsIdentityResolver"),
		"DefaultProvider" to defaultProvider(),
		"SIGV4_SCHEME_ID" to AwsRuntimeType.awsRuntime(runtimeConfig).resolve("auth::sigv4::SCHEME_ID"),
		"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"),
		"SharedCredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("cache::SharedCredentialsCache"),
		"SharedCredentialsProvider" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("provider::SharedCredentialsProvider"),
		"SharedIdentityResolver" to RuntimeType.smithyRuntimeApi(runtimeConfig)
		.resolve("client::identity::SharedIdentityResolver"),
		)

		override fun section(section: ServiceConfig) = writable {
		@@ -131,7 +138,13 @@ class CredentialCacheConfig(codegenContext: ClientCodegenContext) : ConfigCustom
		#{Some}(credentials_cache),
		#{Some}(credentials_provider),
		) => {
		resolver.config_mut().store_put(credentials_cache.create_cache(credentials_provider));
		let credentials_cache = credentials_cache.create_cache(credentials_provider);
		resolver.runtime_components_mut().push_identity_resolver(
		#{SIGV4_SCHEME_ID},
		#{SharedIdentityResolver}::new(
		#{CredentialsIdentityResolver}::new(credentials_cache),
		),
		);
		}
		}
		""",

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,18 @@ private class SigV4SigningConfig(
		)
		}

		is ServiceConfig.OperationConfigOverride -> {
		rustTemplate(
		"""
		resolver.config_mut()
		.load::<#{Region}>()
		.cloned()
		.map(\|r\| resolver.config_mut().store_put(#{SigningRegion}::from(r)));
		""",
		*codegenScope,
		)
		}

		else -> {}
		}
		}

aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/CredentialCacheConfigTest.kt

+34 −54

Original line number	Diff line number	Diff line
		@@ -19,10 +19,13 @@ internal class CredentialCacheConfigTest {
		namespace com.example
		use aws.protocols#awsJson1_0
		use aws.api#service
		use aws.auth#sigv4
		use smithy.rules#endpointRuleSet

		@service(sdkId: "Some Value")
		@awsJson1_0
		@sigv4(name: "dontcare")
		@auth([sigv4])
		@endpointRuleSet({
		"version": "1.0",
		"rules": [{
		@@ -39,7 +42,6 @@ internal class CredentialCacheConfigTest {
		version: "1"
		}

		@optionalAuth
		operation SayHello { input: TestInput }
		structure TestInput {
		foo: String,
		@@ -56,14 +58,11 @@ internal class CredentialCacheConfigTest {
		.resolve("Credentials"),
		"CredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("cache::CredentialsCache"),
		"ProvideCachedCredentials" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("cache::ProvideCachedCredentials"),
		"Region" to AwsRuntimeType.awsTypes(runtimeConfig).resolve("region::Region"),
		"RuntimePlugin" to RuntimeType.smithyRuntimeApi(runtimeConfig)
		.resolve("client::runtime_plugin::RuntimePlugin"),
		"SharedCredentialsCache" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("cache::SharedCredentialsCache"),
		"SharedCredentialsProvider" to AwsRuntimeType.awsCredentialTypes(runtimeConfig)
		.resolve("provider::SharedCredentialsProvider"),
		)
		rustCrate.testModule {
		unitTest(
		@@ -114,74 +113,55 @@ internal class CredentialCacheConfigTest {
		)
		}

		tokioTest("test_overriding_cache_and_provider_leads_to_shared_credentials_cache_in_layer") {
		unitTest("test_not_overriding_cache_and_provider_leads_to_no_shared_credentials_cache_in_layer") {
		rustTemplate(
		"""
		use #{ProvideCachedCredentials};
		use #{RuntimePlugin};

		let client_config = crate::config::Config::builder()
		.credentials_provider(#{Credentials}::for_tests())
		.build();
		let client_config_layer = client_config.config;

		// make sure test credentials are set in the client config level
		assert_eq!(#{Credentials}::for_tests(),
		client_config_layer
		.load::<#{SharedCredentialsCache}>()
		.unwrap()
		.provide_cached_credentials()
		.await
		.unwrap()
		);

		let credentials = #{Credentials}::new(
		"test",
		"test",
		#{None},
		#{None},
		"test",
		);
		let config_override = crate::config::Config::builder()
		.credentials_cache(#{CredentialsCache}::lazy())
		.credentials_provider(credentials.clone());
		let client_config = crate::config::Config::builder().build();
		let config_override = crate::config::Config::builder();
		let sut = crate::config::ConfigOverrideRuntimePlugin::new(
		config_override,
		client_config_layer,
		client_config.config,
		&client_config.runtime_components,
		);
		let sut_layer = sut.config().unwrap();

		// make sure `.provide_cached_credentials` returns credentials set through `config_override`
		assert_eq!(credentials,
		sut_layer
		assert!(sut_layer
		.load::<#{SharedCredentialsCache}>()
		.unwrap()
		.provide_cached_credentials()
		.await
		.unwrap()
		);
		.is_none());
		""",
		*codegenScope,
		)
		}

		unitTest("test_not_overriding_cache_and_provider_leads_to_no_shared_credentials_cache_in_layer") {
		tokioTest("test_specifying_credentials_provider_only_at_operation_level_should_work") {
		// per https://github.com/awslabs/aws-sdk-rust/issues/901
		rustTemplate(
		"""
		use #{RuntimePlugin};

		let client_config = crate::config::Config::builder().build();
		let config_override = crate::config::Config::builder();
		let sut = crate::config::ConfigOverrideRuntimePlugin::new(
		config_override,
		client_config.config,
		&client_config.runtime_components,
		let client = crate::client::Client::from_conf(client_config);

		let credentials = #{Credentials}::new(
		"test",
		"test",
		#{None},
		#{None},
		"test",
		);
		let sut_layer = sut.config().unwrap();
		assert!(sut_layer
		.load::<#{SharedCredentialsCache}>()
		.is_none());
		let operation_config_override = crate::config::Config::builder()
		.credentials_cache(#{CredentialsCache}::no_caching())
		.credentials_provider(credentials.clone())
		.region(#{Region}::new("us-west-2"));

		let _ = client
		.say_hello()
		.customize()
		.await
		.unwrap()
		.config_override(operation_config_override)
		.send()
		.await
		.expect("success");
		""",
		*codegenScope,
		)

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ class ConfigOverrideRuntimePluginGenerator(
		}

		impl ConfigOverrideRuntimePlugin {
		##[allow(dead_code)] // unused when a service does not provide any operations
		pub(crate) fn new(
		config_override: Builder,
		initial_config: #{FrozenLayer},

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ class CustomizableOperationGenerator(

		impl<T, E, B> CustomizableOperation<T, E, B> {
		/// Creates a new `CustomizableOperation` from `customizable_send`.
		##[allow(dead_code)] // unused when a service does not provide any operations
		pub(crate) fn new(customizable_send: B) -> Self {
		Self {
		customizable_send,