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.

Sign up for GitHub

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

Jump to bottom

feat(cloudformation): request and response models for custom resources #19

Merged

tomerd merged 6 commits into swift-server:main from ydataai:feat/cloudformation_custom_resource_lambda

May 21, 2022

Contributor

renatoaguimaraes commented May 20, 2022 •

edited

Mapping Request and Response of CustomResource used by Type: AWS::Lambda::Function.

Motivation:

Avoid to write repeated code for every Swift Lambda Function where is used a CustomResource to pass properties. Inspired on event.go and response.go from https://github.com/aws/aws-lambda-go.git.

Modifications:

Added two new structs: Request and Response for Lambda event triggered by CloudFormation.

Result:

New models to be shared between Swift Lambda Functions that use CustomResource.


          feat(cloudformation): request and response models for custom resources

29e275c

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

5 similar comments

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

swift-server-bot commented May 20, 2022

Can one of the admins verify this patch?

Contributor

tomerd commented May 20, 2022

thank you so much @renatoaguimaraes, would you mind adding a unit test following the examples of the other events

Contributor Author

renatoaguimaraes commented May 20, 2022

thank you so much @renatoaguimaraes, would you mind adding a unit test following the examples of the other events

Sure, I will follow the existing examples. Thanks.


          unit test, files merge and rename

2eb6f63

renatoaguimaraes force-pushed the feat/cloudformation_custom_resource_lambda branch from 08b43de to 2eb6f63 Compare

May 20, 2022 16:42

Contributor Author

renatoaguimaraes commented May 20, 2022 •

edited

Hello @tomerd. Can you take a look? Thank you.

renatoaguimaraes added 2 commits

May 20, 2022 13:56


          mark ResourceProperties as optional

a60c6e1


          fix unit test

19e6db9

Contributor

tomerd commented May 20, 2022

@swift-server-bot test this please

Contributor

tomerd commented May 21, 2022

@renatoaguimaraes looks like the new tests are failing?

Contributor Author

renatoaguimaraes commented May 21, 2022 •

edited

@renatoaguimaraes looks like the new tests are failing?

Yes, there is one scenario failing. I'm running the new unit tests on Mac OS 12.3.1 + Swift 5.6.1 with success and the project pipeline is running the tests on swift:5.4-amazonlinux2. It seems to me an implementation detail that depends on the environment, where the order of attributes is changing for some reason. But that's ok, I'll think in another way to test this specific scenario.

Running on swift:5.4-amazonlinux2.

Expected:

("Optional("{\"StackId\":\"arn:aws:cloudformation:us-east-1:123456789:stack\\/TestStack\",\"Reason\":\"See the details in CloudWatch Log Stream\",\"NoEcho\":false,\"Status\":\"SUCCESS\",\"LogicalResourceId\":\"TestLogicalResource\",\"RequestId\":\"cdc73f9d-aea9-11e3-9d5a-835b769c0d9c\",\"Data\":{\"property2\":\"\",\"property3\":[\"1\",\"2\",\"3\"],\"property1\":\"value1\"},\"PhysicalResourceId\":\"TestPhysicalResource\"}")")

Result:

("Optional("{\"NoEcho\":false,\"Data\":{\"property2\":\"\",\"property1\":\"value1\",\"property3\":[\"1\",\"2\",\"3\"]},\"StackId\":\"arn:aws:cloudformation:us-east-1:123456789:stack\\/TestStack\",\"LogicalResourceId\":\"TestLogicalResource\",\"Reason\":\"See the details in CloudWatch Log Stream\",\"Status\":\"SUCCESS\",\"RequestId\":\"cdc73f9d-aea9-11e3-9d5a-835b769c0d9c\",\"PhysicalResourceId\":\"TestPhysicalResource\"}")")

Mac OS 12.3.1 + Swift 5.6.1

Expected:

("Optional("{\"StackId\":\"arn:aws:cloudformation:us-east-1:123456789:stack\\/TestStack\",\"Reason\":\"See the details in CloudWatch Log Stream\",\"NoEcho\":false,\"Status\":\"SUCCESS\",\"LogicalResourceId\":\"TestLogicalResource\",\"RequestId\":\"cdc73f9d-aea9-11e3-9d5a-835b769c0d9c\",\"Data\":{\"property2\":\"\",\"property3\":[\"1\",\"2\",\"3\"],\"property1\":\"value1\"},\"PhysicalResourceId\":\"TestPhysicalResource\"}")")

Result:

("Optional("{\"StackId\":\"arn:aws:cloudformation:us-east-1:123456789:stack\\/TestStack\",\"Reason\":\"See the details in CloudWatch Log Stream\",\"NoEcho\":false,\"Status\":\"SUCCESS\",\"LogicalResourceId\":\"TestLogicalResource\",\"RequestId\":\"cdc73f9d-aea9-11e3-9d5a-835b769c0d9c\",\"Data\":{\"property2\":\"\",\"property3\":[\"1\",\"2\",\"3\"],\"property1\":\"value1\"},\"PhysicalResourceId\":\"TestPhysicalResource\"}")")


          JSONEncoder with sorted output format

85a34a0

Contributor

tomerd commented May 21, 2022

@swift-server-bot test this please

tomerd approved these changes

View reviewed changes

Contributor

tomerd commented May 21, 2022

@renatoaguimaraes looks like some formatting issues left - you can fix that locally by running the formatting task in docker


          code format

bc87538

Contributor

tomerd commented May 21, 2022

@swift-server-bot test this please

tomerd merged commit d6934fe into swift-server:main

Contributor

tomerd commented May 21, 2022

thank you @renatoaguimaraes

Contributor Author

renatoaguimaraes commented May 22, 2022

thank you @renatoaguimaraes

Thank you. It is my pleasure to contribute to the project.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment