diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 96c5467..123c872 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,7 +62,7 @@ stages: - stage: DevDeployment displayName: 'Dev Deployment' - condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/upgrade-terraform')) dependsOn: - Test jobs: diff --git a/terraform/locals.tf b/terraform/locals.tf index 2d85b72..d1dbdfa 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -5,7 +5,7 @@ locals { locals { common_tags = { product = "User Feedback" - owner = "mike.monteith@nhs.net" + owner = "sikander.ali@nhs.net" expires = "Never" environment = var.env } diff --git a/terraform/main.tf b/terraform/main.tf index cc89ad6..43c2459 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -93,7 +93,7 @@ resource "azurerm_function_app" "function_app" { tags = local.common_tags os_type = "linux" - version = "~3" + version = "~4" site_config { cors { @@ -105,7 +105,7 @@ resource "azurerm_function_app" "function_app" { FUNCTIONS_WORKER_RUNTIME = "node" APPINSIGHTS_INSTRUMENTATIONKEY = azurerm_application_insights.application_insights.instrumentation_key APPLICATIONINSIGHTS_CONNECTION_STRING = azurerm_application_insights.application_insights.connection_string - WEBSITE_NODE_DEFAULT_VERSION: "~12" + WEBSITE_NODE_DEFAULT_VERSION: "~20" WEBSITE_CONTENTAZUREFILECONNECTIONSTRING: azurerm_storage_account.storage_account.primary_connection_string WEBSITE_CONTENTSHARE: "nhsuk-user-feedback-func-${var.env}-${local.region_short}" MONGO_CONNECTION_STRING: "${azurerm_cosmosdb_account.db.connection_strings.0}&retrywrites=false&maxIdleTimeMS=120000"