to correct an issue spotted in an ealier release and move data to org…

…inal location
ministryofjustice · May 10, 2024 · 5a83cd4 · 5a83cd4
1 parent 4427851
commit 5a83cd4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/terraform/environments/cooker/data.tf b/terraform/environments/cooker/data.tf
@@ -1 +1,14 @@
 #### This file can be used to store data specific to the member account ####
+
+# For macie code
+ data "aws_s3_bucket" "bucket1" {
+   bucket = "config-20220407082146408700000002"
+ }
+
+ data "aws_s3_bucket" "bucket2" {
+   bucket = "aws-sam-cli-managed-default-samclisourcebucket-1leowh6voenwy"
+ }
+
+ data "aws_s3_bucket" "bucket3" {
+   bucket = "macie-test-results-cooker"
+ }
diff --git a/terraform/environments/cooker/macie.tf b/terraform/environments/cooker/macie.tf
@@ -13,7 +13,7 @@ resource "aws_macie2_classification_job" "test" {
   name     = "JOBNAME"
   s3_job_definition {
     bucket_definitions {
-      account_id = "default_migration_source_account_id"
+      account_id = "data.aws_ssm_parameter.modernisation_platform_account_id.value"
       buckets    = [
       data.aws_s3_bucket.bucket1.id,
       data.aws_s3_bucket.bucket2.id,

diff --git a/terraform/environments/cooker/platform_data.tf b/terraform/environments/cooker/platform_data.tf
@@ -171,16 +171,3 @@ data "aws_iam_session_context" "whoami" {
 data "http" "environments_file" {
   url = "https://raw.githubusercontent.com/ministryofjustice/modernisation-platform/main/environments/${local.application_name}.json"
 }
-
-# For macie code
- data "aws_s3_bucket" "bucket1" {
-   bucket = "config-20220407082146408700000002"
- }
-
- data "aws_s3_bucket" "bucket2" {
-   bucket = "aws-sam-cli-managed-default-samclisourcebucket-1leowh6voenwy"
- }
-
- data "aws_s3_bucket" "bucket3" {
-   bucket = "macie-test-results-cooker"
- }