feat: Service Bus config for Dev and Sandbox (#1233)

* feat: Service Bus config for Dev and Sandbox

* Add sbs conn string to StaticValidation

Author: rfk-nc

.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 parameters:

infrastructure/tf-core/environments/development.tfvars

@@ -238,12 +238,13 @@ function_apps = {
   health_check_path             = "/api/health"
 
   fa_config = {
+
     ReceiveCaasFile = {
       name_suffix                  = "receive-caas-file"
       function_endpoint_name       = "ReceiveCaasFile"
       app_service_plan_key         = "DefaultPlan"
-      producer_to_service_bus      = ["dtoss-nsp"]
       db_connection_string         = "DtOsDatabaseConnectionString"
+      service_bus_connections      = ["internal"]
       storage_account_env_var_name = "caasfolder_STORAGE"
       env_vars = {
         app_urls = {
@@ -266,9 +267,8 @@ function_apps = {
           GetOrchestrationStatusURL  = "https://dev-uks-durable-demographic-function.azurewebsites.net/api/GetOrchestrationStatus"
           maxNumberOfChecks          = "50"
           AllowDeleteRecords         = true
-          TopicName                  = "DistributeParticipantQueue"
+          ParticipantManagementTopic = "participant-management"
           UpdateQueueName            = "update-participant-queue"
-          maxNumberOfChecks          = "50"
           UseNewFunctions            = "false"
         }
         storage_containers = {
@@ -426,16 +426,21 @@ function_apps = {
     }
 
     CreateException = {
-      name_suffix            = "create-exception"
-      function_endpoint_name = "CreateException"
-      app_service_plan_key   = "DefaultPlan"
-      db_connection_string   = "DtOsDatabaseConnectionString"
+      name_suffix             = "create-exception"
+      function_endpoint_name  = "CreateException"
+      app_service_plan_key    = "DefaultPlan"
+      db_connection_string    = "DtOsDatabaseConnectionString"
+      service_bus_connections = ["internal"]
       env_vars = {
         app_urls = {
           DemographicDataServiceURL         = "ParticipantDemographicDataService"
           ExceptionManagementDataServiceURL = "ExceptionManagementDataService"
           GPPracticeDataServiceURL          = "GPPracticeDataService"
         }
+        static = {
+          CreateExceptionTopic        = "create-exception"
+          CreateExceptionSubscription = "create-exception-CreateException"
+        }
       }
     }
 
@@ -461,22 +466,27 @@ function_apps = {
       function_endpoint_name = "StaticValidation"
       app_service_plan_key   = "DefaultPlan"
       db_connection_string   = "DtOsDatabaseConnectionString"
+      service_bus_connections = ["internal"]
       env_vars = {
         app_urls = {
           ExceptionFunctionURL      = "CreateException"
           RemoveOldValidationRecord = "RemoveValidationExceptionData"
         }
+        static = {
+          CreateExceptionTopic = "create-exception"
+        }
         storage_containers = {
           BlobContainerName = "config"
         }
       }
     }
 
     LookupValidation = {
-      name_suffix            = "lookup-validation"
-      function_endpoint_name = "LookupValidation"
-      app_service_plan_key   = "DefaultPlan"
-      db_connection_string   = "DtOsDatabaseConnectionString"
+      name_suffix             = "lookup-validation"
+      function_endpoint_name  = "LookupValidation"
+      app_service_plan_key    = "DefaultPlan"
+      db_connection_string    = "DtOsDatabaseConnectionString"
+      service_bus_connections = ["internal"]
       env_vars = {
         app_urls = {
           ExceptionFunctionURL  = "CreateException"
@@ -801,16 +811,16 @@ function_apps = {
     }
 
     CohortDistributionDataService = {
-      name_suffix            = "cohort-distribution-data-service"
-      function_endpoint_name = "CohortDistributionDataService"
-      app_service_plan_key   = "HighLoadFunctions"
-      db_connection_string   = "DtOsDatabaseConnectionString"
+      name_suffix             = "cohort-distribution-data-service"
+      function_endpoint_name  = "CohortDistributionDataService"
+      app_service_plan_key    = "HighLoadFunctions"
+      db_connection_string    = "DtOsDatabaseConnectionString"
       env_vars = {
         app_urls = {
           ExceptionFunctionURL = "CreateException"
         }
         static = {
-          AcceptableLatencyThresholdMs = "500"
+          AcceptableLatencyThresholdMs   = "500"
         }
       }
     }
@@ -884,7 +894,6 @@ function_apps = {
       }
     }
 
-
     RetrievePDSDemographic = {
       name_suffix            = "retrieve-pds-demographic"
       function_endpoint_name = "RetrievePDSDemographic"
@@ -1039,35 +1048,27 @@ key_vault = {
 }
 
 service_bus = {
-  distribute-participant = {
+  internal = {
     capacity         = 1
     sku_tier         = "Premium"
     max_payload_size = "100mb"
     topics = {
-      cohort-distribution-queue = {
+      cohort-distribution = {
         batched_operations_enabled = true
+        # subscribers                = ["DistributeParticipant"] # Not deployed in Cohort Manager yet
       }
-      add-participant-queue = {
+      create-exception = {
         batched_operations_enabled = true
+        subscribers                = ["CreateException"]
       }
-      update-participant-queue = {
+      participant-management = {
         batched_operations_enabled = true
+        # subscribers                = ["ManageParticipant"] # Not deployed in Cohort Manager yet
       }
     }
   }
 }
 
-# service_bus_subscriptions = {
-#   subscriber_config = {
-#     event-dev-ap = {
-#       subscription_name       = "events-sub"
-#       topic_name              = "events"
-#       namespace_name          = "dtoss-nsp"
-#       subscriber_functionName = "foundryRelay"
-#     }
-#   }
-# }
-
 sqlserver = {
   sql_admin_group_name                 = "sqlsvr_cohman_dev_uks_admin"
   ad_auth_only                         = true

infrastructure/tf-core/environments/integration.tfvars

@@ -1057,17 +1057,6 @@ service_bus = {
   }
 }
 
-# service_bus_subscriptions = {
-#   subscriber_config = {
-#     event-dev-ap = {
-#       subscription_name       = "events-sub"
-#       topic_name              = "events"
-#       namespace_name          = "dtoss-nsp"
-#       subscriber_functionName = "foundryRelay"
-#     }
-#   }
-# }
-
 sqlserver = {
   sql_admin_group_name                 = "sqlsvr_cohman_int_uks_admin"
   ad_auth_only                         = true

infrastructure/tf-core/environments/nft.tfvars

@@ -1057,17 +1057,6 @@ service_bus = {
   }
 }
 
-# service_bus_subscriptions = {
-#   subscriber_config = {
-#     event-dev-ap = {
-#       subscription_name       = "events-sub"
-#       topic_name              = "events"
-#       namespace_name          = "dtoss-nsp"
-#       subscriber_functionName = "foundryRelay"
-#     }
-#   }
-# }
-
 sqlserver = {
   sql_admin_group_name                 = "sqlsvr_cohman_nft_uks_admin"
   ad_auth_only                         = true