diff --git a/.azuredevops/pipelines/acr-image-retag.yaml b/.azuredevops/pipelines/acr-image-retag.yaml index 1381413bec..852bd8a891 100644 --- a/.azuredevops/pipelines/acr-image-retag.yaml +++ b/.azuredevops/pipelines/acr-image-retag.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml b/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml index 788ab900ba..28290e7bc4 100644 --- a/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml +++ b/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml @@ -8,7 +8,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml index f627054b82..d5824e5d4a 100644 --- a/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml index 5522a43a6b..7373f54288 100644 --- a/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml index 0c402caf6f..a6ddb2ff67 100644 --- a/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-int-core.yaml b/.azuredevops/pipelines/cd-infrastructure-int-core.yaml index 163af549a6..ee40def3ea 100644 --- a/.azuredevops/pipelines/cd-infrastructure-int-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-int-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml index 162cbd3e9e..7f5c67ee43 100644 --- a/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml index 29abbc0bb9..b74c555afd 100644 --- a/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml index 5e6bf0f942..49fa095d9a 100644 --- a/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml index 1fa91146b7..68b14943c8 100644 --- a/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml index 7c1855dd26..841e32dbfe 100644 --- a/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml index d702c85093..e1e4e0b734 100644 --- a/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml index 8ec5b95e64..4e113d09a9 100644 --- a/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml @@ -13,7 +13,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml index ddc7bc5136..2dee6df590 100644 --- a/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml +++ b/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml @@ -9,7 +9,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/post-deployment-tests-dev.yaml b/.azuredevops/pipelines/post-deployment-tests-dev.yaml index 4d1fdb07fd..ec712eec36 100644 --- a/.azuredevops/pipelines/post-deployment-tests-dev.yaml +++ b/.azuredevops/pipelines/post-deployment-tests-dev.yaml @@ -16,7 +16,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital variables: @@ -42,7 +42,7 @@ parameters: - regression_e2e_epic2Med - regression_e2e_epic3Med - regression_e2e_epic4c - - regression_e2e_epic4d + - regression_e2e_epic4d stages: - ${{ each testType in parameters.testTypes }}: diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml index baa12ecc78..82920f312c 100644 --- a/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml +++ b/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml @@ -27,7 +27,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml index d3a9ea4821..58ef1a8276 100644 --- a/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml +++ b/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml @@ -27,7 +27,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml index 9fc69d9ff4..7e71f0c87d 100644 --- a/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml +++ b/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml @@ -27,7 +27,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml index 6e1048b191..9d282ed4e5 100644 --- a/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml +++ b/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml @@ -27,7 +27,7 @@ resources: - repository: dtos-devops-templates type: github name: NHSDigital/dtos-devops-templates - ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003 + ref: 5603d4113500a7df3d7320e675fef9598c3aac65 endpoint: NHSDigital parameters: diff --git a/infrastructure/tf-core/environments/development.tfvars b/infrastructure/tf-core/environments/development.tfvars index f59cbe3cdb..e35de32601 100644 --- a/infrastructure/tf-core/environments/development.tfvars +++ b/infrastructure/tf-core/environments/development.tfvars @@ -272,6 +272,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = true remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/environments/integration.tfvars b/infrastructure/tf-core/environments/integration.tfvars index 4b428c7086..c26d13ca7c 100644 --- a/infrastructure/tf-core/environments/integration.tfvars +++ b/infrastructure/tf-core/environments/integration.tfvars @@ -272,6 +272,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = false remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/environments/nft.tfvars b/infrastructure/tf-core/environments/nft.tfvars index 4107cd3b2f..ace3aa1a5e 100644 --- a/infrastructure/tf-core/environments/nft.tfvars +++ b/infrastructure/tf-core/environments/nft.tfvars @@ -272,6 +272,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = false remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/environments/preprod.tfvars b/infrastructure/tf-core/environments/preprod.tfvars index ace56f8f79..1c496bfc77 100644 --- a/infrastructure/tf-core/environments/preprod.tfvars +++ b/infrastructure/tf-core/environments/preprod.tfvars @@ -272,6 +272,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = false remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/environments/production.tfvars b/infrastructure/tf-core/environments/production.tfvars index d4fb3dcd37..af9e6218d1 100644 --- a/infrastructure/tf-core/environments/production.tfvars +++ b/infrastructure/tf-core/environments/production.tfvars @@ -273,6 +273,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = false remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/environments/sandbox.tfvars b/infrastructure/tf-core/environments/sandbox.tfvars index 093a8358b7..4dec5e9bfd 100644 --- a/infrastructure/tf-core/environments/sandbox.tfvars +++ b/infrastructure/tf-core/environments/sandbox.tfvars @@ -325,6 +325,7 @@ function_apps = { enable_appsrv_storage = "false" ftps_state = "Disabled" https_only = true + http2_enabled = true remote_debugging_enabled = false storage_uses_managed_identity = null worker_32bit = false diff --git a/infrastructure/tf-core/function_app.tf b/infrastructure/tf-core/function_app.tf index c3107e3941..cbe71c972a 100644 --- a/infrastructure/tf-core/function_app.tf +++ b/infrastructure/tf-core/function_app.tf @@ -39,8 +39,9 @@ module "functionapp" { cont_registry_use_mi = var.function_apps.cont_registry_use_mi # Other Function App configuration settings: - always_on = var.function_apps.always_on - worker_32bit = var.function_apps.worker_32bit + always_on = var.function_apps.always_on + worker_32bit = var.function_apps.worker_32bit + http2_enabled = var.function_apps.http2_enabled acr_mi_client_id = data.azurerm_user_assigned_identity.acr_mi.client_id acr_login_server = data.azurerm_container_registry.acr.login_server @@ -110,6 +111,7 @@ locals { app_settings_common = { DOCKER_ENABLE_CI = var.function_apps.docker_CI_enable 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 diff --git a/infrastructure/tf-core/variables.tf b/infrastructure/tf-core/variables.tf index f7009ea821..477b040982 100644 --- a/infrastructure/tf-core/variables.tf +++ b/infrastructure/tf-core/variables.tf @@ -232,6 +232,7 @@ variable "function_apps" { ftps_state = string health_check_path = optional(string, "") https_only = bool + http2_enabled = optional(bool, false) pull_image_over_vnet = optional(bool, true) remote_debugging_enabled = bool storage_uses_managed_identity = bool