Unverified Commit ec25a35c authored by Zelda Hessler's avatar Zelda Hessler Committed by GitHub
Browse files

exclude invoke operations from SSP (#3695) 

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here -->
aws-sdk-rust#1166

## Description
<!--- Describe your changes in detail -->
SSP shouldn't be enabled for long-running operations that transfer no
data.

## Testing
<!--- Please describe in detail how you tested your changes -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->
Checked the generated lambda SDK to see that SSP has been disabled for
the operations specified.

## Checklist
<!--- If a checkbox below is not applicable, then please DELETE it
rather than leaving it unchecked -->
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the
smithy-rs codegen or runtime crates
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the AWS
SDK, generated SDK code, or SDK runtime crates

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 98a0a5ec

CHANGELOG.next.toml

+12 −0
Original line number Diff line number Diff line
@@ -11,6 +11,18 @@ 
# meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}

# author = "rcoh"



[[aws-sdk-rust]]

message = """

Stalled stream protection will no longer be applied to the following Lambda operations: [Invoke], [InvokeAsync], [InvokeWithResponseStream].



[Invoke]: https://docs.rs/aws-sdk-lambda/latest/aws_sdk_lambda/client/struct.Client.html#method.invoke

[InvokeAsync]: https://docs.rs/aws-sdk-lambda/latest/aws_sdk_lambda/client/struct.Client.html#method.invoke_async

[InvokeWithResponseStream]: https://docs.rs/aws-sdk-lambda/latest/aws_sdk_lambda/client/struct.Client.html#method.invoke_with_response_stream

"""

references = ["aws-sdk-rust#1166", "smithy-rs#3639"]

meta = { "breaking" = false, "tada" = false, "bug" = true }

author = "Velfi"



[[aws-sdk-rust]]

message = "Add documentation on the default configuration to `from_env`, `load_from_env`, `defaults`, and `load_from_defaults` in the `aws-config` crate."

references = ["aws-sdk-rust#1162"]

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import software.amazon.smithy.rustsdk.customize.apigateway.ApiGatewayDecorator 
import software.amazon.smithy.rustsdk.customize.applyDecorators

import software.amazon.smithy.rustsdk.customize.ec2.Ec2Decorator

import software.amazon.smithy.rustsdk.customize.glacier.GlacierDecorator

import software.amazon.smithy.rustsdk.customize.lambda.LambdaDecorator

import software.amazon.smithy.rustsdk.customize.onlyApplyTo

import software.amazon.smithy.rustsdk.customize.route53.Route53Decorator

import software.amazon.smithy.rustsdk.customize.s3.S3Decorator
@@ -66,6 +67,7 @@ val DECORATORS: List<ClientCodegenDecorator> = 
        ApiGatewayDecorator().onlyApplyTo("com.amazonaws.apigateway#BackplaneControlService"),

        Ec2Decorator().onlyApplyTo("com.amazonaws.ec2#AmazonEC2"),

        GlacierDecorator().onlyApplyTo("com.amazonaws.glacier#Glacier"),

        LambdaDecorator().onlyApplyTo("com.amazonaws.lambda#AWSGirApiService"),

        Route53Decorator().onlyApplyTo("com.amazonaws.route53#AWSDnsV20130401"),

        "com.amazonaws.s3#AmazonS3".applyDecorators(

            S3Decorator(),

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/lambda/LambdaDecorator.kt

0 → 100644
+45 −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.rustsdk.customize.lambda



import software.amazon.smithy.model.Model

import software.amazon.smithy.model.shapes.OperationShape

import software.amazon.smithy.model.shapes.ServiceShape

import software.amazon.smithy.model.shapes.ShapeId

import software.amazon.smithy.model.transform.ModelTransformer

import software.amazon.smithy.rust.codegen.client.smithy.ClientRustSettings

import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator

import software.amazon.smithy.rust.codegen.client.smithy.traits.IncompatibleWithStalledStreamProtectionTrait

import software.amazon.smithy.rust.codegen.core.util.letIf

import java.util.logging.Logger



/**

 * Top level decorator for Lambda

 */

class LambdaDecorator : ClientCodegenDecorator {

    private val operationsIncompatibleWithStalledStreamProtection =

        setOf(

            ShapeId.from("com.amazonaws.lambda#Invoke"),

            ShapeId.from("com.amazonaws.lambda#InvokeAsync"),

            ShapeId.from("com.amazonaws.lambda#InvokeWithResponseStream"),

        )



    override val name: String = "Lambda"

    override val order: Byte = 0

    private val logger = Logger.getLogger(javaClass.name)



    override fun transformModel(

        service: ServiceShape,

        model: Model,

        settings: ClientRustSettings,

    ): Model =

        ModelTransformer.create().mapShapes(model) { shape ->

            shape.letIf(shape.id in operationsIncompatibleWithStalledStreamProtection) {

                logger.info("Adding IncompatibleWithStalledStreamProtection trait to $it")

                (it as OperationShape).toBuilder().addTrait(IncompatibleWithStalledStreamProtectionTrait()).build()

            }

        }

}