Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform #51

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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 azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ resource "azurerm_function_app" "function_app" {
tags = local.common_tags

os_type = "linux"
version = "~3"
version = "~4"

site_config {
cors {
Expand All @@ -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"
Expand Down
Loading