-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
fix(yaml-cfn): do not deserialize year-month-date as strings #13745
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
.../@aws-cdk/cloudformation-include/test/test-templates/yaml/year-month-date-as-strings.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
AWSTemplateFormatVersion: 2010-09-09 | ||
Resources: | ||
Role: | ||
Type: AWS::IAM::Role | ||
Properties: | ||
AssumeRolePolicyDocument: | ||
Version: 2012-10-17 | ||
Statement: | ||
- Effect: Allow | ||
Principal: | ||
Service: | ||
- ec2.amazonaws.com | ||
Action: | ||
- sts:AssumeRole |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import '@aws-cdk/assert/jest'; | ||
import * as yaml_cfn from '../lib'; | ||
|
||
test('Unquoted year-month-day is treated as a string, not a Date', () => { | ||
const value = yaml_cfn.deserialize('Key: 2020-12-31'); | ||
|
||
expect(value).toEqual({ | ||
Key: '2020-12-31', | ||
}); | ||
}); | ||
|
||
test("Unquoted 'No' is treated as a string, not a boolean", () => { | ||
const value = yaml_cfn.deserialize('Key: No'); | ||
|
||
expect(value).toEqual({ | ||
Key: 'No', | ||
}); | ||
}); | ||
|
||
test("Short-form 'Ref' is deserialized correctly", () => { | ||
const value = yaml_cfn.deserialize('!Ref Resource'); | ||
|
||
expect(value).toEqual({ | ||
Ref: 'Resource', | ||
}); | ||
}); | ||
|
||
test("Short-form 'Fn::GetAtt' is deserialized correctly", () => { | ||
const value = yaml_cfn.deserialize('!GetAtt Resource.Attribute'); | ||
|
||
expect(value).toEqual({ | ||
'Fn::GetAtt': 'Resource.Attribute', | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import '@aws-cdk/assert/jest'; | ||
import * as yaml_cfn from '../lib'; | ||
|
||
test('An object with a single string value is serialized as a simple string', () => { | ||
const value = yaml_cfn.serialize({ key: 'some string' }); | ||
|
||
expect(value).toEqual('key: some string\n'); | ||
}); |
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But are we sure using the
core
schema is not going to break other stuff? I.e: is"No"
going to be encoded correctly (read: quoted), or is it going to be encoded YAML-1.2-style (which in Yaml 1.1 is an alias forfalse
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! I added a test confirming that
No
is deserialized correctly (as"No"
, notfalse
).Let me know if you want to see some more tests of some edge-cases in the YAML handling!