Merge pull request #8793 from ministryofjustice/chore/op-migrate

Signed-off-by: Jacob Woffenden <[email protected]>
ministryofjustice · Nov 26, 2024 · d01b22d · d01b22d
2 parents a7716a8 + 0d1851e
commit d01b22d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/terraform/environments/analytical-platform-compute/environment-configuration.tf b/terraform/environments/analytical-platform-compute/environment-configuration.tf
@@ -38,9 +38,6 @@ locals {
       /* MLFlow */
       mlflow_s3_bucket_name = "alpha-analytical-platform-mlflow-development"
 
-      /* Observability Platform */
-      observability_platform = "development"
-
       /* QuickSight */
       quicksight_notification_email = "[email protected]"
 
@@ -79,9 +76,6 @@ locals {
         vpc_cni                = "v1.19.0-eksbuild.1"
       }
 
-      /* Observability Platform */
-      observability_platform = "development"
-
       /* Data Engineering Airflow */
       data_engineering_airflow_execution_role_arn = "arn:aws:iam::${local.environment_management.account_ids["analytical-platform-data-production"]}:role/airflow-dev-execution-role"
 
@@ -132,9 +126,6 @@ locals {
       /* MLFlow */
       mlflow_s3_bucket_name = "alpha-analytical-platform-mlflow"
 
-      /* Observability Platform */
-      observability_platform = "production"
-
       /* QuickSight */
       quicksight_notification_email = "[email protected]"
 

diff --git a/terraform/environments/analytical-platform-compute/observability-platform.tf b/terraform/environments/analytical-platform-compute/observability-platform.tf
@@ -5,7 +5,7 @@ module "observability_platform_tenant" {
   source  = "ministryofjustice/observability-platform-tenant/aws"
   version = "1.2.0"
 
-  observability_platform_account_id = local.environment_management.account_ids["observability-platform-${local.environment_configuration.observability_platform}"]
+  observability_platform_account_id = local.environment_management.account_ids["observability-platform-production"]
   enable_prometheus                 = true
   enable_xray                       = true
   additional_policies = {

diff --git a/terraform/environments/analytical-platform-ingestion/environment-configuration.tf b/terraform/environments/analytical-platform-ingestion/environment-configuration.tf
@@ -19,9 +19,6 @@ locals {
         "10.0.0.0/8"
       ]
 
-      /* Observability Platform */
-      observability_platform = "development"
-
       /* Image Versions */
       scan_image_version     = "0.1.3"
       transfer_image_version = "0.0.18"
@@ -67,9 +64,6 @@ locals {
         "10.0.0.0/8"
       ]
 
-      /* Observability Platform */
-      observability_platform = "production"
-
       /* Image Versions */
       scan_image_version     = "0.1.3"
       transfer_image_version = "0.0.18"

diff --git a/terraform/environments/analytical-platform-ingestion/observability-platform.tf b/terraform/environments/analytical-platform-ingestion/observability-platform.tf
@@ -4,7 +4,7 @@ module "observability_platform_tenant" {
   source  = "ministryofjustice/observability-platform-tenant/aws"
   version = "1.2.0"
 
-  observability_platform_account_id = local.environment_management.account_ids["observability-platform-${local.environment_configuration.observability_platform}"]
+  observability_platform_account_id = local.environment_management.account_ids["observability-platform-production"]
   enable_xray                       = true
 
   tags = local.tags

diff --git a/terraform/environments/analytical-platform-ingestion/route53-resolver-associations.tf b/terraform/environments/analytical-platform-ingestion/route53-resolver-associations.tf
@@ -1,4 +1,5 @@
 module "connected_vpc_route53_resolver_associations" {
+  #checkov:skip=CKV_TF_1:Module registry does not support commit hashes for versions
 
   source  = "terraform-aws-modules/route53/aws//modules/resolver-rule-associations"
   version = "4.1.0"

diff --git a/terraform/environments/analytical-platform-ingestion/route53-resolver-endpoints.tf b/terraform/environments/analytical-platform-ingestion/route53-resolver-endpoints.tf
@@ -1,4 +1,6 @@
 module "connected_vpc_outbound_route53_resolver_endpoint" {
+  #checkov:skip=CKV_TF_1:Module registry does not support commit hashes for versions
+
   source  = "terraform-aws-modules/route53/aws//modules/resolver-endpoints"
   version = "4.1.0"
 
@@ -24,4 +26,4 @@ module "connected_vpc_outbound_route53_resolver_endpoint" {
   ]
 
   tags = local.tags
-}
+}