Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/acr-image-retag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-dev-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-dev-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-int-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-int-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-nft-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-nft-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-preprod-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-prod-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-prod-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 040e28a8c70cc60647fb9523e0b3ebaaeda43cd5
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
4 changes: 2 additions & 2 deletions .azuredevops/pipelines/post-deployment-tests-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

variables:
Expand All @@ -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 }}:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/task_azure_sql_scaling_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/task_azure_sql_scaling_int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/task_azure_sql_scaling_nft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
- repository: dtos-devops-templates
type: github
name: NHSDigital/dtos-devops-templates
ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
ref: 5603d4113500a7df3d7320e675fef9598c3aac65
endpoint: NHSDigital

parameters:
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/development.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/integration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/nft.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/preprod.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/production.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/environments/sandbox.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/tf-core/function_app.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/tf-core/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading