refactor(cdk): Remove CFN paramater logical ID rename

The `VpcId` parameter was renamed to `GuCdkVpcId` to avoid conflicts with the YAML template.
The YAML template has been removed in #1606,
so the rename is no longer needed.

Author: akash1810

cdk/lib/__snapshots__/report.test.ts.snap

@@ -59,14 +59,6 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
       "Description": "SSM parameter containing the S3 bucket name holding distribution artifacts",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
-    "GuCdkVpcId": {
-      "AllowedValues": [
-        "/account/vpc/notifications/id",
-      ],
-      "Default": "/account/vpc/notifications/id",
-      "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.",
-      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
-    },
     "LoggingStreamName": {
       "AllowedValues": [
         "/account/services/logging.stream.name.code",
@@ -75,6 +67,14 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
       "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
+    "VpcId": {
+      "AllowedValues": [
+        "/account/vpc/notifications/id",
+      ],
+      "Default": "/account/vpc/notifications/id",
+      "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.",
+      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
+    },
     "reportPrivateSubnets": {
       "AllowedValues": [
         "/account/vpc/notifications/subnets/private",
@@ -383,7 +383,7 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -616,7 +616,7 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -773,7 +773,7 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
         "TargetType": "instance",
         "UnhealthyThresholdCount": 10,
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::ElasticLoadBalancingV2::TargetGroup",
@@ -997,14 +997,6 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
       "Description": "SSM parameter containing the S3 bucket name holding distribution artifacts",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
-    "GuCdkVpcId": {
-      "AllowedValues": [
-        "/account/vpc/notifications/id",
-      ],
-      "Default": "/account/vpc/notifications/id",
-      "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.",
-      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
-    },
     "LoggingStreamName": {
       "AllowedValues": [
         "/account/services/logging.stream.name",
@@ -1013,6 +1005,14 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
       "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
+    "VpcId": {
+      "AllowedValues": [
+        "/account/vpc/notifications/id",
+      ],
+      "Default": "/account/vpc/notifications/id",
+      "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.",
+      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
+    },
     "reportPrivateSubnets": {
       "AllowedValues": [
         "/account/vpc/notifications/subnets/private",
@@ -1321,7 +1321,7 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -1554,7 +1554,7 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -1711,7 +1711,7 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
         "TargetType": "instance",
         "UnhealthyThresholdCount": 10,
         "VpcId": {
-          "Ref": "GuCdkVpcId",
+          "Ref": "VpcId",
         },
       },
       "Type": "AWS::ElasticLoadBalancingV2::TargetGroup",

cdk/lib/report.ts

@@ -1,7 +1,6 @@
 import { GuPlayApp } from '@guardian/cdk';
 import { AccessScope } from '@guardian/cdk/lib/constants';
 import type { GuStackProps } from '@guardian/cdk/lib/constructs/core';
-import { GuVpcParameter } from '@guardian/cdk/lib/constructs/core';
 import { GuStack } from '@guardian/cdk/lib/constructs/core';
 import { GuCname } from '@guardian/cdk/lib/constructs/dns';
 import { GuAllowPolicy } from '@guardian/cdk/lib/constructs/iam';
@@ -85,11 +84,6 @@ export class Report extends GuStack {
 			`/opt/aws-kinesis-agent/configure-aws-kinesis-agent ${this.region} mobile-log-aggregation-${this.stage} /var/log/${app}/application.log`,
 		);
 
-		const vpcParameter = GuVpcParameter.getInstance(this);
-		// This is necessary whilst dual-stacking because there is already a parameter called VpcId in the YAML template
-		// Once the YAML template has been removed we should be able to drop this override
-		vpcParameter.overrideLogicalId('GuCdkVpcId');
-
 		adjustCloudformationParameters(this);
 
 		new GuCname(this, 'DnsRecordForReport', {