Skip to content

Commit

Permalink
Linter
Browse files Browse the repository at this point in the history
  • Loading branch information
ross-p-smith committed Jun 1, 2022
1 parent 85daa03 commit 980b955
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions templates/core/terraform/api-webapp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ resource "azurerm_service_plan" "core" {
sku_name = var.api_app_service_plan_sku_size
tags = local.tre_core_tags
worker_count = 1

lifecycle { ignore_changes = [tags] }
}

resource "azurerm_app_service" "api" {
Expand Down
6 changes: 5 additions & 1 deletion templates/core/terraform/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ set -o pipefail
set -o nounset
# set -o xtrace

# This variables are loaded in for us
# shellcheck disable=SC2154
export TF_VAR_docker_registry_server="$TF_VAR_acr_name.azurecr.io"
export TF_VAR_docker_registry_username="${TF_VAR_acr_name}"
export TF_VAR_docker_registry_password=$(az acr credential show --name "${TF_VAR_acr_name}" --query passwords[0].value -o tsv | sed 's/"//g')
TF_VAR_docker_registry_password=$(az acr credential show --name "${TF_VAR_acr_name}" --query passwords[0].value -o tsv | sed 's/"//g')
export TF_VAR_docker_registry_password

# This is where we can migrate any Terraform before we plan and apply
# For instance deprecated Terraform resources
./migrate.sh

PLAN_FILE="tfplan$$"
Expand Down

0 comments on commit 980b955

Please sign in to comment.