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

fix: correctly emit quoted YAML for account numbers #1105

Merged
merged 2 commits into from
Nov 8, 2018
Merged

fix: correctly emit quoted YAML for account numbers #1105

merged 2 commits into from
Nov 8, 2018

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Nov 7, 2018

Switch back to the newly-fixed 'yaml' package so that we can get
both correct quoting of strings with leading '0' characters and
correct quoting of strings with colon ':' characters.

Fixes #1100, fixes #1098.

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

fix: correctly emit quoted YAML for account numbers
28232ff 
Switch back to the newly-fixed 'yaml' package so that we can get
both correct quoting of strings with leading '0' characters and
correct quoting of strings with colon ':' characters.

Fixes #1100, fixes #1098.
eladb
eladb approved these changes Nov 7, 2018
View reviewed changes
Copy link
Contributor

@eladb eladb left a comment

Choose a reason for hiding this comment

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

Please paste the output of running CDK toolkit integration tests

@rix0rrr
Copy link
Contributor Author

rix0rrr commented Nov 8, 2018 

(Rico Huijbers/Isengard) integ-tests$ ./test.sh
============================================================================================
test-cdk-deploy-all.sh
============================================================================================
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/cdk@0.15.1
+ @aws-cdk/aws-sns@0.15.1
added 24 packages from 7 contributors in 0.811s
found 0 vulnerabilities

cdk-toolkit-integration-test-1
cdk-toolkit-integration-test-1: deploying...
cdk-toolkit-integration-test-1: creating CloudFormation changeset...
 0/2 | 12:10:35 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic (topic69831491) 
 0/2 | 12:10:35 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic (topic69831491) Resource creation Initiated
 1/2 | 12:10:45 | CREATE_COMPLETE      | AWS::SNS::Topic | topic (topic69831491) 
 2/2 | 12:10:47 | CREATE_COMPLETE      | AWS::CloudFormation::Stack | cdk-toolkit-integration-test-1 

 ✅  cdk-toolkit-integration-test-1

Stack ARN:
cdk-toolkit-integration-test-2
cdk-toolkit-integration-test-2: deploying...
cdk-toolkit-integration-test-2: creating CloudFormation changeset...
 0/3 | 12:11:00 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) 
 0/3 | 12:11:00 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) Resource creation Initiated
 0/3 | 12:11:00 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 0/3 | 12:11:01 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) Resource creation Initiated
 1/3 | 12:11:10 | CREATE_COMPLETE      | AWS::SNS::Topic | topic1 (topic152D84A37) 
 2/3 | 12:11:11 | CREATE_COMPLETE      | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 3/3 | 12:11:12 | CREATE_COMPLETE      | AWS::CloudFormation::Stack | cdk-toolkit-integration-test-2 

 ✅  cdk-toolkit-integration-test-2

Stack ARN:
Stack deployed successfully
cdk-toolkit-integration-test-1: destroying...

 ✅  cdk-toolkit-integration-test-1: destroyed
cdk-toolkit-integration-test-2: destroying...

 ✅  cdk-toolkit-integration-test-2: destroyed
✅  success
============================================================================================
test-cdk-deploy.sh
============================================================================================
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/cdk@0.15.1
+ @aws-cdk/aws-sns@0.15.1
added 24 packages from 7 contributors in 1.323s
found 0 vulnerabilities

cdk-toolkit-integration-test-2: deploying...
cdk-toolkit-integration-test-2: creating CloudFormation changeset...
 0/3 | 12:11:45 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) 
 0/3 | 12:11:46 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) Resource creation Initiated
 0/3 | 12:11:46 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 0/3 | 12:11:47 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) Resource creation Initiated
 1/3 | 12:11:56 | CREATE_COMPLETE      | AWS::SNS::Topic | topic1 (topic152D84A37) 
 2/3 | 12:11:57 | CREATE_COMPLETE      | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 3/3 | 12:11:59 | CREATE_COMPLETE      | AWS::CloudFormation::Stack | cdk-toolkit-integration-test-2 

 ✅  cdk-toolkit-integration-test-2

Stack ARN:
Stack deployed successfully
| assert that last command returned 1 line(s)
cdk-toolkit-integration-test-2: destroying...

 ✅  cdk-toolkit-integration-test-2: destroyed
✅  success
============================================================================================
test-cdk-deploy-with-role.sh
============================================================================================

An error occurred (NoSuchEntity) when calling the ListRolePolicies operation: The role with name cdk-integ-test-role cannot be found.

An error occurred (NoSuchEntity) when calling the DeleteRole operation: The role with name cdk-integ-test-role cannot be found.
Role does not exist yet
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/aws-sns@0.15.1
+ @aws-cdk/cdk@0.15.1
added 24 packages from 7 contributors in 4.824s
found 0 vulnerabilities

cdk-toolkit-integration-test-2: deploying...
cdk-toolkit-integration-test-2: creating CloudFormation changeset...
 0/3 | 12:12:31 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 0/3 | 12:12:31 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) 
 0/3 | 12:12:31 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic2 (topic2A4FB547F) Resource creation Initiated
 0/3 | 12:12:31 | CREATE_IN_PROGRESS   | AWS::SNS::Topic | topic1 (topic152D84A37) Resource creation Initiated
 1/3 | 12:12:42 | CREATE_COMPLETE      | AWS::SNS::Topic | topic1 (topic152D84A37) 
 2/3 | 12:12:42 | CREATE_COMPLETE      | AWS::SNS::Topic | topic2 (topic2A4FB547F) 
 3/3 | 12:12:44 | CREATE_COMPLETE      | AWS::CloudFormation::Stack | cdk-toolkit-integration-test-2 

 ✅  cdk-toolkit-integration-test-2

Stack ARN:
Stack deployed successfully
| assert that last command returned 1 line(s)
cdk-toolkit-integration-test-2: destroying...

 ✅  cdk-toolkit-integration-test-2: destroyed
✅  success
============================================================================================
test-cdk-diff.sh
============================================================================================
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/aws-sns@0.15.1
+ @aws-cdk/cdk@0.15.1
added 24 packages from 7 contributors in 1.23s
found 0 vulnerabilities

| assert that last command returned 1 line(s)
| assert that last command returned 2 line(s)
✅  success
============================================================================================
test-cdk-ls.sh
============================================================================================
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/cdk@0.15.1
+ @aws-cdk/aws-sns@0.15.1
added 24 packages from 7 contributors in 0.783s
found 0 vulnerabilities

| running cdk ls
✅  success
============================================================================================
test-cdk-synth.sh
============================================================================================
| ensuring cdk-toolkit-integration-test-1 is cleaned up
| ensuring cdk-toolkit-integration-test-2 is cleaned up
npm WARN enoent ENOENT: no such file or directory, open '/tmp/cdk-integ-test/package.json'
npm WARN cdk-integ-test No description
npm WARN cdk-integ-test No repository field.
npm WARN cdk-integ-test No README data
npm WARN cdk-integ-test No license field.

+ @aws-cdk/cdk@0.15.1
+ @aws-cdk/aws-sns@0.15.1
added 24 packages from 7 contributors in 1.298s
found 0 vulnerabilities

| running cdk synth cdk-toolkit-integration-test-1
| running cdk synth cdk-toolkit-integration-test-2
✅  success

@rix0rrr rix0rrr merged commit b4d9155 into master Nov 8, 2018
@rix0rrr rix0rrr deleted the huijbers/and-back-to-yaml branch November 8, 2018 11:49
rix0rrr pushed a commit that referenced this pull request Nov 8, 2018
v0.15.2
1ce5f27 
Bug Fixes
==========

* correctly emit quoted YAML for account numbers ([#1105](#1105)) ([b4d9155](b4d9155)), closes [#1100](#1100) [#1098](#1098)
* **aws-ecs:** fix use of published NPM package with TypeScript ([#1117](#1117)) ([ebfb522](ebfb522))

Features
==========

* **aws-ecs:** Add desired count to LoadBalanced[Fargate|EC2]Service ([#1111](#1111)) ([cafcc11](cafcc11))
@rix0rrr rix0rrr mentioned this pull request Nov 8, 2018
Merged
rix0rrr added a commit that referenced this pull request Nov 8, 2018
@rix0rrr
v0.15.2 (#1118)
570bd9f 
Bug Fixes
==========

* correctly emit quoted YAML for account numbers ([#1105](#1105)) ([b4d9155](b4d9155)), closes [#1100](#1100) [#1098](#1098)
* **aws-ecs:** fix use of published NPM package with TypeScript ([#1117](#1117)) ([ebfb522](ebfb522))

Features
==========

* **aws-ecs:** Add desired count to LoadBalanced[Fargate|EC2]Service ([#1111](#1111)) ([cafcc11](cafcc11))
@NGL321 NGL321 added the contribution/core This is a PR that came from AWS. label Sep 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eladb eladb eladb approved these changes

@RomainMuller RomainMuller Awaiting requested review from RomainMuller

Assignees
No one assigned
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
3 participants
@rix0rrr @eladb @NGL321