diff --git a/README.md b/README.md index bfca1efc..c78ad649 100644 --- 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 | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.9.0 | | [ibm](#requirement\_ibm) | >= 1.59.0, < 2.0.0 | | [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 | [dns\_records](#input\_dns\_records) | List of DNS records to be created. | 
list(object({
    name       = string
    type       = string
    ttl        = number
    rdata      = string
    preference = optional(number, null)
    service    = optional(string, null)
    protocol   = optional(string, null)
    priority   = optional(number, null)
    weight     = optional(number, null)
    port       = optional(number, null)
  }))
| `[]` | no | | [dns\_zone\_description](#input\_dns\_zone\_description) | The description of the DNS zone. | `string` | `"Default DNS Zone"` | no | | [dns\_zone\_label](#input\_dns\_zone\_label) | Label associated with the DNS zone. | `string` | `"dns-zone"` | no | -| [dns\_zone\_name](#input\_dns\_zone\_name) | The name of the DNS zone to be created. | `string` | `"slz.com"` | no | +| [dns\_zone\_name](#input\_dns\_zone\_name) | The name of the DNS zone to be created. | `string` | `null` | no | | [enable\_hub](#input\_enable\_hub) | Indicates whether this VPC is enabled as a DNS name resolution hub. | `bool` | `false` | no | | [enable\_hub\_vpc\_crn](#input\_enable\_hub\_vpc\_crn) | Indicates whether Hub VPC CRN is passed. | `bool` | `false` | no | | [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 index 76920b8f..c4a2f6f1 100644 --- 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 index 76920b8f..c4a2f6f1 100644 --- 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 index 205e9cb8..e147bd5e 100644 --- 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 index 8f51e9e3..657aabcd 100644 --- 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 index 8f51e9e3..657aabcd 100644 --- 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 index 28018af2..af97e575 100644 --- 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 index 8f51e9e3..657aabcd 100644 --- 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 index 8f51e9e3..657aabcd 100644 --- 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 index 8f51e9e3..657aabcd 100644 --- 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 index fa870dd3..b530fc18 100644 --- 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 index fa870dd3..b530fc18 100644 --- 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 index 28a46692..5163244b 100644 --- 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 index 91dd3ba7..5f6469d7 100644 --- a/modules/management-vpc/README.md +++ b/modules/management-vpc/README.md @@ -22,7 +22,7 @@ module management_vpc { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.9.0 | ### Modules diff --git a/modules/management-vpc/version.tf b/modules/management-vpc/version.tf index 12ad22ab..bfb98ab9 100644 --- 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 index 0d0dd34f..80462728 100644 --- a/modules/workload-vpc/README.md +++ b/modules/workload-vpc/README.md @@ -22,7 +22,7 @@ module workload_vpc { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.9.0 | ### Modules diff --git a/modules/workload-vpc/version.tf b/modules/workload-vpc/version.tf index 12ad22ab..bfb98ab9 100644 --- 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 index fa870dd3..b530fc18 100644 --- 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 index 597f6673..0d8ed2e5 100644 --- 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 index 90de73fb..2dda7827 100644 --- 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 = {