revert bucket names

govuk-one-login · Oct 23, 2024 · 99d35ca · 99d35ca
1 parent 08e873a
commit 99d35ca
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/iac/main/resources/athena.yml b/iac/main/resources/athena.yml
@@ -2,7 +2,7 @@ AthenaWorkgroupBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-athena-workgroup-new
+    BucketName: !Sub ${Environment}-dap-athena-workgroup
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-athena-workgroup/log

diff --git a/iac/main/resources/cdn.yaml b/iac/main/resources/cdn.yaml
@@ -3,7 +3,7 @@ DAPAnalystsFilesBucket:
   Condition: IsQuicksightEnvironment
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-analysts-files-new'
+    BucketName: !Sub '${Environment}-dap-analysts-files'
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-analysts-assets/log

diff --git a/iac/main/resources/global.yml b/iac/main/resources/global.yml
@@ -3,7 +3,7 @@ GlobalLogBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-s3-logs-new'
+    BucketName: !Sub '${Environment}-dap-s3-logs'
     PublicAccessBlockConfiguration:
       BlockPublicAcls: true
       BlockPublicPolicy: true
@@ -55,7 +55,7 @@ GlobalNonEventBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-s3-non-event-new'
+    BucketName: !Sub '${Environment}-dap-s3-non-event'
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-s3-non-event/log
@@ -100,7 +100,7 @@ VPCFlowLogsBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-vpc-flow-logs-new'
+    BucketName: !Sub '${Environment}-dap-vpc-flow-logs'
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-s3-flow-log/log
@@ -717,7 +717,7 @@ TrailBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-cloud-trail-new'
+    BucketName: !Sub '${Environment}-dap-cloud-trail'
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: cloudtrail/trail

diff --git a/iac/main/resources/manual-reference-data-ingestion.yml b/iac/main/resources/manual-reference-data-ingestion.yml
@@ -41,7 +41,7 @@ GlueJobResultsBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-glue-job-process-results-new
+    BucketName: !Sub ${Environment}-dap-glue-job-process-results
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-glue-job-process-results/log

diff --git a/iac/main/resources/raw.yml b/iac/main/resources/raw.yml
@@ -2,7 +2,7 @@ RawLayerBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-raw-layer-new
+    BucketName: !Sub ${Environment}-dap-raw-layer
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-raw-layer/log

diff --git a/iac/main/resources/redshift.yml b/iac/main/resources/redshift.yml
@@ -315,7 +315,7 @@ FlywayFilesBucket:
   Type: AWS::S3::Bucket
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-flyway-files-new
+    BucketName: !Sub ${Environment}-dap-flyway-files
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-flyway-files/log

diff --git a/iac/main/resources/stage.yml b/iac/main/resources/stage.yml
@@ -2,7 +2,7 @@ StageLayerBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-stage-layer-new
+    BucketName: !Sub ${Environment}-dap-stage-layer
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-stage-layer/log

diff --git a/iac/main/resources/state-machine.yml b/iac/main/resources/state-machine.yml
@@ -2,7 +2,7 @@ ELTMetadataBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-elt-metadata-new
+    BucketName: !Sub ${Environment}-dap-elt-metadata
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-elt-metadata/log
@@ -83,7 +83,7 @@ StateMachineResultsBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-step-function-process-results-new
+    BucketName: !Sub ${Environment}-dap-step-function-process-results
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-step-function-process-results/log
@@ -323,7 +323,7 @@ DataQualityMetricsBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-data-quality-metrics-new
+    BucketName: !Sub ${Environment}-dap-data-quality-metrics
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-data-quality-metrics/log

diff --git a/iac/main/resources/sustainability.yml b/iac/main/resources/sustainability.yml
@@ -2,7 +2,7 @@ SustainabilityBucket:
   Type: 'AWS::S3::Bucket'
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-sustainability-new
+    BucketName: !Sub ${Environment}-dap-sustainability
     LoggingConfiguration:
       DestinationBucketName: !Ref GlobalLogBucket
       LogFilePrefix: dap-sustainability/log

diff --git a/iac/quicksight-access/resources/quicksight-access.yml b/iac/quicksight-access/resources/quicksight-access.yml
@@ -4,7 +4,7 @@ QuickSightLogBucket:
   Condition: IsQuicksightEnvironment
   Properties:
     AccessControl: Private
-    BucketName: !Sub '${Environment}-dap-quicksight-s3-logs-new'
+    BucketName: !Sub '${Environment}-dap-quicksight-s3-logs'
     PublicAccessBlockConfiguration:
       BlockPublicAcls: true
       BlockPublicPolicy: true

diff --git a/iac/quicksight-access/resources/quicksight-import-export.yml b/iac/quicksight-access/resources/quicksight-import-export.yml
@@ -3,7 +3,7 @@ QuicksightExportBucket:
   Condition: IsQuicksightEnvironment
   Properties:
     AccessControl: Private
-    BucketName: !Sub ${Environment}-dap-quicksight-exports-new
+    BucketName: !Sub ${Environment}-dap-quicksight-exports
     # can't use !Ref GlobalLogBucket here as GlobalLogBucket is in the main stack
     LoggingConfiguration:
       DestinationBucketName: !Sub ${Environment}-dap-s3-logs