fix(cdk): fix TagManager to evaluate to undefined if no tags are included (#882)

jungseoklee · Elad Ben-Israel · commit 96767d7b2812 · 2018-10-10T08:57:43.000+03:00
It is unnecessary to add "Tags" field to CloudFormation template unless
tags are specified. Therefore, this patch fixes TagManager to evaluate to
undefined if there are no tags included.
diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json
@@ -589,7 +589,6 @@
             "ToPort": 80
           }
         ],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json
@@ -476,7 +476,6 @@
             "ToPort": 80
           }
         ],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-codedeploy/test/integ.deployment-group.expected.json b/packages/@aws-cdk/aws-codedeploy/test/integ.deployment-group.expected.json
@@ -674,7 +674,6 @@
             "ToPort": 80
           }
         ],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.expected.json b/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.expected.json
@@ -20,8 +20,7 @@
           }
         ],
         "GlobalSecondaryIndexes": [],
-        "LocalSecondaryIndexes": [],
-        "Tags": []
+        "LocalSecondaryIndexes": []
       }
     },
     "TableWithGlobalAndLocalSecondaryIndexBC540710": {
@@ -313,8 +312,7 @@
             }
           }
         ],
-        "LocalSecondaryIndexes": [],
-        "Tags": []
+        "LocalSecondaryIndexes": []
       }
     },
     "TableWithLocalSecondaryIndex4DA3D08F": {
@@ -366,8 +364,7 @@
               "ProjectionType": "ALL"
             }
           }
-        ],
-        "Tags": []
+        ]
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts b/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts
@@ -87,8 +87,7 @@ export = {
               KeySchema: [{ AttributeName: 'hashKey', KeyType: 'HASH' }],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -119,8 +118,7 @@ export = {
               ],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -151,8 +149,7 @@ export = {
               ],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -183,8 +180,7 @@ export = {
               ],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -215,8 +211,7 @@ export = {
               ],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -247,8 +242,7 @@ export = {
               ],
               ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },
               GlobalSecondaryIndexes: [],
-              LocalSecondaryIndexes: [],
-              Tags: []
+              LocalSecondaryIndexes: []
             }
           }
         }
@@ -286,8 +280,7 @@ export = {
               ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },
               GlobalSecondaryIndexes: [],
               LocalSecondaryIndexes: [],
-              TableName: 'MyTable',
-              Tags: []
+              TableName: 'MyTable'
             }
           }
         }
@@ -325,8 +318,7 @@ export = {
                 { AttributeName: 'sortKey', AttributeType: 'N' }
               ],
               StreamSpecification: { StreamViewType: 'NEW_IMAGE' },
-              TableName: 'MyTable',
-              Tags: []
+              TableName: 'MyTable'
             }
           }
         }
@@ -364,8 +356,7 @@ export = {
                 { AttributeName: 'sortKey', AttributeType: 'N' }
               ],
               StreamSpecification: { StreamViewType: 'OLD_IMAGE' },
-              TableName: 'MyTable',
-              Tags: []
+              TableName: 'MyTable'
             }
           }
         }
@@ -462,8 +453,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }
               }
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -514,8 +504,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }
               }
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -564,8 +553,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }
               }
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -618,8 +606,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }
               }
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -789,8 +776,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }
               },
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -851,8 +837,7 @@ export = {
                 ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }
               }
             ],
-            LocalSecondaryIndexes: [],
-            Tags: []
+            LocalSecondaryIndexes: []
           }
         }
       }
@@ -897,8 +882,7 @@ export = {
                 ],
                 Projection: { ProjectionType: 'ALL' },
               }
-            ],
-            Tags: []
+            ]
           }
         }
       }
@@ -944,8 +928,7 @@ export = {
                 ],
                 Projection: { ProjectionType: 'KEYS_ONLY' },
               }
-            ],
-            Tags: []
+            ]
           }
         }
       }
@@ -994,8 +977,7 @@ export = {
                 ],
                 Projection: { NonKeyAttributes: ['lsiNonKey0', 'lsiNonKey1'], ProjectionType: 'INCLUDE' },
               }
-            ],
-            Tags: []
+            ]
           }
         }
       }
@@ -1100,8 +1082,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableReadAutoScalingRoleFEE68E49:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1183,8 +1164,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableReadAutoScalingRoleFEE68E49:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1294,8 +1274,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableReadAutoScalingRoleFEE68E49:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1373,7 +1352,6 @@ export = {
           ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },
           GlobalSecondaryIndexes: [],
           LocalSecondaryIndexes: [],
-          Tags: [],
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ] } },
@@ -1581,8 +1559,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableWriteAutoScalingRoleDF7775DE:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1664,8 +1641,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableWriteAutoScalingRoleDF7775DE:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1775,8 +1751,7 @@ export = {
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ],
-          TableName: 'MyTable',
-          Tags: [] } },
+          TableName: 'MyTable' } },
         MyTableWriteAutoScalingRoleDF7775DE:
          { Type: 'AWS::IAM::Role',
          Properties:
@@ -1854,7 +1829,6 @@ export = {
           ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },
           GlobalSecondaryIndexes: [],
           LocalSecondaryIndexes:  [],
-          Tags: [],
           AttributeDefinitions:
            [ { AttributeName: 'hashKey', AttributeType: 'S' },
              { AttributeName: 'sortKey', AttributeType: 'N' } ] } },
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json
@@ -185,7 +185,6 @@
             "ToPort": 80
           }
         ],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json
@@ -343,7 +343,6 @@
             "ToPort": 80
           }
         ],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json
@@ -382,7 +382,6 @@
           }
         ],
         "SecurityGroupIngress": [],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json b/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json
@@ -382,7 +382,6 @@
         "GroupDescription": "RDS security group",
         "SecurityGroupEgress": [],
         "SecurityGroupIngress": [],
-        "Tags": [],
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         }
diff --git a/packages/@aws-cdk/cdk/lib/core/tag-manager.ts b/packages/@aws-cdk/cdk/lib/core/tag-manager.ts
@@ -265,6 +265,9 @@ export class TagManager extends Token {
   protected tagFormatResolve(tagGroups: TagGroups): any {
     const tags = {...tagGroups.nonStickyTags, ...tagGroups.ancestorTags, ...tagGroups.stickyTags};
     for (const key of this.blockedTags) { delete tags[key]; }
+    if (Object.keys(tags).length === 0) {
+      return undefined;
+    }
     return Object.keys(tags).map( key => ({key, value: tags[key]}));
   }
 }
diff --git a/packages/@aws-cdk/cdk/test/core/test.tag-manager.ts b/packages/@aws-cdk/cdk/test/core/test.tag-manager.ts
@@ -35,7 +35,7 @@ export = {
         test.deepEqual(construct.tags.resolve(), tagArray);
       }
 
-      test.deepEqual(ctagger2.tags.resolve().length, 0);
+      test.deepEqual(ctagger2.tags.resolve(), undefined);
       test.done();
     },
     'setTag with propagate false tags do not propagate'(test: Test) {
@@ -51,7 +51,7 @@ export = {
       ctagger.tags.setTag(tag.key, tag.value, {propagate: false});
 
       for (const construct of [ctagger1, ctagger2]) {
-        test.deepEqual(construct.tags.resolve().length, 0);
+        test.deepEqual(construct.tags.resolve(), undefined);
       }
       test.deepEqual(ctagger.tags.resolve()[0].key, 'Name');
       test.deepEqual(ctagger.tags.resolve()[0].value, 'TheCakeIsALie');
@@ -96,7 +96,7 @@ export = {
       ctagger.tags.setTag(tag.key, tag.value, {propagate: true});
       test.deepEqual(ctagger.tags.resolve(), [tag]);
       ctagger.tags.removeTag(tag.key);
-      test.deepEqual(ctagger.tags.resolve(), []);
+      test.deepEqual(ctagger.tags.resolve(), undefined);
       ctagger.tags.setTag(tag.key, tag.value, {propagate: true});
       test.deepEqual(ctagger.tags.resolve(), [tag]);
       test.done();
@@ -115,7 +115,7 @@ export = {
       ctagger.tags.removeTag('Name');
 
       for (const construct of [ctagger, ctagger1, ctagger2]) {
-        test.deepEqual(construct.tags.resolve().length, 0);
+        test.deepEqual(construct.tags.resolve(), undefined);
       }
       test.done();
     },
@@ -127,7 +127,7 @@ export = {
       ctagger1.tags.removeTag('Env', {blockPropagate: true});
       const result = ctagger.tags.resolve();
       test.deepEqual(result, [{key: 'Env', value: 'Dev'}]);
-      test.deepEqual(ctagger1.tags.resolve(), []);
+      test.deepEqual(ctagger1.tags.resolve(), undefined);
       test.done();
     },
     'children can override parent propagated tags'(test: Test) {

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,6 @@`
`589`	`589`	`"ToPort": 80`
`590`	`590`	`}`
`591`	`591`	`],`
`592`		`- "Tags": [],`
`593`	`592`	`"VpcId": {`
`594`	`593`	`"Ref": "VPCB9E5F0B4"`
`595`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,6 @@`
`476`	`476`	`"ToPort": 80`
`477`	`477`	`}`
`478`	`478`	`],`
`479`		`- "Tags": [],`
`480`	`479`	`"VpcId": {`
`481`	`480`	`"Ref": "VPCB9E5F0B4"`
`482`	`481`	`}`
Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,6 @@`
`674`	`674`	`"ToPort": 80`
`675`	`675`	`}`
`676`	`676`	`],`
`677`		`- "Tags": [],`
`678`	`677`	`"VpcId": {`
`679`	`678`	`"Ref": "VPCB9E5F0B4"`
`680`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"GlobalSecondaryIndexes": [],`
`23`		`- "LocalSecondaryIndexes": [],`
`24`		`- "Tags": []`
	`23`	`+ "LocalSecondaryIndexes": []`
`25`	`24`	`}`
`26`	`25`	`},`
`27`	`26`	`"TableWithGlobalAndLocalSecondaryIndexBC540710": {`
`@@ -313,8 +312,7 @@`
`313`	`312`	`}`
`314`	`313`	`}`
`315`	`314`	`],`
`316`		`- "LocalSecondaryIndexes": [],`
`317`		`- "Tags": []`
	`315`	`+ "LocalSecondaryIndexes": []`
`318`	`316`	`}`
`319`	`317`	`},`
`320`	`318`	`"TableWithLocalSecondaryIndex4DA3D08F": {`
`@@ -366,8 +364,7 @@`
`366`	`364`	`"ProjectionType": "ALL"`
`367`	`365`	`}`
`368`	`366`	`}`
`369`		`- ],`
`370`		`- "Tags": []`
	`367`	`+ ]`
`371`	`368`	`}`
`372`	`369`	`}`
`373`	`370`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,7 @@ export = {`
`87`	`87`	`KeySchema: [{ AttributeName: 'hashKey', KeyType: 'HASH' }],`
`88`	`88`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`89`	`89`	`GlobalSecondaryIndexes: [],`
`90`		`- LocalSecondaryIndexes: [],`
`91`		`- Tags: []`
	`90`	`+ LocalSecondaryIndexes: []`
`92`	`91`	`}`
`93`	`92`	`}`
`94`	`93`	`}`
`@@ -119,8 +118,7 @@ export = {`
`119`	`118`	`],`
`120`	`119`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`121`	`120`	`GlobalSecondaryIndexes: [],`
`122`		`- LocalSecondaryIndexes: [],`
`123`		`- Tags: []`
	`121`	`+ LocalSecondaryIndexes: []`
`124`	`122`	`}`
`125`	`123`	`}`
`126`	`124`	`}`
`@@ -151,8 +149,7 @@ export = {`
`151`	`149`	`],`
`152`	`150`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`153`	`151`	`GlobalSecondaryIndexes: [],`
`154`		`- LocalSecondaryIndexes: [],`
`155`		`- Tags: []`
	`152`	`+ LocalSecondaryIndexes: []`
`156`	`153`	`}`
`157`	`154`	`}`
`158`	`155`	`}`
`@@ -183,8 +180,7 @@ export = {`
`183`	`180`	`],`
`184`	`181`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`185`	`182`	`GlobalSecondaryIndexes: [],`
`186`		`- LocalSecondaryIndexes: [],`
`187`		`- Tags: []`
	`183`	`+ LocalSecondaryIndexes: []`
`188`	`184`	`}`
`189`	`185`	`}`
`190`	`186`	`}`
`@@ -215,8 +211,7 @@ export = {`
`215`	`211`	`],`
`216`	`212`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`217`	`213`	`GlobalSecondaryIndexes: [],`
`218`		`- LocalSecondaryIndexes: [],`
`219`		`- Tags: []`
	`214`	`+ LocalSecondaryIndexes: []`
`220`	`215`	`}`
`221`	`216`	`}`
`222`	`217`	`}`
`@@ -247,8 +242,7 @@ export = {`
`247`	`242`	`],`
`248`	`243`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 },`
`249`	`244`	`GlobalSecondaryIndexes: [],`
`250`		`- LocalSecondaryIndexes: [],`
`251`		`- Tags: []`
	`245`	`+ LocalSecondaryIndexes: []`
`252`	`246`	`}`
`253`	`247`	`}`
`254`	`248`	`}`
`@@ -286,8 +280,7 @@ export = {`
`286`	`280`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },`
`287`	`281`	`GlobalSecondaryIndexes: [],`
`288`	`282`	`LocalSecondaryIndexes: [],`
`289`		`- TableName: 'MyTable',`
`290`		`- Tags: []`
	`283`	`+ TableName: 'MyTable'`
`291`	`284`	`}`
`292`	`285`	`}`
`293`	`286`	`}`
`@@ -325,8 +318,7 @@ export = {`
`325`	`318`	`{ AttributeName: 'sortKey', AttributeType: 'N' }`
`326`	`319`	`],`
`327`	`320`	`StreamSpecification: { StreamViewType: 'NEW_IMAGE' },`
`328`		`- TableName: 'MyTable',`
`329`		`- Tags: []`
	`321`	`+ TableName: 'MyTable'`
`330`	`322`	`}`
`331`	`323`	`}`
`332`	`324`	`}`
`@@ -364,8 +356,7 @@ export = {`
`364`	`356`	`{ AttributeName: 'sortKey', AttributeType: 'N' }`
`365`	`357`	`],`
`366`	`358`	`StreamSpecification: { StreamViewType: 'OLD_IMAGE' },`
`367`		`- TableName: 'MyTable',`
`368`		`- Tags: []`
	`359`	`+ TableName: 'MyTable'`
`369`	`360`	`}`
`370`	`361`	`}`
`371`	`362`	`}`
`@@ -462,8 +453,7 @@ export = {`
`462`	`453`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }`
`463`	`454`	`}`
`464`	`455`	`],`
`465`		`- LocalSecondaryIndexes: [],`
`466`		`- Tags: []`
	`456`	`+ LocalSecondaryIndexes: []`
`467`	`457`	`}`
`468`	`458`	`}`
`469`	`459`	`}`
`@@ -514,8 +504,7 @@ export = {`
`514`	`504`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }`
`515`	`505`	`}`
`516`	`506`	`],`
`517`		`- LocalSecondaryIndexes: [],`
`518`		`- Tags: []`
	`507`	`+ LocalSecondaryIndexes: []`
`519`	`508`	`}`
`520`	`509`	`}`
`521`	`510`	`}`
`@@ -564,8 +553,7 @@ export = {`
`564`	`553`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }`
`565`	`554`	`}`
`566`	`555`	`],`
`567`		`- LocalSecondaryIndexes: [],`
`568`		`- Tags: []`
	`556`	`+ LocalSecondaryIndexes: []`
`569`	`557`	`}`
`570`	`558`	`}`
`571`	`559`	`}`
`@@ -618,8 +606,7 @@ export = {`
`618`	`606`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 }`
`619`	`607`	`}`
`620`	`608`	`],`
`621`		`- LocalSecondaryIndexes: [],`
`622`		`- Tags: []`
	`609`	`+ LocalSecondaryIndexes: []`
`623`	`610`	`}`
`624`	`611`	`}`
`625`	`612`	`}`
`@@ -789,8 +776,7 @@ export = {`
`789`	`776`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }`
`790`	`777`	`},`
`791`	`778`	`],`
`792`		`- LocalSecondaryIndexes: [],`
`793`		`- Tags: []`
	`779`	`+ LocalSecondaryIndexes: []`
`794`	`780`	`}`
`795`	`781`	`}`
`796`	`782`	`}`
`@@ -851,8 +837,7 @@ export = {`
`851`	`837`	`ProvisionedThroughput: { ReadCapacityUnits: 5, WriteCapacityUnits: 5 }`
`852`	`838`	`}`
`853`	`839`	`],`
`854`		`- LocalSecondaryIndexes: [],`
`855`		`- Tags: []`
	`840`	`+ LocalSecondaryIndexes: []`
`856`	`841`	`}`
`857`	`842`	`}`
`858`	`843`	`}`
`@@ -897,8 +882,7 @@ export = {`
`897`	`882`	`],`
`898`	`883`	`Projection: { ProjectionType: 'ALL' },`
`899`	`884`	`}`
`900`		`- ],`
`901`		`- Tags: []`
	`885`	`+ ]`
`902`	`886`	`}`
`903`	`887`	`}`
`904`	`888`	`}`
`@@ -944,8 +928,7 @@ export = {`
`944`	`928`	`],`
`945`	`929`	`Projection: { ProjectionType: 'KEYS_ONLY' },`
`946`	`930`	`}`
`947`		`- ],`
`948`		`- Tags: []`
	`931`	`+ ]`
`949`	`932`	`}`
`950`	`933`	`}`
`951`	`934`	`}`
`@@ -994,8 +977,7 @@ export = {`
`994`	`977`	`],`
`995`	`978`	`Projection: { NonKeyAttributes: ['lsiNonKey0', 'lsiNonKey1'], ProjectionType: 'INCLUDE' },`
`996`	`979`	`}`
`997`		`- ],`
`998`		`- Tags: []`
	`980`	`+ ]`
`999`	`981`	`}`
`1000`	`982`	`}`
`1001`	`983`	`}`
`@@ -1100,8 +1082,7 @@ export = {`
`1100`	`1082`	`AttributeDefinitions:`
`1101`	`1083`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1102`	`1084`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1103`		`- TableName: 'MyTable',`
`1104`		`- Tags: [] } },`
	`1085`	`+ TableName: 'MyTable' } },`
`1105`	`1086`	`MyTableReadAutoScalingRoleFEE68E49:`
`1106`	`1087`	`{ Type: 'AWS::IAM::Role',`
`1107`	`1088`	`Properties:`
`@@ -1183,8 +1164,7 @@ export = {`
`1183`	`1164`	`AttributeDefinitions:`
`1184`	`1165`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1185`	`1166`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1186`		`- TableName: 'MyTable',`
`1187`		`- Tags: [] } },`
	`1167`	`+ TableName: 'MyTable' } },`
`1188`	`1168`	`MyTableReadAutoScalingRoleFEE68E49:`
`1189`	`1169`	`{ Type: 'AWS::IAM::Role',`
`1190`	`1170`	`Properties:`
`@@ -1294,8 +1274,7 @@ export = {`
`1294`	`1274`	`AttributeDefinitions:`
`1295`	`1275`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1296`	`1276`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1297`		`- TableName: 'MyTable',`
`1298`		`- Tags: [] } },`
	`1277`	`+ TableName: 'MyTable' } },`
`1299`	`1278`	`MyTableReadAutoScalingRoleFEE68E49:`
`1300`	`1279`	`{ Type: 'AWS::IAM::Role',`
`1301`	`1280`	`Properties:`
`@@ -1373,7 +1352,6 @@ export = {`
`1373`	`1352`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },`
`1374`	`1353`	`GlobalSecondaryIndexes: [],`
`1375`	`1354`	`LocalSecondaryIndexes: [],`
`1376`		`- Tags: [],`
`1377`	`1355`	`AttributeDefinitions:`
`1378`	`1356`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1379`	`1357`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ] } },`
`@@ -1581,8 +1559,7 @@ export = {`
`1581`	`1559`	`AttributeDefinitions:`
`1582`	`1560`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1583`	`1561`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1584`		`- TableName: 'MyTable',`
`1585`		`- Tags: [] } },`
	`1562`	`+ TableName: 'MyTable' } },`
`1586`	`1563`	`MyTableWriteAutoScalingRoleDF7775DE:`
`1587`	`1564`	`{ Type: 'AWS::IAM::Role',`
`1588`	`1565`	`Properties:`
`@@ -1664,8 +1641,7 @@ export = {`
`1664`	`1641`	`AttributeDefinitions:`
`1665`	`1642`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1666`	`1643`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1667`		`- TableName: 'MyTable',`
`1668`		`- Tags: [] } },`
	`1644`	`+ TableName: 'MyTable' } },`
`1669`	`1645`	`MyTableWriteAutoScalingRoleDF7775DE:`
`1670`	`1646`	`{ Type: 'AWS::IAM::Role',`
`1671`	`1647`	`Properties:`
`@@ -1775,8 +1751,7 @@ export = {`
`1775`	`1751`	`AttributeDefinitions:`
`1776`	`1752`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1777`	`1753`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ],`
`1778`		`- TableName: 'MyTable',`
`1779`		`- Tags: [] } },`
	`1754`	`+ TableName: 'MyTable' } },`
`1780`	`1755`	`MyTableWriteAutoScalingRoleDF7775DE:`
`1781`	`1756`	`{ Type: 'AWS::IAM::Role',`
`1782`	`1757`	`Properties:`
`@@ -1854,7 +1829,6 @@ export = {`
`1854`	`1829`	`ProvisionedThroughput: { ReadCapacityUnits: 42, WriteCapacityUnits: 1337 },`
`1855`	`1830`	`GlobalSecondaryIndexes: [],`
`1856`	`1831`	`LocalSecondaryIndexes: [],`
`1857`		`- Tags: [],`
`1858`	`1832`	`AttributeDefinitions:`
`1859`	`1833`	`[ { AttributeName: 'hashKey', AttributeType: 'S' },`
`1860`	`1834`	`{ AttributeName: 'sortKey', AttributeType: 'N' } ] } },`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,6 @@`
`185`	`185`	`"ToPort": 80`
`186`	`186`	`}`
`187`	`187`	`],`
`188`		`- "Tags": [],`
`189`	`188`	`"VpcId": {`
`190`	`189`	`"Ref": "VPCB9E5F0B4"`
`191`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,6 @@`
`343`	`343`	`"ToPort": 80`
`344`	`344`	`}`
`345`	`345`	`],`
`346`		`- "Tags": [],`
`347`	`346`	`"VpcId": {`
`348`	`347`	`"Ref": "VPCB9E5F0B4"`
`349`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,6 @@`
`382`	`382`	`}`
`383`	`383`	`],`
`384`	`384`	`"SecurityGroupIngress": [],`
`385`		`- "Tags": [],`
`386`	`385`	`"VpcId": {`
`387`	`386`	`"Ref": "VPCB9E5F0B4"`
`388`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,9 @@ export class TagManager extends Token {`
`265`	`265`	`protected tagFormatResolve(tagGroups: TagGroups): any {`
`266`	`266`	`const tags = {...tagGroups.nonStickyTags, ...tagGroups.ancestorTags, ...tagGroups.stickyTags};`
`267`	`267`	`for (const key of this.blockedTags) { delete tags[key]; }`
	`268`	`+ if (Object.keys(tags).length === 0) {`
	`269`	`+ return undefined;`
	`270`	`+ }`
`268`	`271`	`return Object.keys(tags).map( key => ({key, value: tags[key]}));`
`269`	`272`	`}`
`270`	`273`	`}`