Merge branch 'master' into robertd/cloudfront-origin-minimum-ssl-prot…

…ocol
aws · Dec 11, 2020 · 43c365d · 43c365d
2 parents 47540c7 + e325b56
commit 43c365d
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 110 deletions.
diff --git a/packages/@aws-cdk/aws-dynamodb/lib/table.ts b/packages/@aws-cdk/aws-dynamodb/lib/table.ts
@@ -439,6 +439,14 @@ export interface ITable extends IResource {
    */
   metricSystemErrors(props?: cloudwatch.MetricOptions): cloudwatch.Metric;
 
+  /**
+   * Metric for the system errors this table
+   *
+   * @param props properties of a metric
+   *
+   */
+  metricSystemErrorsForOperations(props?: SystemErrorsForOperationsMetricOptions): cloudwatch.IMetric;
+
   /**
    * Metric for the user errors
    *
@@ -453,6 +461,14 @@ export interface ITable extends IResource {
    */
   metricConditionalCheckFailedRequests(props?: cloudwatch.MetricOptions): cloudwatch.Metric;
 
+  /**
+   * Metric for throttled requests
+   *
+   * @param props properties of a metric
+   *
+   */
+  metricThrottledRequests(props?: cloudwatch.MetricOptions): cloudwatch.Metric;
+
   /**
    * Metric for the successful request latency
    *

diff --git a/...ges/@aws-cdk/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts b/...ges/@aws-cdk/aws-ecs-patterns/lib/base/application-multiple-target-groups-service-base.ts
@@ -524,6 +524,7 @@ export abstract class ApplicationMultipleTargetGroupsServiceBase extends CoreCon
   private createLoadBalancer(name: string, publicLoadBalancer?: boolean): ApplicationLoadBalancer {
     const internetFacing = publicLoadBalancer !== undefined ? publicLoadBalancer : true;
     const lbProps = {
+      loadBalancerName: name,
       vpc: this.cluster.vpc,
       internetFacing,
     };

diff --git a/...-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.expected.json b/...-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.expected.json
@@ -868,6 +868,7 @@
             "Value": "false"
           }
         ],
+        "Name": "LB",
         "Scheme": "internet-facing",
         "SecurityGroups": [
           {

diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s-v2.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s-v2.ts
@@ -234,6 +234,33 @@ export = {
           ],
         },
       }));
+      expect(stack).to(haveResourceLike('AWS::ElasticLoadBalancingV2::LoadBalancer', {
+        LoadBalancerAttributes: [
+          {
+            Key: 'deletion_protection.enabled',
+            Value: 'false',
+          },
+        ],
+        Name: 'lb',
+        Scheme: 'internal',
+        SecurityGroups: [
+          {
+            'Fn::GetAtt': [
+              'ServicelbSecurityGroup961F0769',
+              'GroupId',
+            ],
+          },
+        ],
+        Subnets: [
+          {
+            Ref: 'VPCPrivateSubnet1Subnet8BCA10E0',
+          },
+          {
+            Ref: 'VPCPrivateSubnet2SubnetCFCDAA7A',
+          },
+        ],
+        Type: 'application',
+      }));
 
       test.done();
     },
@@ -1532,4 +1559,4 @@ export = {
       test.done();
     },
   },
-};
+};
diff --git a/packages/@aws-cdk/aws-ecs/lib/container-definition.ts b/packages/@aws-cdk/aws-ecs/lib/container-definition.ts
@@ -420,10 +420,6 @@ export class ContainerDefinition extends cdk.Construct {
       }
     }
 
-    if (this.taskDefinition.isFargateCompatible && props.environmentFiles) {
-      throw new Error(`Cannot specify environment files for a task using the FARGATE launch type in container '${this.node.id}'.`);
-    }
-
     if (props.environmentFiles) {
       this.environmentFiles = [];