Prepare to delete legacy infrastructure

Author: jacobwinch

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

@@ -210,11 +210,6 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
             "PropagateAtLaunch": true,
             "Value": "guardian/mobile-n10n",
           },
-          {
-            "Key": "gu:riffraff:new-asg",
-            "PropagateAtLaunch": true,
-            "Value": "true",
-          },
           {
             "Key": "LogKinesisStreamName",
             "PropagateAtLaunch": true,
@@ -1678,11 +1673,6 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
             "PropagateAtLaunch": true,
             "Value": "guardian/mobile-n10n",
           },
-          {
-            "Key": "gu:riffraff:new-asg",
-            "PropagateAtLaunch": true,
-            "Value": "true",
-          },
           {
             "Key": "LogKinesisStreamName",
             "PropagateAtLaunch": true,

cdk/lib/report.ts

@@ -9,7 +9,6 @@ import { GuStack } from '@guardian/cdk/lib/constructs/core';
 import { GuCname } from '@guardian/cdk/lib/constructs/dns';
 import { GuAllowPolicy } from '@guardian/cdk/lib/constructs/iam';
 import type { App } from 'aws-cdk-lib';
-import { Tags } from 'aws-cdk-lib';
 import { Duration } from 'aws-cdk-lib';
 import type { CfnAutoScalingGroup } from 'aws-cdk-lib/aws-autoscaling';
 import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
@@ -103,9 +102,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`,
 		);
 
-		// This is needed to dual-stack; it can be removed once the legacy infrastructure is cleaned up
-		Tags.of(playApp.autoScalingGroup).add('gu:riffraff:new-asg', 'true');
-
 		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

report/conf/report.yaml

@@ -210,16 +210,6 @@ Resources:
         - autoscaling:EC2_INSTANCE_LAUNCH_ERROR
         - autoscaling:EC2_INSTANCE_TERMINATE_ERROR
         TopicARN: !Sub arn:aws:sns:eu-west-1:${AWS::AccountId}:AutoscalingNotifications${Stage}
-      Tags:
-      - Key: Stage
-        PropagateAtLaunch: true
-        Value: !Ref Stage
-      - Key: Stack
-        PropagateAtLaunch: true
-        Value: !FindInMap [Constants, Stack, Value]
-      - Key: App
-        PropagateAtLaunch: true
-        Value: !FindInMap [Constants, App, Value]
       VPCZoneIdentifier: !Ref PrivateSubnets
   ReportLaunchConfig:
     Type: AWS::AutoScaling::LaunchConfiguration

report/conf/riff-raff.yaml

@@ -16,7 +16,6 @@ deployments:
   report:
     type: autoscaling
     parameters:
-      asgMigrationInProgress: true
       bucketSsmLookup: true
       bucketSsmKey: /account/services/artifact.bucket.n10n
     dependencies: [report-cfn]