From 6096b6820eb6ffb7e31996d357adaa8c58e9d00e Mon Sep 17 00:00:00 2001
From: koladeadewuyi-moj <136330532+koladeadewuyi-moj@users.noreply.github.com>
Date: Tue, 12 Dec 2023 12:49:29 +0000
Subject: [PATCH] DPR2-245: Enable versioning on dpr-schema bucket (#4281)

---
 terraform/environments/digital-prison-reporting/main.tf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/terraform/environments/digital-prison-reporting/main.tf b/terraform/environments/digital-prison-reporting/main.tf
index a53250f2e51..09ff89712a2 100644
--- a/terraform/environments/digital-prison-reporting/main.tf
+++ b/terraform/environments/digital-prison-reporting/main.tf
@@ -117,7 +117,7 @@ module "glue_reporting_hub_batch_job" {
     "--dpr.structured.s3.path"              = "s3://${module.s3_structured_bucket.bucket_id}/"
     "--dpr.violations.s3.path"              = "s3://${module.s3_violation_bucket.bucket_id}/"
     "--dpr.curated.s3.path"                 = "s3://${module.s3_curated_bucket.bucket_id}/"
-    "--dpr.contract.registryName"           = trimprefix(module.glue_registry_avro.registry_name, "${local.glue_avro_registry[0]}/")
+    "--dpr.contract.registryName"           = module.s3_schema_registry_bucket.bucket_id
     "--dpr.datastorage.retry.maxAttempts"   = local.reporting_hub_batch_job_retry_max_attempts
     "--dpr.datastorage.retry.minWaitMillis" = local.reporting_hub_batch_job_retry_min_wait_millis
     "--dpr.datastorage.retry.maxWaitMillis" = local.reporting_hub_batch_job_retry_max_wait_millis
@@ -177,7 +177,7 @@ module "glue_reporting_hub_cdc_job" {
     "--enable-spark-ui"                     = false
     "--enable-auto-scaling"                 = true
     "--enable-job-insights"                 = true
-    "--dpr.contract.registryName"           = trimprefix(module.glue_registry_avro.registry_name, "${local.glue_avro_registry[0]}/")
+    "--dpr.contract.registryName"           = module.s3_schema_registry_bucket.bucket_id
     "--dpr.domain.registry"                 = "${local.project}-domain-registry-${local.environment}"
     "--dpr.domain.target.path"              = "s3://${module.s3_domain_bucket.bucket_id}"
     "--dpr.domain.catalog.db"               = module.glue_data_domain_database.db_name
@@ -233,7 +233,7 @@ module "glue_hive_table_creation_job" {
     "--dpr.structured.database"   = module.glue_structured_zone_database.db_name
     "--dpr.curated.database"      = module.glue_curated_zone_database.db_name
     "--dpr.prisons.database"      = module.glue_prisons_database.db_name
-    "--dpr.contract.registryName" = trimprefix(module.glue_registry_avro.registry_name, "${local.glue_avro_registry[0]}/")
+    "--dpr.contract.registryName" = module.s3_schema_registry_bucket.bucket_id
     "--dpr.log.level"             = local.refresh_job_log_level
   }
 
@@ -499,6 +499,8 @@ module "s3_schema_registry_bucket" {
   custom_kms_key            = local.s3_kms_arn
   create_notification_queue = false # For SQS Queue
   enable_lifecycle          = true
+  enable_s3_versioning      = true
+  enable_versioning_config  = "Enabled"
 
   tags = merge(
     local.all_tags,