fix(ecs): default ecsmanagedtags and propagatetags to be undefined (#3887)

piradeepk · mergify[bot] · commit 1f589a326565 · 2019-09-04T11:08:33.000Z
* fix(ecs): default ecsmanagedtags to be false

* Update decdk snapshot

* Address feedback

* Remove extra comma

* Address feedback
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json
@@ -273,8 +273,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       }
     },
     "FargateServiceSecurityGroup0A0E79CB": {
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.expected.json
@@ -777,8 +777,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "FargateServiceLBPublicListenerECSGroupBE57E081",
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.expected.json
@@ -607,8 +607,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3LBPublicListenerECSGroup648EEA11",
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-autocreate.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-autocreate.expected.json
@@ -258,8 +258,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3LBPublicListenerECSGroup648EEA11",
@@ -907,8 +906,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3bLBPublicListenerECSGroup0070C5CA",
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-vpconly.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-vpconly.expected.json
@@ -601,8 +601,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3LBPublicListenerECSGroup648EEA11",
@@ -1250,8 +1249,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3bLBPublicListenerECSGroup0070C5CA",
@@ -1556,8 +1554,7 @@
             ]
           }
         },
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE"
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "L3cLBPublicListenerECSGroup62D7B705",
diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.expected.json
@@ -583,8 +583,7 @@
             }
           }
         ],
-        "EnableECSManagedTags": true,
-        "PropagateTags": "SERVICE",
+        "EnableECSManagedTags": false,
         "NetworkConfiguration": {
           "AwsvpcConfiguration": {
             "AssignPublicIp": "DISABLED",
diff --git a/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts b/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts
@@ -81,17 +81,17 @@ export interface BaseServiceOptions {
   /**
    * Specifies whether to propagate the tags from the task definition or the service to the tasks in the service
    *
-   * Valid values are: PropagateTagFromType.SERVICE, PropagateTagFromType.TASK_DEFINITION or PropagateTagFromType.NONE
+   * Valid values are: PropagatedTagSource.SERVICE, PropagatedTagSource.TASK_DEFINITION or PropagatedTagSource.NONE
    *
-   * @default - PropagatedTagSource.SERVICE if EC2 or Fargate Service, otherwise PropagatedTagSource.NONE.
+   * @default PropagatedTagSource.NONE
    */
   readonly propagateTags?: PropagatedTagSource;
 
   /**
    * Specifies whether to enable Amazon ECS managed tags for the tasks within the service. For more information, see
    * [Tagging Your Amazon ECS Resources](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html)
    *
-   * @default true
+   * @default false
    */
   readonly enableECSManagedTags?: boolean;
 }
@@ -191,7 +191,7 @@ export abstract class BaseService extends Resource
         minimumHealthyPercent: props.minHealthyPercent === undefined ? 50 : props.minHealthyPercent
       },
       propagateTags: props.propagateTags === PropagatedTagSource.NONE ? undefined : props.propagateTags,
-      enableEcsManagedTags: props.enableECSManagedTags === undefined ? true : props.enableECSManagedTags,
+      enableEcsManagedTags: props.enableECSManagedTags === undefined ? false : props.enableECSManagedTags,
       launchType: props.launchType,
       healthCheckGracePeriodSeconds: this.evaluateHealthGracePeriod(props.healthCheckGracePeriod),
       /* role: never specified, supplanted by Service Linked Role */
diff --git a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts
@@ -135,7 +135,7 @@ export class Ec2Service extends BaseService implements IEc2Service, elb.ILoadBal
       maxHealthyPercent: props.daemon && props.maxHealthyPercent === undefined ? 100 : props.maxHealthyPercent,
       minHealthyPercent: props.daemon && props.minHealthyPercent === undefined ? 0 : props.minHealthyPercent,
       launchType: LaunchType.EC2,
-      propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.SERVICE : props.propagateTaskTagsFrom,
+      propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.NONE : props.propagateTaskTagsFrom,
       enableECSManagedTags: props.enableECSManagedTags,
     },
     {
diff --git a/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts b/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts
@@ -94,7 +94,7 @@ export class FargateService extends BaseService implements IFargateService {
       ...props,
       desiredCount: props.desiredCount !== undefined ? props.desiredCount : 1,
       launchType: LaunchType.FARGATE,
-      propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.SERVICE : props.propagateTaskTagsFrom,
+      propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.NONE : props.propagateTaskTagsFrom,
       enableECSManagedTags: props.enableECSManagedTags,
     }, {
       cluster: props.cluster.clusterName,
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.expected.json
@@ -859,8 +859,7 @@
           }
         },
         "SchedulingStrategy": "REPLICA",
-        "PropagateTags": "SERVICE",
-        "EnableECSManagedTags": true
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "LBPublicListenerECSGroupD6A32205",
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.expected.json
@@ -860,8 +860,7 @@
           }
         ],
         "SchedulingStrategy": "REPLICA",
-        "PropagateTags": "SERVICE",
-        "EnableECSManagedTags": true
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "LBPublicListenerECSGroupD6A32205",
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.expected.json
@@ -859,8 +859,7 @@
           }
         },
         "SchedulingStrategy": "REPLICA",
-        "PropagateTags": "SERVICE",
-        "EnableECSManagedTags": true,
+        "EnableECSManagedTags": false,
         "ServiceRegistries": [
           {
             "RegistryArn": {
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.expected.json
@@ -838,8 +838,7 @@
         "DesiredCount": 1,
         "LaunchType": "EC2",
         "SchedulingStrategy": "REPLICA",
-        "PropagateTags": "SERVICE",
-        "EnableECSManagedTags": true,
+        "EnableECSManagedTags": false,
         "ServiceRegistries": [
           {
             "ContainerName": "frontend",
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts b/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts
@@ -7,7 +7,7 @@ import cdk = require('@aws-cdk/core');
 import { Test } from 'nodeunit';
 import ecs = require('../../lib');
 import { BinPackResource, BuiltInAttributes, ContainerImage, NetworkMode } from '../../lib';
-import { LaunchType, PropagatedTagSource } from '../../lib/base/base-service';
+import { LaunchType } from '../../lib/base/base-service';
 import { PlacementConstraint, PlacementStrategy } from '../../lib/placement';
 
 export = {
@@ -45,8 +45,7 @@ export = {
         DesiredCount: 1,
         LaunchType: LaunchType.EC2,
         SchedulingStrategy: "REPLICA",
-        EnableECSManagedTags: true,
-        PropagateTags: PropagatedTagSource.SERVICE
+        EnableECSManagedTags: false,
       }));
 
       test.done();
diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.expected.json
@@ -440,8 +440,7 @@
             ]
           }
         },
-        "PropagateTags": "SERVICE",
-        "EnableECSManagedTags": true
+        "EnableECSManagedTags": false
       },
       "DependsOn": [
         "LBPublicListenerFargateGroup5EE2FBAF",
diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts b/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts
@@ -8,7 +8,7 @@ import cdk = require('@aws-cdk/core');
 import { Test } from 'nodeunit';
 import ecs = require('../../lib');
 import { ContainerImage } from '../../lib';
-import { LaunchType, PropagatedTagSource } from '../../lib/base/base-service';
+import { LaunchType } from '../../lib/base/base-service';
 
 export = {
   "When creating a Fargate Service": {
@@ -42,8 +42,7 @@ export = {
         },
         DesiredCount: 1,
         LaunchType: LaunchType.FARGATE,
-        EnableECSManagedTags: true,
-        PropagateTags: PropagatedTagSource.SERVICE,
+        EnableECSManagedTags: false,
         NetworkConfiguration: {
           AwsvpcConfiguration: {
             AssignPublicIp: "DISABLED",
diff --git a/packages/decdk/test/__snapshots__/synth.test.js.snap b/packages/decdk/test/__snapshots__/synth.test.js.snap
@@ -646,7 +646,7 @@ Object {
           "MinimumHealthyPercent": 50,
         },
         "DesiredCount": 1,
-        "EnableECSManagedTags": true,
+        "EnableECSManagedTags": false,
         "LaunchType": "FARGATE",
         "NetworkConfiguration": Object {
           "AwsvpcConfiguration": Object {
@@ -666,7 +666,6 @@ Object {
             ],
           },
         },
-        "PropagateTags": "SERVICE",
         "TaskDefinition": Object {
           "Ref": "MyTaskDef01F0D39B",
         },

Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,7 @@`
`273`	`273`	`]`
`274`	`274`	`}`
`275`	`275`	`},`
`276`		`- "EnableECSManagedTags": true,`
`277`		`- "PropagateTags": "SERVICE"`
	`276`	`+ "EnableECSManagedTags": false`
`278`	`277`	`}`
`279`	`278`	`},`
`280`	`279`	`"FargateServiceSecurityGroup0A0E79CB": {`
Original file line number	Diff line number	Diff line change
`@@ -777,8 +777,7 @@`
`777`	`777`	`]`
`778`	`778`	`}`
`779`	`779`	`},`
`780`		`- "EnableECSManagedTags": true,`
`781`		`- "PropagateTags": "SERVICE"`
	`780`	`+ "EnableECSManagedTags": false`
`782`	`781`	`},`
`783`	`782`	`"DependsOn": [`
`784`	`783`	`"FargateServiceLBPublicListenerECSGroupBE57E081",`
Original file line number	Diff line number	Diff line change
`@@ -607,8 +607,7 @@`
`607`	`607`	`]`
`608`	`608`	`}`
`609`	`609`	`},`
`610`		`- "EnableECSManagedTags": true,`
`611`		`- "PropagateTags": "SERVICE"`
	`610`	`+ "EnableECSManagedTags": false`
`612`	`611`	`},`
`613`	`612`	`"DependsOn": [`
`614`	`613`	`"L3LBPublicListenerECSGroup648EEA11",`
Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,7 @@`
`258`	`258`	`]`
`259`	`259`	`}`
`260`	`260`	`},`
`261`		`- "EnableECSManagedTags": true,`
`262`		`- "PropagateTags": "SERVICE"`
	`261`	`+ "EnableECSManagedTags": false`
`263`	`262`	`},`
`264`	`263`	`"DependsOn": [`
`265`	`264`	`"L3LBPublicListenerECSGroup648EEA11",`
`@@ -907,8 +906,7 @@`
`907`	`906`	`]`
`908`	`907`	`}`
`909`	`908`	`},`
`910`		`- "EnableECSManagedTags": true,`
`911`		`- "PropagateTags": "SERVICE"`
	`909`	`+ "EnableECSManagedTags": false`
`912`	`910`	`},`
`913`	`911`	`"DependsOn": [`
`914`	`912`	`"L3bLBPublicListenerECSGroup0070C5CA",`
Original file line number	Diff line number	Diff line change
`@@ -601,8 +601,7 @@`
`601`	`601`	`]`
`602`	`602`	`}`
`603`	`603`	`},`
`604`		`- "EnableECSManagedTags": true,`
`605`		`- "PropagateTags": "SERVICE"`
	`604`	`+ "EnableECSManagedTags": false`
`606`	`605`	`},`
`607`	`606`	`"DependsOn": [`
`608`	`607`	`"L3LBPublicListenerECSGroup648EEA11",`
`@@ -1250,8 +1249,7 @@`
`1250`	`1249`	`]`
`1251`	`1250`	`}`
`1252`	`1251`	`},`
`1253`		`- "EnableECSManagedTags": true,`
`1254`		`- "PropagateTags": "SERVICE"`
	`1252`	`+ "EnableECSManagedTags": false`
`1255`	`1253`	`},`
`1256`	`1254`	`"DependsOn": [`
`1257`	`1255`	`"L3bLBPublicListenerECSGroup0070C5CA",`
`@@ -1556,8 +1554,7 @@`
`1556`	`1554`	`]`
`1557`	`1555`	`}`
`1558`	`1556`	`},`
`1559`		`- "EnableECSManagedTags": true,`
`1560`		`- "PropagateTags": "SERVICE"`
	`1557`	`+ "EnableECSManagedTags": false`
`1561`	`1558`	`},`
`1562`	`1559`	`"DependsOn": [`
`1563`	`1560`	`"L3cLBPublicListenerECSGroup62D7B705",`
Original file line number	Diff line number	Diff line change
`@@ -583,8 +583,7 @@`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`	`],`
`586`		`- "EnableECSManagedTags": true,`
`587`		`- "PropagateTags": "SERVICE",`
	`586`	`+ "EnableECSManagedTags": false,`
`588`	`587`	`"NetworkConfiguration": {`
`589`	`588`	`"AwsvpcConfiguration": {`
`590`	`589`	`"AssignPublicIp": "DISABLED",`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export class Ec2Service extends BaseService implements IEc2Service, elb.ILoadBal`
`135`	`135`	`maxHealthyPercent: props.daemon && props.maxHealthyPercent === undefined ? 100 : props.maxHealthyPercent,`
`136`	`136`	`minHealthyPercent: props.daemon && props.minHealthyPercent === undefined ? 0 : props.minHealthyPercent,`
`137`	`137`	`launchType: LaunchType.EC2,`
`138`		`- propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.SERVICE : props.propagateTaskTagsFrom,`
	`138`	`+ propagateTags: props.propagateTaskTagsFrom === undefined ? PropagatedTagSource.NONE : props.propagateTaskTagsFrom,`
`139`	`139`	`enableECSManagedTags: props.enableECSManagedTags,`
`140`	`140`	`},`
`141`	`141`	`{`