Add ApiGateway accept header customization (#287) (6b605892) · Commits · Public Repositories / Smithy Rust

.github/workflows/ci.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ name: CI

		env:
		rust_version: 1.50.0
		java_version: 9
		java_version: 14

		jobs:
		style:

aws/sdk-codegen-test/.gitignore

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		smithy-build.json

aws/sdk-codegen-test/README.md

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		# Codegen Integration Test
		This module defines an integration test of the code generation machinery for AWS services. `.build.gradle.kts` will generate a `smithy-build.json` file as part of the build. The Smithy build plugin then invokes our codegen machinery and generates Rust crates.

		This module exists to code generate and execute service specific protocol tests like [ApiGateway](https://github.com/awslabs/smithy/blob/main/smithy-aws-protocol-tests/model/restJson1/services/apigateway.smithy).

		## Usage
		```
		# From repo root:
		./gradlew :aws:sdk-codegen-test:test
		```

aws/sdk-codegen-test/build.gradle.kts

0 → 100644

+123 −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.
		*/

		extra["displayName"] = "Smithy :: Rust :: Codegen :: Test"
		extra["moduleName"] = "software.amazon.smithy.kotlin.codegen.test"

		tasks["jar"].enabled = false

		plugins {
		id("software.amazon.smithy").version("0.5.2")
		}

		val smithyVersion: String by project


		dependencies {
		implementation(project(":aws:sdk-codegen"))
		implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
		implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
		implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
		}

		data class CodegenTest(val service: String, val module: String, val extraConfig: String? = null)

		val CodegenTests = listOf(
		CodegenTest("com.amazonaws.apigateway#BackplaneControlService", "apigateway")
		)

		fun generateSmithyBuild(tests: List<CodegenTest>): String {
		val projections = tests.joinToString(",\n") {
		"""
		"${it.module}": {
		"plugins": {
		"rust-codegen": {
		"runtimeConfig": {
		"relativePath": "${rootProject.projectDir.absolutePath}/rust-runtime"
		},
		"service": "${it.service}",
		"module": "${it.module}",
		"moduleVersion": "0.0.1",
		"build": {
		"rootProject": true
		}
		${it.extraConfig ?: ""}
		}
		}
		}
		""".trimIndent()
		}
		return """
		{
		"version": "1.0",
		"projections": { $projections }
		}
		"""
		}


		task("generateSmithyBuild") {
		description = "generate smithy-build.json"
		doFirst {
		projectDir.resolve("smithy-build.json").writeText(generateSmithyBuild(CodegenTests))
		}
		}


		fun generateCargoWorkspace(tests: List<CodegenTest>): String {
		return """
		[workspace]
		members = [
		${tests.joinToString(",") { "\"${it.module}/rust-codegen\"" }}
		]
		""".trimIndent()
		}
		task("generateCargoWorkspace") {
		description = "generate Cargo.toml workspace file"
		doFirst {
		buildDir.resolve("smithyprojections/sdk-codegen-test/Cargo.toml").writeText(generateCargoWorkspace(CodegenTests))
		}
		}

		tasks["smithyBuildJar"].dependsOn("generateSmithyBuild")
		tasks["assemble"].finalizedBy("generateCargoWorkspace")


		tasks.register<Exec>("cargoCheck") {
		workingDir("build/smithyprojections/sdk-codegen-test/")
		// disallow warnings
		environment("RUSTFLAGS", "-D warnings")
		commandLine("cargo", "check")
		dependsOn("assemble")
		}

		tasks.register<Exec>("cargoTest") {
		workingDir("build/smithyprojections/sdk-codegen-test/")
		// disallow warnings
		environment("RUSTFLAGS", "-D warnings")
		commandLine("cargo", "test")
		dependsOn("assemble")
		}

		tasks.register<Exec>("cargoDocs") {
		workingDir("build/smithyprojections/sdk-codegen-test/")
		// disallow warnings
		environment("RUSTFLAGS", "-D warnings")
		commandLine("cargo", "doc", "--no-deps")
		dependsOn("assemble")
		}

		tasks.register<Exec>("cargoClippy") {
		workingDir("build/smithyprojections/sdk-codegen-test/")
		// disallow warnings
		commandLine("cargo", "clippy", "--", "-D", "warnings", "-Aclippy::upper_case_acronyms", "-Aclippy::large-enum-variant")
		dependsOn("assemble")
		}

		tasks["test"].finalizedBy("cargoCheck", "cargoClippy", "cargoTest", "cargoDocs")

		tasks["clean"].doFirst {
		delete("smithy-build.json")
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		package software.amazon.smithy.rustsdk

		import software.amazon.smithy.rust.codegen.smithy.customize.CombinedCodegenDecorator
		import software.amazon.smithy.rustsdk.customize.apigateway.ApiGatewayCustomizationDecorator

		val DECORATORS = listOf(
		CredentialsProviderDecorator(),
		@@ -15,7 +16,8 @@ val DECORATORS = listOf(
		SigV4SigningDecorator(),
		RetryPolicyDecorator(),
		IntegrationTestDecorator(),
		FluentClientDecorator()
		FluentClientDecorator(),
		ApiGatewayCustomizationDecorator()
		)

		class AwsCodegenDecorator : CombinedCodegenDecorator(DECORATORS) {

Admin message