fix(cloudwatch): don't ignore 'stacked' property in GraphWidget class (…

…aws#2103)
loganek · Aug 26, 2019 · 3a0992f · 3a0992f
1 parent 39ee810
commit 3a0992f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts b/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts
@@ -181,6 +181,7 @@ export class GraphWidget extends ConcreteWidget {
         view: 'timeSeries',
         title: this.props.title,
         region: this.props.region || cdk.Aws.REGION,
+        stacked: this.props.stacked || false,
         metrics: metrics.length > 0 ? metrics : undefined,
         annotations: horizontalAnnoations.length > 0 ? { horizontal: horizontalAnnoations } : undefined,
         yAxis: {

diff --git a/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.expected.json b/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.expected.json
@@ -49,7 +49,7 @@
               {
                 "Ref": "AWS::Region"
               },
-              "\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",
+              "\",\"stacked\":false,\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",
               {
                 "Fn::GetAtt": [
                   "queue",

diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts
@@ -85,7 +85,7 @@ export = {
       DashboardBody: { "Fn::Join": [ "", [
         "{\"widgets\":[{\"type\":\"metric\",\"width\":1,\"height\":1,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"region\":\"",
         { Ref: "AWS::Region" },
-        "\",\"yAxis\":{}}}]}"
+        "\",\"stacked\":false,\"yAxis\":{}}}]}"
       ]]}
     }));
 
@@ -113,7 +113,7 @@ export = {
         "{\"start\":\"-9H\",\"end\":\"2018-12-17T06:00:00.000Z\",\"periodOverride\":\"inherit\",\
 \"widgets\":[{\"type\":\"metric\",\"width\":1,\"height\":1,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"region\":\"",
         { Ref: "AWS::Region" },
-        "\",\"yAxis\":{}}}]}"
+        "\",\"stacked\":false,\"yAxis\":{}}}]}"
       ]]}
     }));
 

diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts
@@ -3,6 +3,31 @@ import { Test } from 'nodeunit';
 import { Alarm, AlarmWidget, GraphWidget, Metric, Shading, SingleValueWidget } from '../lib';
 
 export = {
+  'add stacked property to graphs'(test: Test) {
+    // WHEN
+    const stack = new Stack();
+    const widget = new GraphWidget({
+      title: 'Test widget',
+      stacked: true
+    });
+
+    // THEN
+    test.deepEqual(stack.resolve(widget.toJson()), [{
+      type: 'metric',
+      width: 6,
+      height: 6,
+      properties: {
+        view: 'timeSeries',
+        title: 'Test widget',
+        region: { Ref: 'AWS::Region' },
+        stacked: true,
+        yAxis: {}
+      }
+    }]);
+
+    test.done();
+  },
+
   'add metrics to graphs on either axis'(test: Test) {
     // WHEN
     const stack = new Stack();
@@ -29,6 +54,7 @@ export = {
           ['CDK', 'Test', { yAxis: 'left', period: 300, stat: 'Average' }],
           ['CDK', 'Tast', { yAxis: 'right', period: 300, stat: 'Average' }]
         ],
+        stacked: false,
         yAxis: {}
       }
     }]);
@@ -54,6 +80,7 @@ export = {
         metrics: [
           ['CDK', 'Test', { yAxis: 'left', period: 300, stat: 'Average', label: 'MyMetric', color: '000000' }],
         ],
+        stacked: false,
         yAxis: {}
       }
     }]);
@@ -155,6 +182,7 @@ export = {
           fill: 'below',
           label: 'this is the annotation',
         }] },
+        stacked: false,
         yAxis: {}
       }
     }]);
@@ -197,6 +225,7 @@ export = {
             label: 'Test >= 1000 for 2 datapoints within 10 minutes',
           }]
         },
+        stacked: false,
         yAxis: {}
       }
     }]);
@@ -239,6 +268,7 @@ export = {
           ['CDK', 'Test', { yAxis: 'left', period: 300, stat: 'Average' }],
           ['CDK', 'Tast', { yAxis: 'right', period: 300, stat: 'Average' }]
         ],
+        stacked: false,
         yAxis: {
           left: { label: "Left yAxis", max: 100 },
           right: { label: "Right yAxis", min: 10, showUnits: false } }