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.

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(cfn-include): add support for retrieving Output objects from the template #8821

Merged
merged 51 commits into from
Jul 2, 2020
Merged

feat(cfn-include): add support for retrieving Output objects from the template #8821

merged 51 commits into from
Jul 2, 2020

Conversation

comcalvi
Copy link
Contributor

Closes #8820

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

comcalvi and others added 30 commits June 4, 2020 17:44
@comcalvi
doc: added slack link to readme
db60c27
@comcalvi
Merge branch 'master' into master
5924f3b
@comcalvi @skinny85
Update README.md
f0c85a3 
Co-authored-by: Adam Ruka <adamruka85@gmail.com>
@mergify
Merge branch 'master' into master
f37e60e
@comcalvi
Merge branch 'master' of https://github.com/aws/aws-cdk
83ed743
@comcalvi
added support for Fn::Select, Fn::FindInMap, Fn::Cidr, Fn::GetAZs, Fn…
c6664af 
…::And, Fn::Not, and Fn::Or, including unit tests.
@comcalvi
added support for the 'Fn::Transform' cloudformation intrinsic function.
d0f64d2
@comcalvi
added support for the Fn::Base64 Intrinsic Function
d69e46d
@comcalvi
tested more complex combinations of conditional and non-conditional i…
df1446a 
…ntrinsic functions
@comcalvi
fixed linter issues
132cb4d
@comcalvi
implmented Adam's requests and fixed additional linter issues
ae7c570
@comcalvi
updated README to reflect the newly supported cloudformation functions
7ca707e
@comcalvi
removed quotes from the type of Transform's parameter argument, modif…
63c27a7 
…ied the return type of transform to IResolvable, and updated transform docs
@comcalvi
fixed teseting issue related to Fn::Select
4179271
@comcalvi
Merge branch 'master' into CfnFunctions
117ae63
@comcalvi
fixing merge conflicts
dbb9ef8
@comcalvi
Merge branch 'master' of https://github.com/aws/aws-cdk
bdab761
@comcalvi
Merge branch 'master' of https://github.com/aws/aws-cdk into CfnFunct…
d390580 
…ions
@comcalvi
merge conflict resolution
14a0d64
@comcalvi
Merge branch 'CfnFunctions' of github.com:comcalvi/aws-cdk into CfnFu…
dfb42b9 
…nctions
@comcalvi
Merge branch 'master' of https://github.com/aws/aws-cdk into CfnFunct…
9f1b2d9 
…ions
@comcalvi
fixed typo in condition name
4c9d1ec
@comcalvi
Merge branch 'CfnFunctions'
e15c187
@comcalvi
Merge branch 'master' of https://github.com/aws/aws-cdk
82c4317
@comcalvi
removed parameters from _toCloudFormation()
42c0228
@comcalvi
added support for parameters in templates
6a2df1e
@comcalvi
fixed merge conflict
43198b7
@comcalvi
updated documentation
cd27ff6
@comcalvi
updated readme
1e72465
@comcalvi
incorporated adam's comments
070f902
@skinny85 skinny85 changed the title feat(cloudformation-include): add support for modifying retrieved output objects feat(cfn-include): add support for modifying retrieved output objects Jun 30, 2020
skinny85
skinny85 previously requested changes Jun 30, 2020
View reviewed changes
Copy link
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

Nice work! Some minor comments below.

packages/@aws-cdk/cloudformation-include/README.md Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
@mergify mergify bot dismissed skinny85’s stale review July 1, 2020 01:42

Pull request has been modified.

@skinny85 skinny85 changed the title feat(cfn-include): add support for modifying retrieved output objects feat(cfn-include): add support for retrieving Output objects from the template Jul 1, 2020
skinny85
skinny85 previously requested changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@skinny85 skinny85 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Nice work! We're getting very close, mostly just documentation and test changes.

I feel like we're also missing some negative tests (what happens when a Condition an Output uses a GetAtt / Ref whose target doesn't exist? What if it uses a Condition that doesn't exist? etc.).

packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/test-templates/outputs-with-references.json Show resolved Hide resolved
packages/@aws-cdk/core/lib/cfn-output.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/valid-templates.test.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/valid-templates.test.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/valid-templates.test.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/valid-templates.test.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/lib/cfn-include.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/cloudformation-include/test/valid-templates.test.ts Show resolved Hide resolved
@skinny85
Copy link
Contributor

skinny85 commented Jul 1, 2020

@eladb @rix0rrr this change contains modifications to the CfnOutput class to make it mutable, like all L1s, and CfnCondition, for example. Let us know if you have any objections to this.

@mergify mergify bot dismissed skinny85’s stale review July 1, 2020 21:47

Pull request has been modified.

@comcalvi comcalvi requested a review from skinny85 July 1, 2020 21:50
@skinny85 skinny85 added the pr/do-not-merge This PR should not be merged at this time. label Jul 1, 2020
skinny85
skinny85 previously approved these changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

Looks great! Added 'do-not-merge' so that @eladb and @rix0rrr have a chance to weigh in if they want to.

@mergify mergify bot dismissed skinny85’s stale review July 1, 2020 22:23

Pull request has been modified.

@skinny85 skinny85 requested review from eladb and rix0rrr July 2, 2020 03:43
@skinny85 skinny85 removed the pr/do-not-merge This PR should not be merged at this time. label Jul 2, 2020
@mergify
Copy link
Contributor

mergify bot commented Jul 2, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 18caef0
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Jul 2, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 0b09bbb into aws:master Jul 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skinny85 skinny85 skinny85 approved these changes

@eladb eladb Awaiting requested review from eladb

@rix0rrr rix0rrr Awaiting requested review from rix0rrr

Assignees

@skinny85 skinny85

Labels
None yet
Projects
None yet
Milestone
[DevPreview] @aws-cdk/cloudformation-...
Development

Successfully merging this pull request may close these issues.

[cloudformation-include] Add support for retrieving and modifying output objects from templates
3 participants
@comcalvi @skinny85 @aws-cdk-automation