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

fix: prevent redundant tags being added to AWS::ApiGatewayV2::Api #3615

Merged
merged 3 commits into from
Jun 18, 2024

Conversation

gracelu0
Copy link
Contributor

@gracelu0 gracelu0 commented Jun 17, 2024

Issue #, if available

Currently if a user sets PropagateTags to True in the "AWS::Serverless::HttpApi" resource and specifies the DefinitionBody property with an OpenApi definition, they will encounter the following deploy-time error:

Redundant fields [tags={"TagKey":"TagValue","httpapi:createdBy":"SAM"}] provided when either Body or BodyS3Location is not empty

CloudFormation does not allow both the Tags property being set and x-amazon-apigateway-tag-value being set in the Body property.

Description of changes

Update assign_tags() method for ApiGatewayV2HttpApi class to return (no-op).

For context, Tags can only be defined when DefinitionBody is specified or else we raise an error. Also, DefinitionBody (OpenApi definition) will always be defined because we have a plugin that generates a skeleton OpenApi definition before the transform if the user does not define one. Additionally Tags always gets added to the DefinitionBody (see x-amazon-apigateway-tag-value property).

For AWS::ApiGatewayV2::Api resource, CloudFormation does not allow Tags to be defined if the Body property is specified. SAM ensures Body will always be defined. Therefore no need to add Tags property (doing so will only cause the error specified above).

Description of how you validated changes

Added transform tests and updated existing transform tests which would fail on deployment currently. Ran make test and all tests pass.

Also reproduced error and deploying the updated template succeeds without errors

Checklist

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@gracelu0 gracelu0 requested a review from a team as a code owner June 17, 2024 23:22
samtranslator/model/apigatewayv2.py Outdated Show resolved Hide resolved
Copy link
Contributor

@GavinZZ GavinZZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noice

@gracelu0 gracelu0 enabled auto-merge (squash) June 18, 2024 21:46
@gracelu0 gracelu0 merged commit 21823a3 into aws:develop Jun 18, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants