Connect aws-config token providers to service config via codegen #3443
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package software.amazon.smithy.rustsdk | ||
|
|
||
| import software.amazon.smithy.model.knowledge.ServiceIndex | ||
| import software.amazon.smithy.model.traits.HttpBearerAuthTrait | ||
| import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext | ||
| import software.amazon.smithy.rust.codegen.client.smithy.configReexport | ||
| import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator | ||
| import software.amazon.smithy.rust.codegen.client.smithy.generators.config.ConfigCustomization | ||
| import software.amazon.smithy.rust.codegen.client.smithy.generators.config.ServiceConfig | ||
| import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency | ||
| 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.RuntimeType | ||
| import software.amazon.smithy.rust.codegen.core.smithy.customize.AdHocCustomization | ||
| import software.amazon.smithy.rust.codegen.core.smithy.customize.adhocCustomization | ||
|
|
||
| class TokenProvidersDecorator : ClientCodegenDecorator { | ||
| override val name: String get() = "TokenProvidersDecorator" | ||
| override val order: Byte = 0 | ||
|
|
||
| private fun applies(codegenContext: ClientCodegenContext): Boolean = | ||
| ServiceIndex.of(codegenContext.model).getEffectiveAuthSchemes(codegenContext.serviceShape) | ||
| .containsKey(HttpBearerAuthTrait.ID) | ||
|
|
||
| override fun configCustomizations( | ||
| codegenContext: ClientCodegenContext, | ||
| baseCustomizations: List<ConfigCustomization>, | ||
| ): List<ConfigCustomization> = | ||
| if (applies(codegenContext)) { | ||
| baseCustomizations + TokenProviderConfig(codegenContext) | ||
| } else { | ||
| baseCustomizations | ||
| } | ||
jdisanti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| override fun extraSections(codegenContext: ClientCodegenContext): List<AdHocCustomization> = | ||
| if (applies(codegenContext)) { | ||
jdisanti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| listOf( | ||
| adhocCustomization<SdkConfigSection.CopySdkConfigToClientConfig> { section -> | ||
| rust("${section.serviceConfigBuilder}.set_token_provider(${section.sdkConfig}.token_provider());") | ||
| }, | ||
| ) | ||
| } else { | ||
| emptyList() | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Add a `.token_provider` field and builder to the `Config` for a given service | ||
| */ | ||
| class TokenProviderConfig(private val codegenContext: ClientCodegenContext) : ConfigCustomization() { | ||
| private val runtimeConfig = codegenContext.runtimeConfig | ||
| private val codegenScope = | ||
| arrayOf( | ||
| *RuntimeType.preludeScope, | ||
| "Token" to configReexport(AwsRuntimeType.awsCredentialTypes(runtimeConfig).resolve("Token")), | ||
| "ProvideToken" to | ||
| configReexport( | ||
| AwsRuntimeType.awsCredentialTypes(runtimeConfig) | ||
| .resolve("provider::token::ProvideToken"), | ||
| ), | ||
| "SharedTokenProvider" to | ||
| configReexport( | ||
| AwsRuntimeType.awsCredentialTypes(runtimeConfig) | ||
| .resolve("provider::token::SharedTokenProvider"), | ||
| ), | ||
| "TestToken" to AwsRuntimeType.awsCredentialTypesTestUtil(runtimeConfig).resolve("Token"), | ||
| "HTTP_BEARER_AUTH_SCHEME_ID" to | ||
| CargoDependency.smithyRuntimeApiClient(runtimeConfig) | ||
| .withFeature("http-auth").toType().resolve("client::auth::http").resolve("HTTP_BEARER_AUTH_SCHEME_ID"), | ||
| ) | ||
|
|
||
| override fun section(section: ServiceConfig) = | ||
| writable { | ||
| when (section) { | ||
| ServiceConfig.BuilderImpl -> { | ||
| rustTemplate( | ||
| """ | ||
| /// Sets the access token provider for this service | ||
| pub fn token_provider(mut self, token_provider: impl #{ProvideToken} + 'static) -> Self { | ||
| self.set_token_provider(#{Some}(#{SharedTokenProvider}::new(token_provider))); | ||
jdisanti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| self | ||
| } | ||
|
|
||
| /// Sets the access token provider for this service | ||
| pub fn set_token_provider(&mut self, token_provider: #{Option}<#{SharedTokenProvider}>) -> &mut Self { | ||
| if let Some(token_provider) = token_provider { | ||
| self.runtime_components.set_identity_resolver(#{HTTP_BEARER_AUTH_SCHEME_ID}, token_provider); | ||
| } | ||
| self | ||
| } | ||
| """, | ||
| *codegenScope, | ||
| ) | ||
| } | ||
|
|
||
| is ServiceConfig.DefaultForTests -> | ||
| rustTemplate( | ||
| "${section.configBuilderRef}.set_token_provider(Some(#{SharedTokenProvider}::new(#{TestToken}::for_tests())));", | ||
| *codegenScope, | ||
| ) | ||
|
|
||
| else -> emptySection | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should rename this to
SigV4CredentialsProviderDecoratorThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm slightly hesitant to make it more specific, but could be convinced. It applies to both SigV4 and SigV4a right now, and it could apply to more things in the future.