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

feat(cfn-include): add support for Conditions #8144

Merged
merged 2 commits into from
Jun 2, 2020

Conversation

skinny85
Copy link
Contributor

This change adds the capability to retrieve CfnCondition objects
from the template ingested by the CfnInclude class,
using a new method getCondition.
It also correctly populates the cfnOptions.condition
property of the L1 resources if they use the Condition resource attribute,
as well as adding support for the Fn::Equals function.


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

@skinny85 skinny85 requested a review from nija-at May 22, 2020 00:54
@skinny85 skinny85 self-assigned this May 22, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label May 22, 2020
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@nija-at nija-at added the pr/do-not-merge This PR should not be merged at this time. label May 22, 2020
Copy link
Contributor

@nija-at nija-at left a comment

Choose a reason for hiding this comment

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

Love short and sweet PRs 😊

Some minor questions below.

@skinny85 skinny85 removed the pr/do-not-merge This PR should not be merged at this time. label Jun 1, 2020
@mergify
Copy link
Contributor

mergify bot commented Jun 1, 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).

This change adds the capability to retrieve CfnCondition objects
from the template ingested by the CfnInclude class,
using a new method getCondition.
It also correctly populates the cfnOptions.condition
property of the L1 resources if they use the Condition resource attribute,
as well as adding support for the Fn::Equals function.
@skinny85 skinny85 force-pushed the feat/cfn-include-v2.0-conditions branch from 9f0a11a to 41ee9ec Compare June 1, 2020 23:52
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 0938b0e
  • 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 Jun 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 33212d2 into aws:master Jun 2, 2020
@skinny85 skinny85 deleted the feat/cfn-include-v2.0-conditions branch June 2, 2020 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants