Merge branch 'main' into scala-steward-dependencies

nationalarchives · Dec 5, 2024 · 0bdcefa · 0bdcefa
2 parents 9a16813 + 08f5afd
commit 0bdcefa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git 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 }}

diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/da-terraform-configurations b/terraform/da-terraform-configurations
diff --git a/terraform/da-terraform-modules b/terraform/da-terraform-modules
diff --git 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"
 }
+4 −0		certificatemanager/data.tf
+41 −0		certificatemanager/main.tf
+3 −0		certificatemanager/outputs.tf
+23 −0		certificatemanager/variables.tf
+12 −1		cloudwatch_alarms/main.tf
+6 −1		cloudwatch_alarms/variables.tf
+16 −0		dynamo/main.tf
+4 −0		dynamo/outputs.tf
+17 −0		dynamo/templates/dynamo_require_ssl.json.tpl
+14 −0		dynamo/variables.tf
+7 −0		ecr/main.tf
+7 −0		ecr/variables.tf
+6 −0		eventbridge_api_destination_rule/main.tf
+3 −0		eventbridge_api_destination_rule/outputs.tf
+5 −0		eventbridge_api_destination_rule/variables.tf
+1 −0		iam_role/main.tf
+6 −0		iam_role/variables.tf
+6 −2		kms/main.tf
+52 −4		lambda/main.tf
+1 −1		lambda/outputs.tf
+23 −0		lambda/variables.tf
+4 −0		route53/locals.tf
+45 −0		route53/main.tf
+3 −0		route53/outputs.tf
+45 −0		route53/variables.tf
+22 −108		s3/main.tf
+60 −0		s3/moved.tf
+11 −0		s3/outputs.tf
+0 −15		s3/templates/default_log_bucket_policy.json.tpl
+9 −3		s3/variables.tf
+9 −0		s3_logs/main.tf
+4 −0		s3_logs/outputs.tf
+20 −0		s3_logs/variables.tf
+83 −0		s3_prototype/main.tf
+9 −0		s3_prototype/outputs.tf
+0 −0		s3_prototype/templates/default_bucket_policy.json.tpl
+29 −0		s3_prototype/variables.tf
+2 −1		sfn/main.tf
+4 −0		sfn/variables.tf
+26 −8		sqs/main.tf
+6 −2		sqs/outputs.tf
+19 −2		sqs/variables.tf
+8 −6		vpc/main.tf
+8 −0		vpc/outputs.tf