fix(ec2): flowLogName property for FlowLog construct does not work (#…

…26371) Currently, flowLogName property for FlowLog L2 is never referred in generated CloudFormation template. This PR solves the issue by adding Name tag with the value of flowLogName property. Closes #26370 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Aug 3, 2023 · f910f78 · f910f78
1 parent c84666c
commit f910f78
Show file tree

Hide file tree

Showing 22 changed files with 32,655 additions and 70 deletions.
diff --git a/...t/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/FlowLogsTestStack.assets.json b/...t/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/FlowLogsTestStack.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "a4b59355abf5d8c0386c7a97a5ba8710aa8bd36803e900fdc1db7cd5898ab07f": {
+    "35acc9890f56039e55907e0d94b218fc4900a4e3fa8ebfbf44dafe81b20a0e0d": {
       "source": {
         "path": "FlowLogsTestStack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "a4b59355abf5d8c0386c7a97a5ba8710aa8bd36803e900fdc1db7cd5898ab07f.json",
+          "objectKey": "35acc9890f56039e55907e0d94b218fc4900a4e3fa8ebfbf44dafe81b20a0e0d.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/FlowLogsTestStack.template.json b/...aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/FlowLogsTestStack.template.json
@@ -417,7 +417,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "FlowLogsTestStack/VPC"
+      "Value": "FlowLogsTestStack/VPC/FlowLogsS3"
      }
     ],
     "TrafficType": "ALL"
@@ -441,7 +441,13 @@
       }
      ],
      "Version": "2012-10-17"
-    }
+    },
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ]
    }
   },
   "FlowLogsCWIAMRoleDefaultPolicy943C8A20": {
@@ -487,7 +493,13 @@
   "FlowLogsCWLogGroup0398E8F8": {
    "Type": "AWS::Logs::LogGroup",
    "Properties": {
-    "RetentionInDays": 731
+    "RetentionInDays": 731,
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ]
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
@@ -510,6 +522,12 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ],
     "TrafficType": "ALL"
    }
   },
@@ -527,7 +545,13 @@
       }
      ],
      "Version": "2012-10-17"
-    }
+    },
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+     }
+    ]
    }
   },
   "FlowLogsAllFormatCWIAMRoleDefaultPolicyBE4C71ED": {
@@ -573,7 +597,13 @@
   "FlowLogsAllFormatCWLogGroup3DAB6837": {
    "Type": "AWS::Logs::LogGroup",
    "Properties": {
-    "RetentionInDays": 731
+    "RetentionInDays": 731,
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+     }
+    ]
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
@@ -596,6 +626,12 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+     }
+    ],
     "TrafficType": "ALL"
    }
   },

diff --git a/...mework-integ/test/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/manifest.json b/...mework-integ/test/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a4b59355abf5d8c0386c7a97a5ba8710aa8bd36803e900fdc1db7cd5898ab07f.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/35acc9890f56039e55907e0d94b218fc4900a4e3fa8ebfbf44dafe81b20a0e0d.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/.../framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/tree.json b/.../framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-customformat.js.snapshot/tree.json
@@ -678,7 +678,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "FlowLogsTestStack/VPC"
+                            "value": "FlowLogsTestStack/VPC/FlowLogsS3"
                           }
                         ],
                         "trafficType": "ALL"
@@ -734,7 +734,13 @@
                             }
                           ],
                           "Version": "2012-10-17"
-                        }
+                        },
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -816,7 +822,13 @@
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
                       "aws:cdk:cloudformation:props": {
-                        "retentionInDays": 731
+                        "retentionInDays": 731,
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -851,6 +863,12 @@
                       "Ref": "VPCB9E5F0B4"
                     },
                     "resourceType": "VPC",
+                    "tags": [
+                      {
+                        "key": "Name",
+                        "value": "FlowLogsTestStack/FlowLogsCW"
+                      }
+                    ],
                     "trafficType": "ALL"
                   }
                 },
@@ -898,7 +916,13 @@
                             }
                           ],
                           "Version": "2012-10-17"
-                        }
+                        },
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -980,7 +1004,13 @@
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
                       "aws:cdk:cloudformation:props": {
-                        "retentionInDays": 731
+                        "retentionInDays": 731,
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -1015,6 +1045,12 @@
                       "Ref": "VPCB9E5F0B4"
                     },
                     "resourceType": "VPC",
+                    "tags": [
+                      {
+                        "key": "Name",
+                        "value": "FlowLogsTestStack/FlowLogsAllFormatCW"
+                      }
+                    ],
                     "trafficType": "ALL"
                   }
                 },

diff --git a/.../test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/FlowLogsTestStack.assets.json b/.../test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/FlowLogsTestStack.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "e2671f8cd84932eccd2cf1e512a31437133da0c6cd4658c3863903f1923e8235": {
+    "99fa1ff8164e33fddcfd757915d874057dc931fc37a80fdd64428fa78b9698c7": {
       "source": {
         "path": "FlowLogsTestStack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e2671f8cd84932eccd2cf1e512a31437133da0c6cd4658c3863903f1923e8235.json",
+          "objectKey": "99fa1ff8164e33fddcfd757915d874057dc931fc37a80fdd64428fa78b9698c7.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...est/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/FlowLogsTestStack.template.json b/...est/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/FlowLogsTestStack.template.json
@@ -397,7 +397,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "FlowLogsTestStack/VPC"
+      "Value": "FlowLogsTestStack/VPC/FlowLogsS3"
      }
     ]
    },
@@ -535,7 +535,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "FlowLogsTestStack/VPC"
+      "Value": "FlowLogsTestStack/VPC/FlowLogsS3"
      }
     ],
     "TrafficType": "ALL"
@@ -569,7 +569,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "FlowLogsTestStack/VPC"
+      "Value": "FlowLogsTestStack/VPC/FlowLogsS3KeyPrefix"
      }
     ],
     "TrafficType": "ALL"
@@ -593,7 +593,13 @@
       }
      ],
      "Version": "2012-10-17"
-    }
+    },
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ]
    }
   },
   "FlowLogsCWIAMRoleDefaultPolicy943C8A20": {
@@ -639,7 +645,13 @@
   "FlowLogsCWLogGroup0398E8F8": {
    "Type": "AWS::Logs::LogGroup",
    "Properties": {
-    "RetentionInDays": 731
+    "RetentionInDays": 731,
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ]
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
@@ -662,6 +674,12 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
+    "Tags": [
+     {
+      "Key": "Name",
+      "Value": "FlowLogsTestStack/FlowLogsCW"
+     }
+    ],
     "TrafficType": "ALL"
    }
   },

diff --git a/.../framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/manifest.json b/.../framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e2671f8cd84932eccd2cf1e512a31437133da0c6cd4658c3863903f1923e8235.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/99fa1ff8164e33fddcfd757915d874057dc931fc37a80fdd64428fa78b9698c7.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...ting/framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/tree.json b/...ting/framework-integ/test/aws-ec2/test/integ.vpc-flow-logs-interval.js.snapshot/tree.json
@@ -662,7 +662,7 @@
                             "tags": [
                               {
                                 "key": "Name",
-                                "value": "FlowLogsTestStack/VPC"
+                                "value": "FlowLogsTestStack/VPC/FlowLogsS3"
                               }
                             ]
                           }
@@ -830,7 +830,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "FlowLogsTestStack/VPC"
+                            "value": "FlowLogsTestStack/VPC/FlowLogsS3"
                           }
                         ],
                         "trafficType": "ALL"
@@ -879,7 +879,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "FlowLogsTestStack/VPC"
+                            "value": "FlowLogsTestStack/VPC/FlowLogsS3KeyPrefix"
                           }
                         ],
                         "trafficType": "ALL"
@@ -935,7 +935,13 @@
                             }
                           ],
                           "Version": "2012-10-17"
-                        }
+                        },
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -1017,7 +1023,13 @@
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
                       "aws:cdk:cloudformation:props": {
-                        "retentionInDays": 731
+                        "retentionInDays": 731,
+                        "tags": [
+                          {
+                            "key": "Name",
+                            "value": "FlowLogsTestStack/FlowLogsCW"
+                          }
+                        ]
                       }
                     },
                     "constructInfo": {
@@ -1052,6 +1064,12 @@
                       "Ref": "VPCB9E5F0B4"
                     },
                     "resourceType": "VPC",
+                    "tags": [
+                      {
+                        "key": "Name",
+                        "value": "FlowLogsTestStack/FlowLogsCW"
+                      }
+                    ],
                     "trafficType": "ALL"
                   }
                 },