Fix tflint warnings

alphagov · Jul 11, 2024 · 7e535f6 · 7e535f6
1 parent a00e1a9
commit 7e535f6
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 28 deletions.
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/main.tf b/main.tf
@@ -5,10 +5,11 @@ terraform {
       name = "govuk-fastly"
     }
   }
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
       source  = "fastly/fastly"
-      version = "5.3.1"
+      version = "5.11.0"
     }
   }
 }

diff --git a/modules/assets/service.tf → modules/assets/main.tf b/modules/assets/service.tf → modules/assets/main.tf
@@ -25,7 +25,7 @@ locals {
       gcs_mirror_port            = 443
     },
     { # computed values
-      module_path = "${path.module}"
+      module_path = path.module
     },
     var.configuration,
     var.secrets

diff --git a/modules/assets/outputs.tf b/modules/assets/outputs.tf
diff --git a/modules/assets/provider.tf b/modules/assets/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/assets/variables.tf b/modules/assets/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "assets.vcl.tftpl"
 }
diff --git a/modules/bouncer/service.tf → modules/bouncer/main.tf b/modules/bouncer/service.tf → modules/bouncer/main.tf
@@ -28,7 +28,7 @@ resource "fastly_service_vcl" "service" {
     name = "main"
     content = templatefile("${path.module}/${var.vcl_template_file}", {
       domain      = var.domain,
-      module_path = "${path.module}"
+      module_path = path.module
     })
   }
 

diff --git a/modules/bouncer/outputs.tf b/modules/bouncer/outputs.tf
diff --git a/modules/bouncer/provider.tf b/modules/bouncer/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
     http = {
       source  = "hashicorp/http"

diff --git a/modules/datagovuk/service.tf → modules/datagovuk/main.tf b/modules/datagovuk/service.tf → modules/datagovuk/main.tf
@@ -35,7 +35,7 @@ locals {
     },
     { # computed values
       formatted_allowed_ip_addresses = local.formatted_allowed_ips
-      module_path                    = "${path.module}"
+      module_path                    = path.module
     },
     var.configuration,
     var.secrets

diff --git a/modules/datagovuk/outputs.tf b/modules/datagovuk/outputs.tf
diff --git a/modules/datagovuk/provider.tf b/modules/datagovuk/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/datagovuk/variables.tf b/modules/datagovuk/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "datagovuk.vcl.tftpl"
 }
diff --git a/modules/service-domain-redirect/service.tf → modules/service-domain-redirect/main.tf b/modules/service-domain-redirect/service.tf → modules/service-domain-redirect/main.tf
diff --git a/modules/service-domain-redirect/outputs.tf b/modules/service-domain-redirect/outputs.tf
diff --git a/modules/service-domain-redirect/provider.tf b/modules/service-domain-redirect/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/service-domain-redirect/variables.tf b/modules/service-domain-redirect/variables.tf
diff --git a/modules/tld-redirect/service.tf → modules/tld-redirect/main.tf b/modules/tld-redirect/service.tf → modules/tld-redirect/main.tf
diff --git a/modules/tld-redirect/outputs.tf b/modules/tld-redirect/outputs.tf
diff --git a/modules/tld-redirect/provider.tf b/modules/tld-redirect/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/tld-redirect/variables.tf b/modules/tld-redirect/variables.tf
diff --git a/modules/www/service.tf → modules/www/main.tf b/modules/www/service.tf → modules/www/main.tf
diff --git a/modules/www/outputs.tf b/modules/www/outputs.tf
diff --git a/modules/www/provider.tf b/modules/www/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/www/variables.tf b/modules/www/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "www.vcl.tftpl"
 }
diff --git a/outputs.tf b/outputs.tf