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

Framework: Tokens can be converted to strings #518

Merged
merged 20 commits into from
Aug 15, 2018
Merged

Framework: Tokens can be converted to strings #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3796389
Framework: Tokens can be converted to strings
Aug 7, 2018
9469a71
Remove incorrectly staged custom-resources directory
Aug 8, 2018
e47741b
WIP
Aug 8, 2018
f6d01a8
Merge branch 'master' into huijbers/token-stringification
Aug 8, 2018
6e79bb8
Remove HintedToken, change markers, add quoting
Aug 8, 2018
a72d14d
Update testing
Aug 9, 2018
42becf3
WIP
Aug 9, 2018
1b60e45
After a giant slough, reintroducing tokenAwareJsonify()
Aug 9, 2018
d1fc358
Make CloudWatch use tokenAwareJsonify again
Aug 9, 2018
58602a9
Reorganized code
Aug 13, 2018
74f4fe7
SecretParameter no longer duckily implements Token, won't work in non…
Aug 13, 2018
b15684d
Merge remote-tracking branch 'origin/master' into huijbers/token-stri…
Aug 13, 2018
5753e31
fix(aws-logs): resolving of policy
Aug 13, 2018
4206b85
Combine string literals while resolving fragments, so we never have n…
Aug 13, 2018
85cfa81
Make intrinsics carry a direct object reference to the engine, simply…
Aug 14, 2018
a3ec610
Move JSONification to CloudFormation library, remove any reference to…
Aug 14, 2018
7361815
Explain better in comments, fix cross-account-destination
Aug 15, 2018
a7b41e2
Remove joiner(), make Tokens concat() themselves
Aug 15, 2018
6aa9b77
Merge remote-tracking branch 'origin/master' into huijbers/token-stri…
Aug 15, 2018
c5b3b68
Remove laziness of many existing Token use cases
Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Construct, Stack, Token, tokenAwareJsonify } from "@aws-cdk/cdk";
import { CloudFormationJSON, Construct, Stack, Token } from "@aws-cdk/cdk";
import { cloudformation } from './cloudwatch.generated';
import { Column, Row } from "./layout";
import { IWidget } from "./widget";
Expand Down Expand Up @@ -33,7 +33,7 @@ export class Dashboard extends Construct {
dashboardBody: new Token(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This wraps a token and CloudFormationJSON.stringify also returns a Token. Can we eliminate one layer?

const column = new Column(...this.rows);
column.position(0, 0);
return tokenAwareJsonify({ widgets: column.toJson() });
return CloudFormationJSON.stringify({ widgets: column.toJson() });
})
});
}
Expand Down
53 changes: 36 additions & 17 deletions packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"ComparisonOperator": "GreaterThanOrEqualToThreshold",
"EvaluationPeriods": 3,
"MetricName": "ApproximateNumberOfMessagesVisible",
"Namespace": "AWS/SQS",
"Period": 300,
"Threshold": 100,
"Dimensions": [
{
"Name": "QueueName",
Expand All @@ -18,41 +23,55 @@
}
}
],
"EvaluationPeriods": 3,
"MetricName": "ApproximateNumberOfMessagesVisible",
"Namespace": "AWS/SQS",
"Period": 300,
"Statistic": "Average",
"Threshold": 100
"Statistic": "Average"
}
},
"DashCCD7F836": {
"Type": "AWS::CloudWatch::Dashboard",
"Properties": {
"DashboardName": "aws-cdk-cloudwatch-DashCCD7F836",
"DashboardBody": {
"Fn::Sub": [
"{\"widgets\":[{\"type\":\"text\",\"width\":6,\"height\":2,\"x\":0,\"y\":0,\"properties\":{\"markdown\":\"# This is my dashboard\"}},{\"type\":\"text\",\"width\":6,\"height\":2,\"x\":6,\"y\":0,\"properties\":{\"markdown\":\"you like?\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":2,\"properties\":{\"view\":\"timeSeries\",\"title\":\"Messages in queue\",\"region\":\"${ref0}\",\"annotations\":{\"alarms\":[\"${ref1}\"]},\"yAxis\":{\"left\":{\"min\":0}}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":8,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More messages in queue with alarm annotation\",\"region\":\"${ref0}\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"${ref2}\",{\"yAxis\":\"left\",\"period\":300,\"stat\":\"Average\"}]],\"annotations\":{\"horizontal\":[{\"label\":\"ApproximateNumberOfMessagesVisible >= 100 for 3 datapoints within 15 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{\"left\":{\"min\":0},\"right\":{\"min\":0}}}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":14,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current messages in queue\",\"region\":\"${ref0}\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"${ref2}\",{\"yAxis\":\"left\",\"period\":300,\"stat\":\"Average\"}]]}}]}",
{
"ref0": {
"Fn::Join": [
"",
[
"{\"widgets\":[{\"type\":\"text\",\"width\":6,\"height\":2,\"x\":0,\"y\":0,\"properties\":{\"markdown\":\"# This is my dashboard\"}},{\"type\":\"text\",\"width\":6,\"height\":2,\"x\":6,\"y\":0,\"properties\":{\"markdown\":\"you like?\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":2,\"properties\":{\"view\":\"timeSeries\",\"title\":\"Messages in queue\",\"region\":\"",
{
"Ref": "AWS::Region"
},
"ref1": {
"\",\"annotations\":{\"alarms\":[\"",
{
"Fn::GetAtt": [
"Alarm7103F465",
"Arn"
]
},
"ref2": {
"\"]},\"yAxis\":{\"left\":{\"min\":0}}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":8,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More messages in queue with alarm annotation\",\"region\":\"",
{
"Ref": "AWS::Region"
},
"\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",
{
"Fn::GetAtt": [
"queue",
"QueueName"
]
}
}
},
"\",{\"yAxis\":\"left\",\"period\":300,\"stat\":\"Average\"}]],\"annotations\":{\"horizontal\":[{\"label\":\"ApproximateNumberOfMessagesVisible >= 100 for 3 datapoints within 15 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{\"left\":{\"min\":0},\"right\":{\"min\":0}}}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":14,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current messages in queue\",\"region\":\"",
{
"Ref": "AWS::Region"
},
"\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",
{
"Fn::GetAtt": [
"queue",
"QueueName"
]
},
"\",{\"yAxis\":\"left\",\"period\":300,\"stat\":\"Average\"}]]}}]}"
]
]
}
},
"DashboardName": "aws-cdk-cloudwatch-DashCCD7F836"
}
}
}
}
}
15 changes: 6 additions & 9 deletions packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export = {
test.done();
},

'tokens in widgets are retained through FnSub'(test: Test) {
'tokens in widgets are retained'(test: Test) {
// GIVEN
const stack = new Stack();
const dashboard = new Dashboard(stack, 'Dash');
Expand All @@ -82,14 +82,11 @@ export = {

// THEN
expect(stack).to(haveResource('AWS::CloudWatch::Dashboard', {
DashboardBody: { "Fn::Sub": [
// tslint:disable-next-line:max-line-length
"{\"widgets\":[{\"type\":\"metric\",\"width\":1,\"height\":1,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"region\":\"${ref0}\",\"metrics\":[],\"annotations\":{\"horizontal\":[]},\"yAxis\":{\"left\":{\"min\":0},\"right\":{\"min\":0}}}}]}",
{
ref0: { Ref: "AWS::Region" }
}
]
}
DashboardBody: { "Fn::Join": [ "", [
"{\"widgets\":[{\"type\":\"metric\",\"width\":1,\"height\":1,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"region\":\"",
{ Ref: "AWS::Region" },
"\",\"metrics\":[],\"annotations\":{\"horizontal\":[]},\"yAxis\":{\"left\":{\"min\":0},\"right\":{\"min\":0}}}}]}"
]]}
}));

test.done();
Expand Down
56 changes: 21 additions & 35 deletions packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,9 @@
":",
"log-group",
":",
"/aws/codebuild/",
{
"Fn::Join": [
"",
[
"/aws/codebuild/",
{
"Ref": "MyProject39F7B0AE"
}
]
]
"Ref": "MyProject39F7B0AE"
}
]
]
Expand Down Expand Up @@ -126,16 +119,9 @@
":",
"log-group",
":",
"/aws/codebuild/",
{
"Fn::Join": [
"",
[
"/aws/codebuild/",
{
"Ref": "MyProject39F7B0AE"
}
]
]
"Ref": "MyProject39F7B0AE"
}
]
]
Expand All @@ -160,8 +146,22 @@
"MyProject39F7B0AE": {
"Type": "AWS::CodeBuild::Project",
"Properties": {
"Artifacts": {
"Type": "NO_ARTIFACTS"
},
"Environment": {
"ComputeType": "BUILD_GENERAL1_LARGE",
"Image": "aws/codebuild/ubuntu-base:14.04",
"PrivilegedMode": false,
"Type": "LINUX_CONTAINER"
},
"ServiceRole": {
"Fn::GetAtt": [
"MyProjectRole9BBE5233",
"Arn"
]
},
"Source": {
"Type": "S3",
"Location": {
"Fn::Join": [
"",
Expand All @@ -173,22 +173,8 @@
"path/to/my/source.zip"
]
]
}
},
"Artifacts": {
"Type": "NO_ARTIFACTS"
},
"ServiceRole": {
"Fn::GetAtt": [
"MyProjectRole9BBE5233",
"Arn"
]
},
"Environment": {
"Type": "LINUX_CONTAINER",
"PrivilegedMode": false,
"Image": "aws/codebuild/ubuntu-base:14.04",
"ComputeType": "BUILD_GENERAL1_LARGE"
},
"Type": "S3"
}
}
}
Expand Down
50 changes: 18 additions & 32 deletions packages/@aws-cdk/aws-codebuild/test/integ.project-events.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,9 @@
":",
"log-group",
":",
"/aws/codebuild/",
{
"Fn::Join": [
"",
[
"/aws/codebuild/",
{
"Ref": "MyProject39F7B0AE"
}
]
]
"Ref": "MyProject39F7B0AE"
}
]
]
Expand Down Expand Up @@ -169,16 +162,9 @@
":",
"log-group",
":",
"/aws/codebuild/",
{
"Fn::Join": [
"",
[
"/aws/codebuild/",
{
"Ref": "MyProject39F7B0AE"
}
]
]
"Ref": "MyProject39F7B0AE"
}
]
]
Expand All @@ -203,29 +189,29 @@
"MyProject39F7B0AE": {
"Type": "AWS::CodeBuild::Project",
"Properties": {
"Source": {
"Type": "CODECOMMIT",
"Location": {
"Fn::GetAtt": [
"MyRepoF4F48043",
"CloneUrlHttp"
]
}
},
"Artifacts": {
"Type": "NO_ARTIFACTS"
},
"Environment": {
"ComputeType": "BUILD_GENERAL1_SMALL",
"Image": "aws/codebuild/ubuntu-base:14.04",
"PrivilegedMode": false,
"Type": "LINUX_CONTAINER"
},
"ServiceRole": {
"Fn::GetAtt": [
"MyProjectRole9BBE5233",
"Arn"
]
},
"Environment": {
"Type": "LINUX_CONTAINER",
"PrivilegedMode": false,
"Image": "aws/codebuild/ubuntu-base:14.04",
"ComputeType": "BUILD_GENERAL1_SMALL"
"Source": {
"Location": {
"Fn::GetAtt": [
"MyRepoF4F48043",
"CloneUrlHttp"
]
},
"Type": "CODECOMMIT"
}
}
},
Expand Down
Loading