Add `ServerCombinedErrorGeneratorTest.kt` (#1174) (1f738564) · Commits · Public Repositories / Smithy Rust

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerCodegenVisitor.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ import software.amazon.smithy.model.shapes.StructureShape
		import software.amazon.smithy.model.shapes.UnionShape
		import software.amazon.smithy.model.traits.EnumTrait
		import software.amazon.smithy.model.transform.ModelTransformer
		import software.amazon.smithy.rust.codegen.rustlang.rust
		import software.amazon.smithy.rust.codegen.server.smithy.generators.ServerServiceGenerator
		import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerProtocolLoader
		import software.amazon.smithy.rust.codegen.smithy.CodegenContext
		@@ -30,6 +29,7 @@ import software.amazon.smithy.rust.codegen.smithy.customize.RustCodegenDecorator
		import software.amazon.smithy.rust.codegen.smithy.generators.BuilderGenerator
		import software.amazon.smithy.rust.codegen.smithy.generators.EnumGenerator
		import software.amazon.smithy.rust.codegen.smithy.generators.StructureGenerator
		import software.amazon.smithy.rust.codegen.smithy.generators.CodegenTarget
		import software.amazon.smithy.rust.codegen.smithy.generators.UnionGenerator
		import software.amazon.smithy.rust.codegen.smithy.generators.implBlock
		import software.amazon.smithy.rust.codegen.smithy.generators.protocol.ProtocolGenerator
		@@ -165,7 +165,7 @@ class ServerCodegenVisitor(context: PluginContext, private val codegenDecorator:
		override fun structureShape(shape: StructureShape) {
		logger.info("[rust-server-codegen] Generating a structure $shape")
		rustCrate.useShapeWriter(shape) { writer ->
		StructureGenerator(model, symbolProvider, writer, shape).renderServer()
		StructureGenerator(model, symbolProvider, writer, shape).render(CodegenTarget.SERVER)
		val builderGenerator =
		BuilderGenerator(codegenContext.model, codegenContext.symbolProvider, shape)
		builderGenerator.render(writer)

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/testutil/ServerTestHelpers.kt

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
		* SPDX-License-Identifier: Apache-2.0.
		*/

		package software.amazon.smithy.rust.codegen.server.smithy.testutil

		import software.amazon.smithy.model.Model
		import software.amazon.smithy.model.shapes.ServiceShape
		import software.amazon.smithy.rust.codegen.server.smithy.RustCodegenServerPlugin
		import software.amazon.smithy.rust.codegen.smithy.CodegenConfig
		import software.amazon.smithy.rust.codegen.smithy.RustSymbolProvider
		import software.amazon.smithy.rust.codegen.smithy.SymbolVisitorConfig
		import software.amazon.smithy.rust.codegen.testutil.TestRuntimeConfig

		val ServerTestSymbolVisitorConfig = SymbolVisitorConfig(
		runtimeConfig = TestRuntimeConfig,
		// These are the settings we default to if the user does not override them in their `smithy-build.json`.
		codegenConfig = CodegenConfig(
		renameExceptions = false,
		includeFluentClient = false,
		addMessageToErrors = false,
		formatTimeoutSeconds = 20,
		eventStreamAllowList = emptySet()
		),
		handleRustBoxing = true,
		handleRequired = true
		)

		fun serverTestSymbolProvider(model: Model, serviceShape: ServiceShape? = null): RustSymbolProvider =
		RustCodegenServerPlugin.baseSymbolProvider(
		model,
		serviceShape ?: ServiceShape.builder().version("test").id("test#Service").build(),
		ServerTestSymbolVisitorConfig
		)

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/ServerCombinedErrorGeneratorTest.kt

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
		* SPDX-License-Identifier: Apache-2.0.
		*/

		package software.amazon.smithy.rust.codegen.smithy.generators

		import org.junit.jupiter.api.Test
		import software.amazon.smithy.model.shapes.StructureShape
		import software.amazon.smithy.rust.codegen.rustlang.RustModule
		import software.amazon.smithy.rust.codegen.server.smithy.generators.ServerCombinedErrorGenerator
		import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverTestSymbolProvider
		import software.amazon.smithy.rust.codegen.smithy.transformers.OperationNormalizer
		import software.amazon.smithy.rust.codegen.testutil.TestWorkspace
		import software.amazon.smithy.rust.codegen.testutil.asSmithyModel
		import software.amazon.smithy.rust.codegen.testutil.compileAndTest
		import software.amazon.smithy.rust.codegen.testutil.renderWithModelBuilder
		import software.amazon.smithy.rust.codegen.testutil.unitTest
		import software.amazon.smithy.rust.codegen.util.lookup

		class ServerCombinedErrorGeneratorTest {
		private val baseModel = """
		namespace error

		operation Greeting {
		errors: [InvalidGreeting, ComplexError, FooException]
		}

		@error("client")
		@retryable
		structure InvalidGreeting {
		@required
		message: String,
		}

		@error("server")
		structure FooException { }

		@error("server")
		structure ComplexError {
		abc: String,
		other: Integer
		}
		""".asSmithyModel()
		private val model = OperationNormalizer.transform(baseModel)
		private val symbolProvider = serverTestSymbolProvider(model)

		@Test
		fun `generates combined error enums`() {
		val project = TestWorkspace.testProject(symbolProvider)
		project.withModule(RustModule.public("error")) { writer ->
		listOf("FooException", "ComplexError", "InvalidGreeting").forEach {
		model.lookup<StructureShape>("error#$it").renderWithModelBuilder(model, symbolProvider, writer, CodegenTarget.SERVER)
		}
		val generator = ServerCombinedErrorGenerator(model, symbolProvider, model.lookup("error#Greeting"))
		generator.render(writer)

		writer.unitTest(
		name = "generates_combined_error_enums",
		test = """
		let variant = InvalidGreeting::builder().message("an error").build();
		assert_eq!(format!("{}", variant), "InvalidGreeting: an error");
		assert_eq!(variant.message(), "an error");
		assert_eq!(
		variant.retryable_error_kind(),
		aws_smithy_types::retry::ErrorKind::ClientError
		);

		let error = GreetingError::InvalidGreeting(variant);

		// Generate is_xyz methods for errors.
		assert_eq!(error.is_invalid_greeting(), true);
		assert_eq!(error.is_complex_error(), false);

		// Indicate the original name in the display output.
		let error = FooException::builder().build();
		assert_eq!(format!("{}", error), "FooException")
		"""
		)

		println("file:///${project.baseDir}/src/lib.rs")
		println("file:///${project.baseDir}/src/error.rs")
		project.compileAndTest()
		}
		}
		}

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/CodegenTarget.kt

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
		* SPDX-License-Identifier: Apache-2.0.
		*/

		package software.amazon.smithy.rust.codegen.smithy.generators

		/**
		* The artifact type for whom we are generating the structure.
		*/
		enum class CodegenTarget {
		CLIENT, SERVER
		}

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/StructureGenerator.kt

+2 −9

Original line number	Diff line number	Diff line
		@@ -65,17 +65,10 @@ class StructureGenerator(
		}
		private val name = symbolProvider.toSymbol(shape).name

		fun render() {
		fun render(forWhom: CodegenTarget = CodegenTarget.CLIENT) {
		renderStructure()
		errorTrait?.also { errorTrait ->
		ErrorGenerator(symbolProvider, writer, shape, errorTrait).render()
		}
		}

		fun renderServer() {
		renderStructure()
		errorTrait?.also { errorTrait ->
		ErrorGenerator(symbolProvider, writer, shape, errorTrait).renderServer()
		ErrorGenerator(symbolProvider, writer, shape, errorTrait).render(forWhom)
		}
		}