Skip to content

Commit 097d472

Browse files
authored
Update azurerm and terraform versions (#8559)
## Context Terraform updates ## Changes proposed in this pull request - azurerm 4.61.0 - terraform 1.14.5 - update TERRAFORM_MODULES_TAG to use testing-azurerm-v4 and stable-azurerm-v4 ## Guidance to review aws-vault exec Deployments -- make qa terraform-app-plan aws-vault exec Deployments -- make staging terraform-app-plan aws-vault exec Deployments -- make production terraform-app-plan aws-vault exec Administrator -- make qa terraform-common-plan aws-vault exec Administrator -- make staging terraform-common-plan aws-vault exec Administrator -- make production terraform-common-plan ## Checklists: ### Data & Schema Changes If this PR modifies data structures or validations, check the following: - [ ] Adds/removes model validations - [ ] Adds/removes database fields - [ ] Modifies Vacancy enumerables (phases, working patterns, job roles, key stages, etc.) <details> <summary>If any of the above options has changed then the author must check/resolve all of the following...</summary> ### Integration Impact Does this change affect any of these integrations? - [ ] DfE Analytics platform - [ ] Legacy imports mappings - [ ] DWP Find a Job export mappings - [ ] Publisher ATS API (may require mapping updates or API versioning) ### User Experience & Data Integrity Could this change impact: - [ ] Existing subscription alerts (will legacy subscription search filters break?) - [ ] Legacy vacancy copying (will copied vacancies fail new validations?) - [ ] In-progress drafts for Vacancies or Job Applications </details>
1 parent debea6f commit 097d472

File tree

13 files changed

+62
-43
lines changed

13 files changed

+62
-43
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG USERNAME=teaching-vacancies
55
ARG USER_UID=1000
66
ARG USER_GID=$USER_UID
77
ARG NODEJS_MAJOR_VERSION=24
8-
ARG TERRAFORM_VERSION=1.5.1
8+
ARG TERRAFORM_VERSION=1.14.5
99

1010
# Set up NodeSource repository for newer Node.JS
1111
RUN apt update -yq \

.github/actions/deploy/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ runs:
5959
- name: Pin Terraform version
6060
uses: hashicorp/setup-terraform@v2
6161
with:
62-
terraform_version: 1.5.1
62+
terraform_version: 1.14.5
6363

6464
- name: Set environment variables for review
6565
if: startsWith( inputs.environment, 'review')

.github/workflows/delete_review_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- name: Terraform pin version
100100
uses: hashicorp/setup-terraform@v3
101101
with:
102-
terraform_version: 1.5.1
102+
terraform_version: 1.14.5
103103

104104
- uses: DFE-Digital/github-actions/set-kubelogin-environment@master
105105
with:

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ruby 3.4.8
22
nodejs 24.8.0
33
yarn 1.22.17
4-
terraform 1.5.1
4+
terraform 1.14.5

global_config/production.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ var_file=production
33
CONFIG_SHORT=pd
44
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production
55
AZURE_RESOURCE_PREFIX=s189p01
6-
TERRAFORM_MODULES_TAG=stable
6+
TERRAFORM_MODULES_TAG=stable-azurerm-v4

global_config/qa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ var_file=qa
33
CONFIG_SHORT=qa
44
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
55
AZURE_RESOURCE_PREFIX=s189t01
6-
TERRAFORM_MODULES_TAG=testing
6+
TERRAFORM_MODULES_TAG=testing-azurerm-v4

global_config/review.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ var_file=review
33
CONFIG_SHORT=rv
44
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
55
AZURE_RESOURCE_PREFIX=s189t01
6-
TERRAFORM_MODULES_TAG=main
6+
TERRAFORM_MODULES_TAG=main-azurerm-v4

global_config/staging.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ var_file=staging
33
CONFIG_SHORT=st
44
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
55
AZURE_RESOURCE_PREFIX=s189t01
6-
TERRAFORM_MODULES_TAG=testing
6+
TERRAFORM_MODULES_TAG=testing-azurerm-v4

terraform/app/.terraform.lock.hcl

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

terraform/app/modules/paas/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ resource "aws_iam_user_policy_attachment" "attachment_images_logos" {
104104

105105
# Azure Storage Account for Documents
106106
module "documents_azure_storage" {
107-
source = "git::https://github.com/DFE-Digital/terraform-modules.git//aks/storage_account?ref=stable"
107+
source = "../../vendor/modules/aks//aks/storage_account"
108108

109109
name = "doc"
110110
environment = var.environment
@@ -135,7 +135,7 @@ module "documents_azure_storage" {
135135

136136
# Azure Storage Account for School Images/Logos
137137
module "images_logos_azure_storage" {
138-
source = "git::https://github.com/DFE-Digital/terraform-modules.git//aks/storage_account?ref=stable"
138+
source = "../../vendor/modules/aks//aks/storage_account"
139139

140140
name = "img"
141141
environment = var.environment

0 commit comments

Comments
 (0)