refactor: Rename CFN parameters to avoid GuCDK clash

The GuCDK pattern will add CFN parameters named `LoggingStreamName` and `VpcId`.
CFN parameters must have a unique name, so rename the ones in the YAML template to avoid a clash.

Co-authored-by: Julia <JuliaBrigitte@users.noreply.github.com>

Author: akash1810

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

@@ -84,14 +84,19 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
       "Description": "The HostedZone, should contain the trailing dot zone.example.com.",
       "Type": "String",
     },
-    "LoggingStreamName": {
+    "LegacyLoggingStreamName": {
       "AllowedValues": [
         "/account/services/logging.stream.name.code",
         "/account/services/logging.stream.name",
       ],
       "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
+    "LegacyVpcId": {
+      "Default": "/account/vpc/notifications/id",
+      "Description": "The VPC",
+      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
+    },
     "NotEnough200sPerDayThreshold": {
       "Description": "Alarm if less than too many 200s. This value was based on just below 2 standard deviations from the mean over 6 weeks of data.",
       "Type": "Number",
@@ -120,10 +125,6 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
       "Description": "Environment name",
       "Type": "String",
     },
-    "VpcId": {
-      "Description": "The VPC",
-      "Type": "AWS::EC2::VPC::Id",
-    },
   },
   "Resources": {
     "DistributionInstanceProfile": {
@@ -413,7 +414,7 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "VpcId",
+          "Ref": "LegacyVpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -460,7 +461,7 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "VpcId",
+          "Ref": "LegacyVpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -774,7 +775,7 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
             "Key": "LogKinesisStreamName",
             "PropagateAtLaunch": true,
             "Value": {
-              "Ref": "LoggingStreamName",
+              "Ref": "LegacyLoggingStreamName",
             },
           },
           {
@@ -967,14 +968,19 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
       "Description": "The HostedZone, should contain the trailing dot zone.example.com.",
       "Type": "String",
     },
-    "LoggingStreamName": {
+    "LegacyLoggingStreamName": {
       "AllowedValues": [
         "/account/services/logging.stream.name.code",
         "/account/services/logging.stream.name",
       ],
       "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
+    "LegacyVpcId": {
+      "Default": "/account/vpc/notifications/id",
+      "Description": "The VPC",
+      "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
+    },
     "NotEnough200sPerDayThreshold": {
       "Description": "Alarm if less than too many 200s. This value was based on just below 2 standard deviations from the mean over 6 weeks of data.",
       "Type": "Number",
@@ -1003,10 +1009,6 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
       "Description": "Environment name",
       "Type": "String",
     },
-    "VpcId": {
-      "Description": "The VPC",
-      "Type": "AWS::EC2::VPC::Id",
-    },
   },
   "Resources": {
     "DistributionInstanceProfile": {
@@ -1296,7 +1298,7 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "VpcId",
+          "Ref": "LegacyVpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -1343,7 +1345,7 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
           },
         ],
         "VpcId": {
-          "Ref": "VpcId",
+          "Ref": "LegacyVpcId",
         },
       },
       "Type": "AWS::EC2::SecurityGroup",
@@ -1657,7 +1659,7 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
             "Key": "LogKinesisStreamName",
             "PropagateAtLaunch": true,
             "Value": {
-              "Ref": "LoggingStreamName",
+              "Ref": "LegacyLoggingStreamName",
             },
           },
           {

registration/conf/registration.yaml

@@ -47,9 +47,10 @@ Parameters:
   AlarmTopic:
     Type: String
     Description: The ARN of the SNS topic to send all the cloudwatch alarms to
-  VpcId:
-    Type: AWS::EC2::VPC::Id
+  LegacyVpcId:
+    Type: AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>
     Description: The VPC
+    Default: /account/vpc/notifications/id
   PublicSubnets:
     Type: List<AWS::EC2::Subnet::Id>
     Description: The public subnets of the VPC for the loadbalancer
@@ -83,7 +84,7 @@ Parameters:
   RunbookCopy:
     Type: String
     Default: <<<Runbook|https://docs.google.com/document/d/1aJMytnPGeWH8YLpD2_66doxqyr8dPvAVonYIOG-zmOA>>>
-  LoggingStreamName:
+  LegacyLoggingStreamName:
     Type: AWS::SSM::Parameter::Value<String>
     Description: SSM parameter containing the Name (not ARN) on the kinesis stream
     AllowedValues:
@@ -195,7 +196,7 @@ Resources:
         IpProtocol: tcp
         SourceSecurityGroupId: !Ref LoadBalancerSecurityGroup
         ToPort: 9000
-      VpcId: !Ref VpcId
+      VpcId: !Ref LegacyVpcId
   LoadBalancerToPrivateASG:
     Type: AWS::ElasticLoadBalancing::LoadBalancer
     Properties:
@@ -228,7 +229,7 @@ Resources:
         FromPort: 443
         IpProtocol: tcp
         ToPort: 443
-      VpcId: !Ref VpcId
+      VpcId: !Ref LegacyVpcId
   LowCPUAlarm:
     Type: AWS::CloudWatch::Alarm
     Properties:
@@ -282,7 +283,7 @@ Resources:
         Value: registration.service
         PropagateAtLaunch: true
       - Key: LogKinesisStreamName
-        Value: !Ref LoggingStreamName
+        Value: !Ref LegacyLoggingStreamName
         PropagateAtLaunch: true
       VPCZoneIdentifier: !Ref PrivateSubnets
   RegistrationLaunchConfig:

registration/conf/riff-raff.yaml

@@ -15,10 +15,10 @@ deployments:
         PROD: Registration-PROD.template.json
       templateStageParameters:
         CODE:
-          LoggingStreamName: /account/services/logging.stream.name.code
+          LegacyLoggingStreamName: /account/services/logging.stream.name.code
           DatabaseAccessSecurityGroup: /CODE/mobile-notifications/registrations-db/postgres-access-security-group
         PROD:
-          LoggingStreamName: /account/services/logging.stream.name
+          LegacyLoggingStreamName: /account/services/logging.stream.name
           DatabaseAccessSecurityGroup: /PROD/mobile-notifications/registrations-db/postgres-access-security-group
   registration:
     type: autoscaling