Update Terraform versions and dependencies

home-assistant · Sep 27, 2024 · 7682d8b · 7682d8b
1 parent 4485ecf
commit 7682d8b
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 27 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.0
 
       - name: Setup Terraform
         uses: hashicorp/[email protected]

diff --git a/.modules/service/policy.tf b/.modules/service/policy.tf
@@ -53,4 +53,4 @@ resource "aws_iam_role" "task-execution" {
 resource "aws_iam_role_policy" "task-role" {
   policy = data.aws_iam_policy_document.task-policy.json
   role   = aws_iam_role.task-execution.id
-}
+}
diff --git a/.modules/webservice/dns.tf b/.modules/webservice/dns.tf
@@ -5,8 +5,8 @@ data "cloudflare_zone" "dns_zone" {
 resource "cloudflare_record" "instance_dns" {
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = coalesce(var.subdomain, lower(var.service_name))
-  value   = lower(aws_alb.main.dns_name)
+  content = lower(aws_alb.main.dns_name)
   type    = "CNAME"
   ttl     = 1
   proxied = var.cloudflare_proxy
-}
+}
diff --git a/.modules/webservice/versions.tf b/.modules/webservice/versions.tf
@@ -1,8 +1,10 @@
 terraform {
+  required_version = "= 1.9.6"
+
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
-}
+}
diff --git a/assist/main.tf b/assist/main.tf
@@ -7,11 +7,12 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
 
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 4"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/cas_validator/main.tf b/cas_validator/main.tf
@@ -7,15 +7,17 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/community/dns.tf b/community/dns.tf
@@ -5,7 +5,7 @@ data "cloudflare_zone" "dns_zone" {
 resource "cloudflare_record" "community" {
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = "community"
-  value   = aws_eip.discourse.public_ip
+  content = aws_eip.discourse.public_ip
   type    = "A"
   proxied = true
 }
diff --git a/community/ec2.tf b/community/ec2.tf
@@ -9,5 +9,5 @@ resource "aws_instance" "discourse" {
 
 resource "aws_eip" "discourse" {
   instance = aws_instance.discourse.id
-  vpc      = true
+  domain   = "vpc"
 }
diff --git a/community/main.tf b/community/main.tf
@@ -7,15 +7,17 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/infrastructure/certificate.tf b/infrastructure/certificate.tf
@@ -22,7 +22,7 @@ resource "cloudflare_record" "dns_instance_validation" {
 
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = each.value.name
-  value   = trimsuffix(each.value.record, ".")
+  content = trimsuffix(each.value.record, ".")
   type    = each.value.type
   ttl     = 1
   proxied = false

diff --git a/infrastructure/region/network.tf b/infrastructure/region/network.tf
@@ -32,7 +32,7 @@ resource "aws_route_table" "public" {
 resource "aws_eip" "nat" {
   count = 2
 
-  vpc = true
+  domain = "vpc"
 
   tags = {
     Region = data.aws_region.current.name

diff --git a/infrastructure/versions.tf b/infrastructure/versions.tf
@@ -1,14 +1,15 @@
 terraform {
-  required_version = "= 1.7.5"
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/ios_pushserver/main.tf b/ios_pushserver/main.tf
@@ -7,15 +7,17 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/os-builds/main.tf b/os-builds/main.tf
@@ -7,11 +7,12 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
 
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 4"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/private_demo/main.tf b/private_demo/main.tf
@@ -7,15 +7,17 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/service_hub_bots/main.tf b/service_hub_bots/main.tf
@@ -7,15 +7,17 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
 
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/static_dns/main.tf b/static_dns/main.tf
@@ -7,10 +7,12 @@ terraform {
     }
   }
 
+  required_version = "= 1.9.6"
+
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/static_dns/record._checkdns.tf b/static_dns/record._checkdns.tf
@@ -2,7 +2,7 @@
 resource "cloudflare_record" "_checkdns" {
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = "_checkdns"
-  value   = "1.1.1.1"
+  content = "1.1.1.1"
   type    = "A"
   ttl     = 1
   proxied = false