Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc: add x-amzn-query-mode customization #1455

Merged
merged 6 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/20e287a5-cee0-4a5f-9d08-4022dcdee843.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "20e287a5-cee0-4a5f-9d08-4022dcdee843",
"type": "misc",
"description": "Send x-amzn-query-mode=true for services with query-compatible trait"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package aws.sdk.kotlin.codegen.customization

import software.amazon.smithy.aws.traits.protocols.AwsQueryCompatibleTrait
import software.amazon.smithy.kotlin.codegen.KotlinSettings
import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
import software.amazon.smithy.kotlin.codegen.model.hasTrait
import software.amazon.smithy.kotlin.codegen.rendering.protocol.MutateHeadersMiddleware
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
import software.amazon.smithy.model.Model

/**
* Send an extra `x-amzn-query-mode` header with a value of `true` for services which have the [AwsQueryCompatibleTrait] applied.
*/
class AwsQueryModeCustomization : KotlinIntegration {
override fun enabledForService(model: Model, settings: KotlinSettings): Boolean =
model
.getShape(settings.service)
.get()
.hasTrait<AwsQueryCompatibleTrait>()

override fun customizeMiddleware(ctx: ProtocolGenerator.GenerationContext, resolved: List<ProtocolMiddleware>): List<ProtocolMiddleware> =
resolved + MutateHeadersMiddleware(extraHeaders = mapOf("x-amzn-query-mode" to "true"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ aws.sdk.kotlin.codegen.customization.s3.express.S3ExpressIntegration
aws.sdk.kotlin.codegen.customization.s3.S3ExpiresIntegration
aws.sdk.kotlin.codegen.BusinessMetricsIntegration
aws.sdk.kotlin.codegen.smoketests.SmokeTestsDenyListIntegration
aws.sdk.kotlin.codegen.customization.AwsQueryModeCustomization
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package aws.sdk.kotlin.codegen.customization

import aws.sdk.kotlin.codegen.testutil.lines
import software.amazon.smithy.kotlin.codegen.test.*
import kotlin.test.Test
import kotlin.test.assertFalse
import kotlin.test.assertTrue

class AwsQueryModeCustomizationTest {
private val queryCompatibleModel = """
namespace com.test

use aws.protocols#awsJson1_0
use aws.protocols#awsQueryCompatible
use aws.api#service

@awsJson1_0
@awsQueryCompatible
@service(sdkId: "QueryCompatible")
service QueryCompatible {
version: "1.0.0",
operations: [GetFoo]
}

@http(method: "POST", uri: "/foo")
operation GetFoo {
input: GetFooInput
}

structure GetFooInput {
payload: String
}
"""
.trimIndent()
.toSmithyModel()

private val nonQueryCompatibleModel = """
namespace com.test

use aws.protocols#awsJson1_0
use aws.protocols#awsQueryCompatible
use aws.api#service

@awsJson1_0
@service(sdkId: "NonQueryCompatible")
service NonQueryCompatible {
version: "1.0.0",
operations: [GetFoo]
}

@http(method: "POST", uri: "/foo")
operation GetFoo {
input: GetFooInput
}

structure GetFooInput {
payload: String
}
"""
.trimIndent()
.toSmithyModel()

@Test
fun testEnabledForQueryCompatibleModel() {
assertTrue {
AwsQueryModeCustomization()
.enabledForService(queryCompatibleModel, queryCompatibleModel.defaultSettings())
}
}

@Test
fun testNotExpectedForNonQueryCompatibleModel() {
assertFalse {
AwsQueryModeCustomization()
.enabledForService(nonQueryCompatibleModel, nonQueryCompatibleModel.defaultSettings())
}
}

@Test
fun `x-amzn-query-mode applied`() {
val ctx = queryCompatibleModel.newTestContext("QueryCompatible", integrations = listOf(AwsQueryModeCustomization()))
val generator = MockHttpProtocolGenerator(queryCompatibleModel)
generator.generateProtocolClient(ctx.generationCtx)

ctx.generationCtx.delegator.finalize()
ctx.generationCtx.delegator.flushWriters()

val actual = ctx.manifest.expectFileString("/src/main/kotlin/com/test/DefaultTestClient.kt")

val getFooMethod = actual.lines(" override suspend fun getFoo(input: GetFooRequest): GetFooResponse {", " }")

val expectedHeaderMutation = """
op.install(
MutateHeaders().apply {
append("x-amzn-query-mode", "true")
}
)
""".replaceIndent(" ")

getFooMethod.shouldContainOnlyOnceWithDiff(expectedHeaderMutation)
}

@Test
fun `x-amzn-query-mode NOT applied`() {
val ctx = nonQueryCompatibleModel.newTestContext("NonQueryCompatible", integrations = listOf())
val generator = MockHttpProtocolGenerator(nonQueryCompatibleModel)
generator.generateProtocolClient(ctx.generationCtx)

ctx.generationCtx.delegator.finalize()
ctx.generationCtx.delegator.flushWriters()

val actual = ctx.manifest.expectFileString("/src/main/kotlin/com/test/DefaultTestClient.kt")

val getFooMethod = actual.lines(" override suspend fun getFoo(input: GetFooRequest): GetFooResponse {", " }")

val unexpectedHeaderMutation = """
op.install(
MutateHeaders().apply {
append("x-amzn-query-mode", "true")
}
)
""".replaceIndent(" ")

getFooMethod.shouldNotContainOnlyOnceWithDiff(unexpectedHeaderMutation)
}
}
Loading