Fix merge failures

aws · Sep 25, 2019 · aeaef64 · aeaef64
1 parent d0c43dd
commit aeaef64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts
@@ -301,7 +301,9 @@ export = {
     // WHEN
     new ecsPatterns.ApplicationLoadBalancedFargateService(stack, 'Service', {
       cluster,
-      image: ecs.ContainerImage.fromRegistry('test'),
+      taskImageOptions: {
+        image: ecs.ContainerImage.fromRegistry('test'),
+      },
       domainName: 'api.example.com',
       domainZone: zone,
       protocol: ApplicationProtocol.HTTPS
@@ -384,7 +386,9 @@ export = {
     test.throws(() => {
       new ecsPatterns.ApplicationLoadBalancedFargateService(stack, 'Service', {
         cluster,
-        image: ecs.ContainerImage.fromRegistry('test'),
+        taskImageOptions: {
+          image: ecs.ContainerImage.fromRegistry('test'),
+        },
         protocol: ApplicationProtocol.HTTP,
         certificate: Certificate.fromCertificateArn(stack, 'Cert', 'helloworld')
       });
@@ -403,7 +407,9 @@ export = {
     test.throws(() => {
       new ecsPatterns.ApplicationLoadBalancedFargateService(stack, 'Service', {
         cluster,
-        image: ecs.ContainerImage.fromRegistry('test'),
+        taskImageOptions: {
+          image: ecs.ContainerImage.fromRegistry('test'),
+        },
         protocol: ApplicationProtocol.HTTPS
       });
     });

diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.https-fargate-service.lit.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.https-fargate-service.lit.ts
@@ -22,7 +22,9 @@ class EventStack extends cdk.Stack {
     /// !show
     new ApplicationLoadBalancedFargateService(this, 'HttpsService', {
       cluster,
-      image: ecs.ContainerImage.fromRegistry("amazon/amazon-ecs-sample"),
+      taskImageOptions: {
+        image: ecs.ContainerImage.fromRegistry("amazon/amazon-ecs-sample"),
+      },
       protocol: elb.ApplicationProtocol.HTTPS,
       domainName: 'test.example.com',
       domainZone