Move converters from constraint violations into ValidationException to decorators
#2302
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package software.amazon.smithy.rust.codegen.client.testutil | ||
|
|
||
| import software.amazon.smithy.build.PluginContext | ||
| import software.amazon.smithy.build.SmithyBuildPlugin | ||
| import software.amazon.smithy.model.Model | ||
| import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext | ||
| import software.amazon.smithy.rust.codegen.client.smithy.RustClientCodegenPlugin | ||
| import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator | ||
| import software.amazon.smithy.rust.codegen.core.smithy.RustCrate | ||
| import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams | ||
| import software.amazon.smithy.rust.codegen.core.testutil.codegenIntegrationTest | ||
| import java.nio.file.Path | ||
|
|
||
| fun clientIntegrationTest( | ||
| model: Model, | ||
| params: IntegrationTestParams = IntegrationTestParams(), | ||
| additionalDecorators: List<ClientCodegenDecorator> = listOf(), | ||
| test: (ClientCodegenContext, RustCrate) -> Unit = { _, _ -> }, | ||
| ): Path { | ||
| fun invokeRustCodegenPlugin(ctx: PluginContext) { | ||
| val codegenDecorator = object : ClientCodegenDecorator { | ||
| override val name: String = "Add tests" | ||
| override val order: Byte = 0 | ||
|
|
||
| override fun classpathDiscoverable(): Boolean = false | ||
|
|
||
| override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) { | ||
| test(codegenContext, rustCrate) | ||
| } | ||
| } | ||
| RustClientCodegenPlugin().executeWithDecorator(ctx, codegenDecorator, *additionalDecorators.toTypedArray()) | ||
| } | ||
| return codegenIntegrationTest(model, params, invokePlugin = ::invokeRustCodegenPlugin) | ||
| } | ||
|
|
||
| /** | ||
| * A `SmithyBuildPlugin` that accepts an additional decorator. | ||
| * | ||
| * This exists to allow tests to easily customize the _real_ build without needing to list out customizations | ||
| * or attempt to manually discover them from the path. | ||
| */ | ||
| abstract class ClientDecoratableBuildPlugin : SmithyBuildPlugin { | ||
| abstract fun executeWithDecorator( | ||
| context: PluginContext, | ||
| vararg decorator: ClientCodegenDecorator, | ||
| ) | ||
|
|
||
| override fun execute(context: PluginContext) { | ||
| executeWithDecorator(context) | ||
| } | ||
| } |
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,45 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package software.amazon.smithy.rust.codegen.core.testutil | ||
|
|
||
| import software.amazon.smithy.build.PluginContext | ||
| import software.amazon.smithy.model.Model | ||
| import software.amazon.smithy.model.node.ObjectNode | ||
| import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig | ||
| import software.amazon.smithy.rust.codegen.core.util.runCommand | ||
| import java.io.File | ||
| import java.nio.file.Path | ||
|
|
||
| /** | ||
| * A helper class holding common data with defaults that is threaded through several functions, to make their | ||
| * signatures shorter. | ||
| */ | ||
| data class IntegrationTestParams( | ||
| val addModuleToEventStreamAllowList: Boolean = false, | ||
| val service: String? = null, | ||
| val runtimeConfig: RuntimeConfig? = null, | ||
| val additionalSettings: ObjectNode = ObjectNode.builder().build(), | ||
| val overrideTestDir: File? = null, | ||
| val command: ((Path) -> Unit)? = null, | ||
| ) | ||
|
|
||
| /** | ||
| * Run cargo test on a true, end-to-end, codegen product of a given model. | ||
| */ | ||
| fun codegenIntegrationTest(model: Model, params: IntegrationTestParams, invokePlugin: (PluginContext) -> Unit): Path { | ||
| val (ctx, testDir) = generatePluginContext( | ||
| model, | ||
| params.additionalSettings, | ||
| params.addModuleToEventStreamAllowList, | ||
| params.service, | ||
| params.runtimeConfig, | ||
| params.overrideTestDir, | ||
| ) | ||
| invokePlugin(ctx) | ||
| ctx.fileManifest.printGeneratedFiles() | ||
| params.command?.invoke(testDir) ?: "cargo test".runCommand(testDir, environment = mapOf("RUSTFLAGS" to "-D warnings")) | ||
| return testDir | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.RustModule | |
| import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter | ||
| import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext | ||
| import software.amazon.smithy.rust.codegen.core.smithy.CodegenTarget | ||
| import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker | ||
| import software.amazon.smithy.rust.codegen.core.smithy.ErrorsModule | ||
| import software.amazon.smithy.rust.codegen.core.smithy.ModelsModule | ||
| import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType | ||
|
|
@@ -118,11 +119,15 @@ object EventStreamTestTools { | |
| val symbolProvider = codegenContext.symbolProvider | ||
| val operationShape = model.expectShape(ShapeId.from("test#TestStreamOp")) as OperationShape | ||
| val unionShape = model.expectShape(ShapeId.from("test#TestStream")) as UnionShape | ||
| val walker = DirectedWalker(model) | ||
|
|
||
| val project = TestWorkspace.testProject(symbolProvider) | ||
| val operationSymbol = symbolProvider.toSymbol(operationShape) | ||
| project.withModule(ErrorsModule) { | ||
| val errors = model.serviceShapes | ||
|
There was a problem hiding this comment. @jdisanti What do you think about replacing these tests: by simple |
||
| .flatMap { walker.walkShapes(it) } | ||
| .filterIsInstance<StructureShape>() | ||
| .filter { shape -> shape.hasTrait<ErrorTrait>() } | ||
| requirements.renderOperationError(this, model, symbolProvider, operationSymbol, errors) | ||
| requirements.renderOperationError(this, model, symbolProvider, symbolProvider.toSymbol(unionShape), errors) | ||
| for (shape in errors) { | ||
|
|
||
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
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.
Nice!