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: update CloudFormation spec to 10.5.0 #6195

Merged
merged 2 commits into from
Feb 11, 2020
Merged

feat: update CloudFormation spec to 10.5.0 #6195

merged 2 commits into from
Feb 11, 2020

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Feb 10, 2020

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

@rix0rrr rix0rrr self-assigned this Feb 10, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Feb 10, 2020
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

nija-at
nija-at suggested changes Feb 10, 2020
View reviewed changes
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.

CHANGELOG.md is missing here?

packages/decdk/package.json Outdated
@@ -165,7 +165,8 @@
"jsii-reflect": "^0.22.0",
"jsonschema": "^1.2.5",
"yaml": "1.7.2",
"yargs": "^15.1.0"
"yargs": "^15.1.0",
"@aws-cdk/aws-appconfig": "1.23.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the dependencies listed here are lexicographically sorted. Let's maintain that.

Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why it's not sorted, I added this in #5329:

aws-cdk/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts

Lines 290 to 301 in 491e2d9

// update decdk
const decdkPkgJsonPath = path.join(require.resolve('decdk'), '..', '..', 'package.json');
const decdkPkg = JSON.parse(await fs.readFile(decdkPkgJsonPath, 'utf8'));
const unorderedDeps = {
...decdkPkg.dependencies,
[packageName]: version
};
decdkPkg.dependencies = {};
Object.keys(unorderedDeps).sort().forEach(k => {
decdkPkg.dependencies[k] = unorderedDeps[k];
});
await fs.writeFile(decdkPkgJsonPath, JSON.stringify(decdkPkg, null, 2) + '\n');

packages/monocdk-experiment/package.json Outdated
@@ -156,7 +156,8 @@
"@aws-cdk/custom-resources": "1.23.0",
"@aws-cdk/cx-api": "1.23.0",
"@aws-cdk/region-info": "1.23.0",
"@types/node": "^10.17.14"
"@types/node": "^10.17.14",
"@aws-cdk/aws-appconfig": "1.23.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

packages/@aws-cdk/cfnspec/build-tools/spec-diff.ts Outdated
Comment on lines 93 to 94
// tslint:disable-next-line:no-console
console.error(JSON.stringify(update, undefined, 2));
Copy link
Contributor

Choose a reason for hiding this comment

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

Left behind from your local debugging?

packages/@aws-cdk/cfnspec/build-tools/spec-diff.ts
update[added] = {};
for (const subKey of Object.keys(data)) {
update[added][`${subKey}__added`] = data[subKey];
/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Over time, we've built up a lot of logic here in spec-diff.ts but it lacks unit tests. We should consider an item in the future to refactor and tests to it.

Not needed as part of this change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Opened an issue - #6198

@rix0rrr rix0rrr requested a review from nija-at February 11, 2020 09:08
@rix0rrr rix0rrr force-pushed the huijbers/cfnspec-10.5.0 branch from 231425a to 12c84be Compare February 11, 2020 09:09
@rix0rrr rix0rrr force-pushed the huijbers/cfnspec-10.5.0 branch from 12c84be to 2fcd837 Compare February 11, 2020 09:09
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • 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 Feb 11, 2020

Thank you for contributing! Your pull request is now being automatically merged.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • 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

  • 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 Feb 11, 2020

Thank you for contributing! Your pull request is now being automatically merged.

@mergify mergify bot merged commit 47a9949 into master Feb 11, 2020
@mergify mergify bot deleted the huijbers/cfnspec-10.5.0 branch February 11, 2020 10:55
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@PatMyron PatMyron mentioned this pull request Feb 24, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nija-at nija-at nija-at approved these changes

@jogold jogold jogold left review comments

@RomainMuller RomainMuller Awaiting requested review from RomainMuller

@eladb eladb Awaiting requested review from eladb

@iliapolo iliapolo Awaiting requested review from iliapolo

@MrArnoldPalmer MrArnoldPalmer Awaiting requested review from MrArnoldPalmer

@shivlaks shivlaks Awaiting requested review from shivlaks

Assignees

@rix0rrr rix0rrr

Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rix0rrr @aws-cdk-automation @RomainMuller @jogold @nija-at