Merge branch 'master' into route53-target-apigatewayv2

aws · Nov 6, 2020 · 561656e · 561656e
2 parents c74aa4a + 89a5055
commit 561656e
Show file tree

Hide file tree

Showing 12 changed files with 584 additions and 39 deletions.
diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts
@@ -10,7 +10,7 @@ import { Container } from './container';
 import { ServiceExtension, ServiceBuild } from './extension-interfaces';
 
 // The version of the App Mesh envoy sidecar to add to the task.
-const APP_MESH_ENVOY_SIDECAR_VERSION = 'v1.15.0.0-prod';
+const APP_MESH_ENVOY_SIDECAR_VERSION = 'v1.15.1.0-prod';
 
 /**
  * The settings for the App Mesh extension.

diff --git a/...es/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json b/...es/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json
@@ -727,7 +727,7 @@
                   {
                     "Ref": "AWS::URLSuffix"
                   },
-                  "/aws-appmesh-envoy:v1.15.0.0-prod"
+                  "/aws-appmesh-envoy:v1.15.1.0-prod"
                 ]
               ]
             },
@@ -1596,7 +1596,7 @@
                   {
                     "Ref": "AWS::URLSuffix"
                   },
-                  "/aws-appmesh-envoy:v1.15.0.0-prod"
+                  "/aws-appmesh-envoy:v1.15.1.0-prod"
                 ]
               ]
             },
@@ -2584,7 +2584,7 @@
                   {
                     "Ref": "AWS::URLSuffix"
                   },
-                  "/aws-appmesh-envoy:v1.15.0.0-prod"
+                  "/aws-appmesh-envoy:v1.15.1.0-prod"
                 ]
               ]
             },

diff --git a/...@aws-cdk-containers/ecs-service-extensions/test/integ.multiple-environments.expected.json b/...@aws-cdk-containers/ecs-service-extensions/test/integ.multiple-environments.expected.json
@@ -1186,7 +1186,7 @@
                   {
                     "Ref": "AWS::URLSuffix"
                   },
-                  "/aws-appmesh-envoy:v1.15.0.0-prod"
+                  "/aws-appmesh-envoy:v1.15.1.0-prod"
                 ]
               ]
             },
@@ -1710,7 +1710,7 @@
                   {
                     "Ref": "AWS::URLSuffix"
                   },
-                  "/aws-appmesh-envoy:v1.15.0.0-prod"
+                  "/aws-appmesh-envoy:v1.15.1.0-prod"
                 ]
               ]
             },

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/test/test.appmesh.ts b/packages/@aws-cdk-containers/ecs-service-extensions/test/test.appmesh.ts
@@ -132,7 +132,7 @@ export = {
                 {
                   Ref: 'AWS::URLSuffix',
                 },
-                '/aws-appmesh-envoy:v1.15.0.0-prod',
+                '/aws-appmesh-envoy:v1.15.1.0-prod',
               ],
             ],
           },

diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
@@ -273,11 +273,18 @@ export class Alarm extends AlarmBase {
               };
             },
             withExpression(expr, conf) {
+
+              const hasSubmetrics = mathExprHasSubmetrics(expr);
+
+              if (hasSubmetrics) {
+                assertSubmetricsCount(expr);
+              }
+
               return {
                 expression: expr.expression,
                 id: entry.id || uniqueMetricId(),
                 label: conf.renderingProperties?.label,
-                period: mathExprHasSubmetrics(expr) ? undefined : expr.period,
+                period: hasSubmetrics ? undefined : expr.period,
                 returnData: entry.tag ? undefined : false, // Tag stores "primary" attribute, default is "true"
               };
             },
@@ -344,4 +351,11 @@ function mathExprHasSubmetrics(expr: MetricExpressionConfig) {
   return Object.keys(expr.usingMetrics).length > 0;
 }
 
+function assertSubmetricsCount(expr: MetricExpressionConfig) {
+  if (Object.keys(expr.usingMetrics).length > 10) {
+    // https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#alarms-on-metric-math-expressions
+    throw new Error('Alarms on math expressions cannot contain more than 10 individual metrics');
+  };
+}
+
 type Writeable<T> = { -readonly [P in keyof T]: T[P] };
diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts
@@ -2,14 +2,46 @@ import { ABSENT, expect, haveResource } from '@aws-cdk/assert';
 import { Duration, Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { Test } from 'nodeunit';
-import { Alarm, IAlarm, IAlarmAction, Metric } from '../lib';
+import { Alarm, IAlarm, IAlarmAction, Metric, MathExpression, IMetric } from '../lib';
 
 const testMetric = new Metric({
   namespace: 'CDK/Test',
   metricName: 'Metric',
 });
 
 export = {
+
+  'alarm does not accept a math expression with more than 10 metrics'(test: Test) {
+
+    const stack = new Stack();
+
+    const usingMetrics: Record<string, IMetric> = {};
+
+    for (const i of [...Array(15).keys()]) {
+      const metricName = `metric${i}`;
+      usingMetrics[metricName] = new Metric({
+        namespace: 'CDK/Test',
+        metricName: metricName,
+      });
+    }
+
+    const math = new MathExpression({
+      expression: 'a',
+      usingMetrics,
+    });
+
+    test.throws(() => {
+
+      new Alarm(stack, 'Alarm', {
+        metric: math,
+        threshold: 1000,
+        evaluationPeriods: 3,
+      });
+
+    }, /Alarms on math expressions cannot contain more than 10 individual metrics/);
+
+    test.done();
+  },
   'can make simple alarm'(test: Test) {
     // GIVEN
     const stack = new Stack();