fix(TF >= 1.3)!: allow optional vars in firewall rules module (#438)

Co-authored-by: Zackary Maupin <[email protected]>
terraform-google-modules · Apr 11, 2023 · b188d37 · b188d37
1 parent ab42e14
commit b188d37
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/modules/firewall-rules/README.md b/modules/firewall-rules/README.md
@@ -41,7 +41,7 @@ module "firewall_rules" {
 |------|-------------|------|---------|:--------:|
 | network\_name | Name of the network this set of firewall rules applies to. | `string` | n/a | yes |
 | project\_id | Project id of the project that holds the network. | `string` | n/a | yes |
-| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br>    name                    = string<br>    description             = string<br>    direction               = string<br>    priority                = number<br>    ranges                  = list(string)<br>    source_tags             = list(string)<br>    source_service_accounts = list(string)<br>    target_tags             = list(string)<br>    target_service_accounts = list(string)<br>    allow = list(object({<br>      protocol = string<br>      ports    = list(string)<br>    }))<br>    deny = list(object({<br>      protocol = string<br>      ports    = list(string)<br>    }))<br>    log_config = object({<br>      metadata = string<br>    })<br>  }))</pre> | `[]` | no |
+| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br>    name                    = string<br>    description             = optional(string)<br>    direction               = optional(string)<br>    priority                = optional(number)<br>    ranges                  = optional(list(string))<br>    source_tags             = optional(list(string))<br>    source_service_accounts = optional(list(string))<br>    target_tags             = optional(list(string))<br>    target_service_accounts = optional(list(string))<br>    allow = optional(list(object({<br>      protocol = string<br>      ports    = optional(list(string))<br>    })))<br>    deny = optional(list(object({<br>      protocol = string<br>      ports    = optional(list(string))<br>    })))<br>    log_config = optional(object({<br>      metadata = string<br>    }))<br>  }))</pre> | `[]` | no |
 
 ## Outputs
 

diff --git a/modules/firewall-rules/variables.tf b/modules/firewall-rules/variables.tf
@@ -29,24 +29,24 @@ variable "rules" {
   default     = []
   type = list(object({
     name                    = string
-    description             = string
-    direction               = string
-    priority                = number
-    ranges                  = list(string)
-    source_tags             = list(string)
-    source_service_accounts = list(string)
-    target_tags             = list(string)
-    target_service_accounts = list(string)
-    allow = list(object({
+    description             = optional(string)
+    direction               = optional(string)
+    priority                = optional(number)
+    ranges                  = optional(list(string))
+    source_tags             = optional(list(string))
+    source_service_accounts = optional(list(string))
+    target_tags             = optional(list(string))
+    target_service_accounts = optional(list(string))
+    allow = optional(list(object({
       protocol = string
-      ports    = list(string)
-    }))
-    deny = list(object({
+      ports    = optional(list(string))
+    })))
+    deny = optional(list(object({
       protocol = string
-      ports    = list(string)
-    }))
-    log_config = object({
+      ports    = optional(list(string))
+    })))
+    log_config = optional(object({
       metadata = string
-    })
+    }))
   }))
 }
diff --git a/modules/firewall-rules/versions.tf b/modules/firewall-rules/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13.0"
+  required_version = ">= 1.3.0"
 
   required_providers {
     google = {