From d90b6792f4674d1b728528b3b18f7c7227421d7c Mon Sep 17 00:00:00 2001 From: VimleshGupta Date: Mon, 18 Nov 2024 16:26:36 +0000 Subject: [PATCH 1/4] TDRD-153 - Upgrade terraform and aws provider --- terraform/da-terraform-modules | 2 +- terraform/versions.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/da-terraform-modules b/terraform/da-terraform-modules index d6502c0..5ec89e8 160000 --- a/terraform/da-terraform-modules +++ b/terraform/da-terraform-modules @@ -1 +1 @@ -Subproject commit d6502c06e5df94e3a2f04eaaacd90aedd6601085 +Subproject commit 5ec89e82504e84155e9cb1ce9be984f9305a3556 diff --git a/terraform/versions.tf b/terraform/versions.tf index 1402bb8..2cb7859 100644 --- a/terraform/versions.tf +++ b/terraform/versions.tf @@ -2,8 +2,8 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "5.4.0" + version = ">= 5.76.0" } } - required_version = ">= 1.5.0" + required_version = ">= 1.9.8" } From aa8b7af0c7a9b18b9a0f40da865ce71bea165453 Mon Sep 17 00:00:00 2001 From: VimleshGupta Date: Mon, 18 Nov 2024 16:30:46 +0000 Subject: [PATCH 2/4] Update terraform version in github workflow --- .github/workflows/tdr_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tdr_test.yml b/.github/workflows/tdr_test.yml index 4bf5e89..d68ba5f 100644 --- a/.github/workflows/tdr_test.yml +++ b/.github/workflows/tdr_test.yml @@ -13,7 +13,7 @@ jobs: name: Check terraform uses: nationalarchives/tdr-github-actions/.github/workflows/terraform_check.yml@main with: - terraform-version: '1.5.0' + terraform-version: '1.9.8' working-directory: terraform secrets: MANAGEMENT_ACCOUNT: ${{ secrets.TDR_MANAGEMENT_ACCOUNT }} From 0d5e49067bf2fcfdb97447662d9c5bb4503b8184 Mon Sep 17 00:00:00 2001 From: VimleshGupta Date: Mon, 18 Nov 2024 16:42:06 +0000 Subject: [PATCH 3/4] Update terraform lock --- terraform/.terraform.lock.hcl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index cb96e92..711fbe1 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" - constraints = "5.4.0" + version = "5.76.0" + constraints = ">= 5.76.0" hashes = [ - "h1:Jol4lNIzMrREQzUBSveCLX0iQLy7dm0OF+IYY2GKrhY=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:JSLR3JP9naVcnH0PHcDwwHr3aQB9vlW0+b8HQma1GpU=", + "zh:05b2a0d25fc07576f6698d4840d0d2ae2599484c49f1b911ea1154584557bc13", + "zh:1b22dd1d9c482739e133adb996a9c8b285ca7d978d0fe04deaa5588eba5d254c", + "zh:216088c8800e7b8d7eff7b1a822317bc6faec64f27946ffd22bb3494ac4175cb", + "zh:43e994112b1484bf49945c4885aa2fee32486c9a5d64b9146bbd6f309f24e332", + "zh:46a28ba800f176eef500f998217bccc331605ef05f11abb1728f727a81f3a8b0", + "zh:4fad2743174a600da76a0cceeec2fef8399a18d880ba8929d811cd5cea1b5dee", + "zh:5c42a2c1438cd7533456026f52b562715664490711fdea809f44610a7565c145", + "zh:792d4fd4be434682e4540d2579505c7f11f39d0efe1d12ee2761ed0d46c8cd51", + "zh:7bb5f9f87c9da6d62d6f89504f01a9d6d2f19dcaa0efc46ea51ebdc4bb6fd536", + "zh:81cdbd97f81b1110fce793944d5668a4389904979eb7d178d3142a6b0e175e5e", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:ab4b881eb0f3812b702aaecf921c5c16bbcc33d61d668be4d72d6da9c57ded85", + "zh:c1d9d1166fd948845614deef81f3197568d0d3c2a03b8b97fff308ebc59043f9", + "zh:cda7530f2c01434e483d3faf62fc0685295e7f844176aa38df1ba65fa6a4407a", + "zh:fdad558b1c41aa68123d0da82cc0d65bc86d09eaa1ab1d3a167ec3bce0fc0c66", ] } From bfa5c21416a1da4b756821a4e7866c10943892b8 Mon Sep 17 00:00:00 2001 From: VimleshGupta Date: Wed, 20 Nov 2024 17:30:10 +0000 Subject: [PATCH 4/4] Update submodule hashes --- terraform/da-terraform-configurations | 2 +- terraform/da-terraform-modules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/da-terraform-configurations b/terraform/da-terraform-configurations index 07c2c93..0a9b6a2 160000 --- a/terraform/da-terraform-configurations +++ b/terraform/da-terraform-configurations @@ -1 +1 @@ -Subproject commit 07c2c93084068e48b281f3083a1da818c968cf5d +Subproject commit 0a9b6a2a6726d6605015b0419cc2c6562731c04a diff --git a/terraform/da-terraform-modules b/terraform/da-terraform-modules index 5ec89e8..aea2e7b 160000 --- a/terraform/da-terraform-modules +++ b/terraform/da-terraform-modules @@ -1 +1 @@ -Subproject commit 5ec89e82504e84155e9cb1ce9be984f9305a3556 +Subproject commit aea2e7bec5e554e9e5b6fc783e2255a4b9eeda0a