fix: adding missing App urls and static vars to RCF (#1166)

* fix: adding missing App urls and static vars to RCF and changing function worker runtime to dotnet isolated in RCF

* Env var fixes

* Unrelated Sql Server sku resize to meet test loads

* fix: removing requierment for ServiceBusConnectionString

---------

Co-authored-by: Richard Kingston <[email protected]>

Author: SamRobinson75684

application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/receiveCaasFileConfig.cs

@@ -25,9 +25,8 @@ public class ReceiveCaasFileConfig
     public string caasfolder_STORAGE { get; set; }
     [Required]
     public string inboundBlobName { get; set; }
-    [Required]
     public string ServiceBusConnectionString { get; set; }
     public string GetOrchestrationStatusURL { get; set; }
     public bool UseNewFunctions { get; set; } = false;
-    public string ParticipantManagementQueueName {get; set;}
+    public string ParticipantManagementQueueName { get; set; }
 }

infrastructure/tf-core/environments/development.tfvars

@@ -255,6 +255,10 @@ function_apps = {
           env_var_name     = "PMSRemoveParticipant"
           function_app_key = "RemoveParticipant"
         },
+        {
+          env_var_name     = "PMSUpdateParticipant"
+          function_app_key = "UpdateParticipant"
+        },
         {
           env_var_name     = "StaticValidationURL"
           function_app_key = "StaticValidation"
@@ -266,10 +270,6 @@ function_apps = {
         {
           env_var_name     = "ScreeningLkpDataServiceURL"
           function_app_key = "ScreeningLkpDataService"
-        },
-        {
-          env_var_name     = "UseNewFunctions"
-          function_app_key = "false"
         }
       ],
       storage_containers = [
@@ -288,8 +288,10 @@ function_apps = {
         recordThresholdForBatching = "3"
         batchDivisionFactor        = "2"
         CheckTimer                 = "100"
+        delayBetweenChecks         = "50"
         DemographicURI             = "https://dev-uks-durable-demographic-function.azurewebsites.net/api/DurableDemographicFunction_HttpStart/"
         GetOrchestrationStatusURL  = "https://dev-uks-durable-demographic-function.azurewebsites.net/api/GetOrchestrationStatus"
+        maxNumberOfChecks          = "50"
         AllowDeleteRecords         = true
         TopicName                  = "DistributeParticipantQueue"
         UpdateQueueName            = "update-participant-queue"
@@ -1275,7 +1277,7 @@ sqlserver = {
       licence_type         = "LicenseIncluded"
       max_gb               = 30
       read_scale           = false
-      sku                  = "S1"
+      sku                  = "S2"
       storage_account_type = "Local"
       zone_redundant       = false
     }

infrastructure/tf-core/environments/integration.tfvars

@@ -253,6 +253,10 @@ function_apps = {
           env_var_name     = "PMSRemoveParticipant"
           function_app_key = "RemoveParticipant"
         },
+        {
+          env_var_name     = "PMSUpdateParticipant"
+          function_app_key = "UpdateParticipant"
+        },
         {
           env_var_name     = "StaticValidationURL"
           function_app_key = "StaticValidation"
@@ -282,11 +286,15 @@ function_apps = {
         recordThresholdForBatching = "3"
         batchDivisionFactor        = "2"
         CheckTimer                 = "100"
+        delayBetweenChecks         = "50"
         DemographicURI             = "https://int-uks-durable-demographic-function.azurewebsites.net/api/DurableDemographicFunction_HttpStart/"
         GetOrchestrationStatusURL  = "https://int-uks-durable-demographic-function.azurewebsites.net/api/GetOrchestrationStatus"
+        maxNumberOfChecks          = "50"
         AllowDeleteRecords         = true
+        TopicName                  = "DistributeParticipantQueue"
         UpdateQueueName            = "update-participant-queue"
         maxNumberOfChecks          = "50"
+        ServiceBusConnectionString = ""
         UseNewFunctions            = "false"
       }
 

infrastructure/tf-core/environments/nft.tfvars

@@ -260,6 +260,10 @@ function_apps = {
           env_var_name     = "PMSRemoveParticipant"
           function_app_key = "RemoveParticipant"
         },
+        {
+          env_var_name     = "PMSUpdateParticipant"
+          function_app_key = "UpdateParticipant"
+        },
         {
           env_var_name     = "StaticValidationURL"
           function_app_key = "StaticValidation"
@@ -289,11 +293,15 @@ function_apps = {
         recordThresholdForBatching = "3"
         batchDivisionFactor        = "2"
         CheckTimer                 = "100"
+        delayBetweenChecks         = "50"
         DemographicURI             = "https://nft-uks-durable-demographic-function.azurewebsites.net/api/DurableDemographicFunction_HttpStart/"
         GetOrchestrationStatusURL  = "https://nft-uks-durable-demographic-function.azurewebsites.net/api/GetOrchestrationStatus"
+        maxNumberOfChecks          = "50"
         AllowDeleteRecords         = true
+        TopicName                  = "DistributeParticipantQueue"
         UpdateQueueName            = "update-participant-queue"
         maxNumberOfChecks          = "50"
+        ServiceBusConnectionString = ""
         UseNewFunctions            = "false"
       }
 

infrastructure/tf-core/function_app.tf

@@ -112,7 +112,7 @@ resource "azurerm_role_assignment" "function_send_to_topic" {
 locals {
   app_settings_common = {
     DOCKER_ENABLE_CI                    = var.function_apps.docker_CI_enable
-    FUNCTION_WORKER_RUNTIME             = "dotnet"
+    FUNCTION_WORKER_RUNTIME             = "dotnet-isolated"
     REMOTE_DEBUGGING_ENABLED            = var.function_apps.remote_debugging_enabled
     WEBSITES_ENABLE_APP_SERVICE_STORAGE = var.function_apps.enable_appsrv_storage
     WEBSITE_PULL_IMAGE_OVER_VNET        = var.function_apps.pull_image_over_vnet