Merge pull request #2222 from ministryofjustice/renovate-terraform

Renovate update Terraform
ministryofjustice · Jan 6, 2025 · 18df60c · 18df60c
2 parents 3f53dc5 + ac13eb4
commit 18df60c
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 50 deletions.
diff --git a/terraform/account/terraform.tf b/terraform/account/terraform.tf
@@ -4,8 +4,10 @@ terraform {
     key            = "moj-lasting-power-of-attorney/terraform.tfstate"
     encrypt        = true
     region         = "eu-west-1"
-    role_arn       = "arn:aws:iam::311462405659:role/opg-lpa-ci"
     dynamodb_table = "remote_lock"
+    assume_role = {
+      role_arn = "arn:aws:iam::311462405659:role/opg-lpa-ci"
+    }
   }
 }
 

diff --git a/terraform/account/versions.tf b/terraform/account/versions.tf
@@ -9,5 +9,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/account_ingress/versions.tf b/terraform/account_ingress/versions.tf
@@ -5,5 +5,5 @@ terraform {
       version = "~> 4.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/email/credentials.tf b/terraform/email/credentials.tf
@@ -4,8 +4,10 @@ terraform {
     key            = "moj-lasting-power-of-attorney-email/terraform.tfstate"
     encrypt        = true
     region         = "eu-west-1"
-    role_arn       = "arn:aws:iam::311462405659:role/opg-lpa-ci"
     dynamodb_table = "remote_lock"
+    assume_role = {
+      role_arn = "arn:aws:iam::311462405659:role/opg-lpa-ci"
+    }
   }
 }
 

diff --git a/terraform/email/versions.tf b/terraform/email/versions.tf
@@ -5,5 +5,5 @@ terraform {
       version = "~> 4.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/.terraform.lock.hcl b/terraform/environment/.terraform.lock.hcl
diff --git a/terraform/environment/modules/dns/versions.tf b/terraform/environment/modules/dns/versions.tf
@@ -13,5 +13,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/modules/environment/modules/aurora/versions.tf b/terraform/environment/modules/environment/modules/aurora/versions.tf
@@ -5,5 +5,5 @@ terraform {
       version = "~> 5.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/modules/environment/modules/ecs_autoscaling/versions.tf b/terraform/environment/modules/environment/modules/ecs_autoscaling/versions.tf
@@ -5,5 +5,5 @@ terraform {
       version = "~> 5.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/modules/environment/modules/ecs_scheduled_scaling/versions.tf b/terraform/environment/modules/environment/modules/ecs_scheduled_scaling/versions.tf
@@ -5,5 +5,5 @@ terraform {
       version = "~> 5.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/modules/environment/versions.tf b/terraform/environment/modules/environment/versions.tf
@@ -12,5 +12,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/modules/rds_cross_region_backup/versions.tf b/terraform/environment/modules/rds_cross_region_backup/versions.tf
@@ -12,5 +12,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/environment/terraform.tf b/terraform/environment/terraform.tf
@@ -4,8 +4,10 @@ terraform {
     key            = "moj-lasting-power-of-attorney-environment/terraform.tfstate"
     encrypt        = true
     region         = "eu-west-1"
-    role_arn       = "arn:aws:iam::311462405659:role/opg-lpa-ci"
     dynamodb_table = "remote_lock"
+    assume_role = {
+      role_arn = "arn:aws:iam::311462405659:role/opg-lpa-ci"
+    }
   }
 }
 

diff --git a/terraform/environment/versions.tf b/terraform/environment/versions.tf
@@ -14,5 +14,5 @@ terraform {
     }
   }
 
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/region/modules/region/modules/lambda_function/versions.tf b/terraform/region/modules/region/modules/lambda_function/versions.tf
@@ -9,5 +9,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/region/modules/region/versions.tf b/terraform/region/modules/region/versions.tf
@@ -12,5 +12,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
diff --git a/terraform/region/terraform.tf b/terraform/region/terraform.tf
@@ -1,10 +1,12 @@
 terraform {
   backend "s3" {
-    bucket         = "opg.terraform.state"
-    key            = "moj-lasting-power-of-attorney-region/terraform.tfstate"
-    encrypt        = true
-    region         = "eu-west-1"
-    role_arn       = "arn:aws:iam::311462405659:role/opg-lpa-ci"
+    bucket  = "opg.terraform.state"
+    key     = "moj-lasting-power-of-attorney-region/terraform.tfstate"
+    encrypt = true
+    region  = "eu-west-1"
+    assume_role = {
+      role_arn = "arn:aws:iam::311462405659:role/opg-lpa-ci"
+    }
     dynamodb_table = "remote_lock"
   }
 }

diff --git a/terraform/region/versions.tf b/terraform/region/versions.tf
@@ -9,5 +9,5 @@ terraform {
       version = "~> 2.0"
     }
   }
-  required_version = "1.9.8"
+  required_version = "1.10.3"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,5 +14,5 @@ terraform { @@
         }
       }
-      required_version = "1.9.8"
+      required_version = "1.10.3"
     }