fix: fixed the validation logic for the dns_zone_name input<br>- updated required terraform version to >=1.9.0 (#918)

imprateeksh · web-flow · commit e06cd8a077dc · 2025-02-20T13:20:07.000Z
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ To attach access management tags to resources in this module, you need the follo
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
 | <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.59.0, < 2.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |
 
@@ -198,7 +198,7 @@ To attach access management tags to resources in this module, you need the follo
 | <a name="input_dns_records"></a> [dns\_records](#input\_dns\_records) | List of DNS records to be created. | <pre>list(object({<br/>    name       = string<br/>    type       = string<br/>    ttl        = number<br/>    rdata      = string<br/>    preference = optional(number, null)<br/>    service    = optional(string, null)<br/>    protocol   = optional(string, null)<br/>    priority   = optional(number, null)<br/>    weight     = optional(number, null)<br/>    port       = optional(number, null)<br/>  }))</pre> | `[]` | no |
 | <a name="input_dns_zone_description"></a> [dns\_zone\_description](#input\_dns\_zone\_description) | The description of the DNS zone. | `string` | `"Default DNS Zone"` | no |
 | <a name="input_dns_zone_label"></a> [dns\_zone\_label](#input\_dns\_zone\_label) | Label associated with the DNS zone. | `string` | `"dns-zone"` | no |
-| <a name="input_dns_zone_name"></a> [dns\_zone\_name](#input\_dns\_zone\_name) | The name of the DNS zone to be created. | `string` | `"slz.com"` | no |
+| <a name="input_dns_zone_name"></a> [dns\_zone\_name](#input\_dns\_zone\_name) | The name of the DNS zone to be created. | `string` | `null` | no |
 | <a name="input_enable_hub"></a> [enable\_hub](#input\_enable\_hub) | Indicates whether this VPC is enabled as a DNS name resolution hub. | `bool` | `false` | no |
 | <a name="input_enable_hub_vpc_crn"></a> [enable\_hub\_vpc\_crn](#input\_enable\_hub\_vpc\_crn) | Indicates whether Hub VPC CRN is passed. | `bool` | `false` | no |
 | <a name="input_enable_hub_vpc_id"></a> [enable\_hub\_vpc\_id](#input\_enable\_hub\_vpc\_id) | Indicates whether Hub VPC ID is passed. | `bool` | `false` | no |
diff --git a/dynamic_values/config_modules/list_to_map/version.tf b/dynamic_values/config_modules/list_to_map/version.tf
@@ -3,7 +3,7 @@
 ##############################################################################
 
 terraform {
-  required_version = ">=1.3.0"
+  required_version = ">=1.9.0"
 }
 
 ##############################################################################
diff --git a/dynamic_values/versions.tf b/dynamic_values/versions.tf
@@ -3,7 +3,7 @@
 ##############################################################################
 
 terraform {
-  required_version = ">=1.3.0"
+  required_version = ">=1.9.0"
 }
 
 ##############################################################################
diff --git a/examples/basic/version.tf b/examples/basic/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/default/version.tf b/examples/default/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/existing_vpc/version.tf b/examples/existing_vpc/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/hub-spoke-delegated-resolver/version.tf b/examples/hub-spoke-delegated-resolver/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/hub-spoke-manual-resolver/version.tf b/examples/hub-spoke-manual-resolver/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/landing_zone/version.tf b/examples/landing_zone/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/no-prefix/version.tf b/examples/no-prefix/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
     # module's version.tf (basic), and 1 example that will always use the latest provider version.
diff --git a/examples/specific-zone-only/version.tf b/examples/specific-zone-only/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
diff --git a/examples/vpc-with-dns/version.tf b/examples/vpc-with-dns/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
diff --git a/main.tf b/main.tf
@@ -359,7 +359,7 @@ resource "ibm_is_flow_log" "flow_logs" {
 # ##############################################################################
 
 resource "ibm_dns_zone" "dns_zone" {
-  count       = var.enable_hub && !var.skip_custom_resolver_hub_creation ? 1 : 0
+  count       = var.enable_hub && !var.skip_custom_resolver_hub_creation && var.dns_zone_name != null ? 1 : 0
   name        = var.dns_zone_name
   instance_id = var.use_existing_dns_instance ? var.existing_dns_instance_id : ibm_resource_instance.dns_instance_hub[0].guid
   description = var.dns_zone_description
diff --git a/modules/management-vpc/README.md b/modules/management-vpc/README.md
@@ -22,7 +22,7 @@ module management_vpc {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
 
 ### Modules
 
diff --git a/modules/management-vpc/version.tf b/modules/management-vpc/version.tf
@@ -1,3 +1,3 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
 }
diff --git a/modules/workload-vpc/README.md b/modules/workload-vpc/README.md
@@ -22,7 +22,7 @@ module workload_vpc {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
 
 ### Modules
 
diff --git a/modules/workload-vpc/version.tf b/modules/workload-vpc/version.tf
@@ -1,3 +1,3 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
 }
diff --git a/tests/existing-resources/version.tf b/tests/existing-resources/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
diff --git a/variables.tf b/variables.tf
@@ -640,10 +640,16 @@ variable "dns_plan" {
 
 variable "dns_zone_name" {
   description = "The name of the DNS zone to be created."
-  default     = "slz.com"
+  default     = null
   type        = string
+
+  validation {
+    condition     = var.enable_hub && !var.skip_custom_resolver_hub_creation ? length(coalesce(var.dns_zone_name, "")) > 0 : true
+    error_message = "dns_zone_name must not be null or empty when enable_hub is true and skip_custom_resolver_hub_creation is false."
+  }
+
   validation {
-    condition = !contains([
+    condition = var.dns_zone_name == null ? true : !contains([
       "ibm.com",
       "softlayer.com",
       "bluemix.net",
diff --git a/version.tf b/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0"
+  required_version = ">= 1.9.0"
   required_providers {
     # Use "greater than or equal to" range in modules
     ibm = {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`##############################################################################`
`4`	`4`
`5`	`5`	`terraform {`
`6`		`- required_version = ">=1.3.0"`
	`6`	`+ required_version = ">=1.9.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`##############################################################################`