-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix auth scheme issue by registering auth schemes as a default-level …
…client plugin
- Loading branch information
Showing
16 changed files
with
256 additions
and
107 deletions.
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
78 changes: 78 additions & 0 deletions
78
...oftware/amazon/smithy/rust/codegen/client/smithy/generators/AuthOptionsPluginGenerator.kt
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,78 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package software.amazon.smithy.rust.codegen.client.smithy.generators | ||
|
|
||
| import software.amazon.smithy.model.knowledge.ServiceIndex | ||
| import software.amazon.smithy.model.shapes.OperationShape | ||
| import software.amazon.smithy.model.traits.OptionalAuthTrait | ||
| import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext | ||
| import software.amazon.smithy.rust.codegen.client.smithy.customizations.noAuthSchemeShapeId | ||
| import software.amazon.smithy.rust.codegen.client.smithy.customize.AuthSchemeOption | ||
| import software.amazon.smithy.rust.codegen.core.rustlang.Writable | ||
| import software.amazon.smithy.rust.codegen.core.rustlang.isEmpty | ||
| import software.amazon.smithy.rust.codegen.core.rustlang.join | ||
| 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.util.PANIC | ||
| import software.amazon.smithy.rust.codegen.core.util.hasTrait | ||
| import java.util.logging.Logger | ||
|
|
||
| class AuthOptionsPluginGenerator(private val codegenContext: ClientCodegenContext) { | ||
| private val runtimeConfig = codegenContext.runtimeConfig | ||
|
|
||
| private val logger: Logger = Logger.getLogger(javaClass.name) | ||
| fun authPlugin(operationShape: OperationShape, authSchemeOptions: List<AuthSchemeOption>) = writable { | ||
| rustTemplate( | ||
| """ | ||
| #{DefaultAuthOptionsPlugin}::new(vec![#{options}]) | ||
| """, | ||
| "DefaultAuthOptionsPlugin" to RuntimeType.defaultAuthPlugin(runtimeConfig), | ||
| "options" to actualAuthSchemes(operationShape, authSchemeOptions).join(", "), | ||
| ) | ||
| } | ||
|
|
||
| private fun actualAuthSchemes(operationShape: OperationShape, authSchemeOptions: List<AuthSchemeOption>): List<Writable> { | ||
| val out: MutableList<Writable> = mutableListOf() | ||
|
|
||
| var noSupportedAuthSchemes = true | ||
| val authSchemes = ServiceIndex.of(codegenContext.model) | ||
| .getEffectiveAuthSchemes(codegenContext.serviceShape, operationShape) | ||
|
|
||
| for (schemeShapeId in authSchemes.keys) { | ||
| val optionsForScheme = authSchemeOptions.filter { | ||
| when (it) { | ||
| is AuthSchemeOption.CustomResolver -> false | ||
| is AuthSchemeOption.StaticAuthSchemeOption -> { | ||
| it.schemeShapeId == schemeShapeId | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (optionsForScheme.isNotEmpty()) { | ||
| out.addAll(optionsForScheme.flatMap { (it as AuthSchemeOption.StaticAuthSchemeOption).constructor }) | ||
| noSupportedAuthSchemes = false | ||
| } else { | ||
| logger.warning( | ||
| "No auth scheme implementation available for $schemeShapeId. " + | ||
| "The generated client will not attempt to use this auth scheme.", | ||
| ) | ||
| } | ||
| } | ||
| if (operationShape.hasTrait<OptionalAuthTrait>() || noSupportedAuthSchemes) { | ||
| val authOption = authSchemeOptions.find { | ||
| it is AuthSchemeOption.StaticAuthSchemeOption && it.schemeShapeId == noAuthSchemeShapeId | ||
| } | ||
| ?: throw IllegalStateException("Missing 'no auth' implementation. This is a codegen bug.") | ||
| out += (authOption as AuthSchemeOption.StaticAuthSchemeOption).constructor | ||
| } | ||
| if (out.any { it.isEmpty() }) { | ||
| PANIC("Got an empty auth scheme constructor. This is a bug. $out") | ||
| } | ||
| return out | ||
| } | ||
| } |
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
Oops, something went wrong.