Skip to content

Commit ee1be7b

Browse files
authored
Merge pull request #171 from NHSDigital/update-tf-provider
Update tf provider
2 parents 3d408d5 + eed76f0 commit ee1be7b

3 files changed

Lines changed: 29 additions & 16 deletions

File tree

infrastructure/terraform/.terraform.lock.hcl

Lines changed: 18 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infrastructure/terraform/providers.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ terraform {
22
required_providers {
33
azurerm = {
44
source = "hashicorp/azurerm"
5-
version = "4.25.0"
5+
version = "4.34.0"
6+
}
7+
azuread = {
8+
source = "hashicorp/azuread"
9+
version = "3.4.0"
610
}
711
}
812
backend "azurerm" {

scripts/terraform/terraform.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ get-subscription-ids: # Retrieve the hub subscription ID based on the subscripti
3232
$(eval HUB_SUBSCRIPTION_ID=$(shell az account show --query id --output tsv --name ${HUB_SUBSCRIPTION}))
3333
$(if ${ARM_SUBSCRIPTION_ID},,$(eval export ARM_SUBSCRIPTION_ID=$(shell az account show --query id --output tsv)))
3434

35+
terraform-init-no-backend: # Initialise terraform modules only and update terraform lock file - make terraform-init-no-backend
36+
rm -rf infrastructure/modules/dtos-devops-templates
37+
git -c advice.detachedHead=false clone --depth=1 --single-branch --branch main \
38+
https://github.com/NHSDigital/dtos-devops-templates.git infrastructure/modules/dtos-devops-templates
39+
terraform -chdir=infrastructure/terraform init -upgrade -backend=false
40+
3541
terraform-init: set-azure-account get-subscription-ids # Initialise Terraform - make <env> terraform-init
3642
$(eval STORAGE_ACCOUNT_NAME=samanbrs${ENV_CONFIG}tfstate)
3743
$(eval export ARM_USE_AZUREAD=true)

0 commit comments

Comments
 (0)