Merge pull request #976 from cabinetoffice/DP-870-uuid-ppon-service-flag

DP-870 UUID PPON Service Flag
cabinetoffice · Nov 25, 2024 · e28ce0f · e28ce0f
2 parents 5ae35b3 + 830e154
commit e28ce0f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Services/CO.CDP.EntityVerification/appsettings.json b/Services/CO.CDP.EntityVerification/appsettings.json
@@ -38,6 +38,6 @@
   },
   "Features": {
     "SwaggerUI": false,
-    "UuidPponService": true
+    "UuidPponService": false
   }
 }
diff --git a/terragrunt/modules/ecs/service-entity-verification.tf b/terragrunt/modules/ecs/service-entity-verification.tf
@@ -7,21 +7,22 @@ module "ecs_service_entity_verification" {
       aspcore_environment                 = local.aspcore_environment
       container_port                      = var.service_configs.entity_verification.port
       cpu                                 = var.service_configs.entity_verification.cpu
+      ev_db_address                       = var.db_entity_verification_address
+      ev_db_name                          = var.db_entity_verification_name
+      ev_db_password                      = "${var.db_entity_verification_credentials_arn}:username::"
+      ev_db_username                      = "${var.db_entity_verification_credentials_arn}:password::"
       host_port                           = var.service_configs.entity_verification.port
       image                               = local.ecr_urls[var.service_configs.entity_verification.name]
       lg_name                             = aws_cloudwatch_log_group.tasks[var.service_configs.entity_verification.name].name
       lg_prefix                           = "app"
       lg_region                           = data.aws_region.current.name
       memory                              = var.service_configs.entity_verification.memory
       name                                = var.service_configs.entity_verification.name
-      ev_db_address                       = var.db_entity_verification_address
-      ev_db_name                          = var.db_entity_verification_name
-      ev_db_password                      = "${var.db_entity_verification_credentials_arn}:username::"
-      ev_db_username                      = "${var.db_entity_verification_credentials_arn}:password::"
       public_domain                       = var.public_domain
       queue_entity_verification_queue_url = var.queue_entity_verification_queue_url
       queue_organisation_queue_url        = var.queue_organisation_queue_url
       service_version                     = local.service_version
+      uuid_ppon_service_enable            = false
       vpc_cidr                            = var.vpc_cider
     }
   )

diff --git a/terragrunt/modules/ecs/templates/task-definitions/entity-verification.json.tftpl b/terragrunt/modules/ecs/templates/task-definitions/entity-verification.json.tftpl
@@ -30,6 +30,7 @@
         {"name": "EntityVerificationDatabase__Database", "value": "${ev_db_name}"},
         {"name": "EntityVerificationDatabase__Host", "value": "${ev_db_address}"},
         {"name": "EntityVerificationDatabase__Server", "value": "${ev_db_address}"},
+        {"name": "Features__UuidPponService", "value": "${uuid_ppon_service_enable}"},
         {"name": "ForwardedHeaders__KnownNetwork", "value": "${vpc_cidr}"},
         {"name": "Organisation__Authority", "value": "https://authority.${public_domain}"}
     ],