Merge pull request #20 from quantum-sec/feature/XDR-4399

XDR-4399: Bump terraform version to 1.2.5
quantum-sec · Aug 11, 2023 · 465fc8a · 465fc8a
2 parents fc51f3d + 51e3791
commit 465fc8a
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 37 deletions.
diff --git a/.terraform-version b/.terraform-version
@@ -1 +1 @@
-1.1.8
+1.2.5
diff --git a/modules/azure-local-network-gateway/README.md b/modules/azure-local-network-gateway/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.12.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 
@@ -27,7 +28,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_address_space"></a> [address\_space](#input\_address\_space) | The list of string CIDRs representing the address spaces the gateway exposes. | `list(string)` | `[]` | no |
 | <a name="input_bgp_settings"></a> [bgp\_settings](#input\_bgp\_settings) | The Local Network Gateway's BGP speaker settings. | <pre>list(object({<br>    asn                 = number<br>    bgp_peering_address = string<br>    peer_weight         = optional(number)<br>  }))</pre> | `[]` | no |
-| <a name="input_gateway"></a> [gateway](#input\_gateway) | gateway\_address - The gateway IP address to connect with.<br>gateway\_fqdn - The gateway FQDN to connect with. | <pre>object({<br>    address  = optional(string)<br>    fqdn = optional(string)<br>  })</pre> | <pre>{<br>  "address": null,<br>  "fqdn": null<br>}</pre> | no |
+| <a name="input_gateway"></a> [gateway](#input\_gateway) | gateway\_address - The gateway IP address to connect with.<br>gateway\_fqdn - The gateway FQDN to connect with. | <pre>object({<br>    address = optional(string)<br>    fqdn    = optional(string)<br>  })</pre> | <pre>{<br>  "address": null,<br>  "fqdn": null<br>}</pre> | no |
 | <a name="input_location"></a> [location](#input\_location) | The location in which this network security group will be provisioned. | `string` | n/a | yes |
 | <a name="input_name"></a> [name](#input\_name) | The name of the connection. | `string` | n/a | yes |
 | <a name="input_resource_group_name"></a> [resource\_group\_name](#input\_resource\_group\_name) | The name of the resource group in which this resource will be provisioned. | `string` | n/a | yes |

diff --git a/modules/azure-local-network-gateway/main.tf b/modules/azure-local-network-gateway/main.tf
@@ -3,8 +3,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
-  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
+  experiments = [module_variable_optional_attrs]
 }
 
 resource "azurerm_local_network_gateway" "remote" {

diff --git a/modules/azure-network-security-group/README.md b/modules/azure-network-security-group/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 

diff --git a/modules/azure-network-security-group/main.tf b/modules/azure-network-security-group/main.tf
@@ -3,7 +3,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
 }
 
 resource "azurerm_network_security_group" "nsg" {

diff --git a/modules/azure-network-security-rule/README.md b/modules/azure-network-security-rule/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.10.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 

diff --git a/modules/azure-network-security-rule/main.tf b/modules/azure-network-security-rule/main.tf
@@ -3,8 +3,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
-  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
+  experiments = [module_variable_optional_attrs]
 }
 
 resource "azurerm_network_security_rule" "rule" {

diff --git a/modules/azure-public-ip/README.md b/modules/azure-public-ip/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.12.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 

diff --git a/modules/azure-public-ip/main.tf b/modules/azure-public-ip/main.tf
@@ -3,7 +3,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
 }
 
 resource "azurerm_public_ip" "public" {

diff --git a/modules/azure-subnet-network-security-group-association/README.md b/modules/azure-subnet-network-security-group-association/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 

diff --git a/modules/azure-subnet-network-security-group-association/main.tf b/modules/azure-subnet-network-security-group-association/main.tf
@@ -3,7 +3,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
 }
 
 resource "azurerm_subnet_network_security_group_association" "association" {

diff --git a/modules/azure-subnet/README.md b/modules/azure-subnet/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.12.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | >= 3.0 |
 
 ## Modules
 

diff --git a/modules/azure-subnet/main.tf b/modules/azure-subnet/main.tf
@@ -3,8 +3,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
-  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
+  experiments = [module_variable_optional_attrs]
 }
 
 resource "azurerm_subnet" "subnet" {

diff --git a/modules/azure-virtual-network-gateway-connection/README.md b/modules/azure-virtual-network-gateway-connection/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | >= 3.0 |
 
 ## Modules
 

diff --git a/modules/azure-virtual-network-gateway-connection/main.tf b/modules/azure-virtual-network-gateway-connection/main.tf
@@ -3,8 +3,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
-  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
+  experiments = [module_variable_optional_attrs]
 }
 
 resource "azurerm_virtual_network_gateway_connection" "connection" {
@@ -35,7 +41,7 @@ resource "azurerm_virtual_network_gateway_connection" "connection" {
   express_route_gateway_bypass       = var.type == "ExpressRoute" ? var.express_route_gateway_bypass : null
   egress_nat_rule_ids                = var.egress_nat_rule_ids
   ingress_nat_rule_ids               = var.ingress_nat_rule_ids
-  use_policy_based_traffic_selectors = var.ipsec_policy != [] ? var.use_policy_based_traffic_selectors : null
+  use_policy_based_traffic_selectors = length(var.ipsec_policy) != 0 ? var.use_policy_based_traffic_selectors : null
 
   dynamic "ipsec_policy" {
     for_each = var.ipsec_policy

diff --git a/modules/azure-virtual-network-gateway/README.md b/modules/azure-virtual-network-gateway/README.md
@@ -3,7 +3,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
 
 ## Providers
 

diff --git a/modules/azure-virtual-network-gateway/main.tf b/modules/azure-virtual-network-gateway/main.tf
@@ -3,8 +3,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
-  experiments      = [module_variable_optional_attrs]
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
+  experiments = [module_variable_optional_attrs]
 }
 
 resource "azurerm_virtual_network_gateway" "gateway" {

diff --git a/modules/azure-virtual-network-peering/README.md b/modules/azure-virtual-network-peering/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | >= 3.0 |
 
 ## Modules
 

diff --git a/modules/azure-virtual-network-peering/main.tf b/modules/azure-virtual-network-peering/main.tf
@@ -3,7 +3,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
 }
 
 resource "azurerm_virtual_network_peering" "peering_connection" {

diff --git a/modules/azure-virtual-network/README.md b/modules/azure-virtual-network/README.md
@@ -3,13 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.69.0 |
 
 ## Modules
 

diff --git a/modules/azure-virtual-network/main.tf b/modules/azure-virtual-network/main.tf
@@ -3,7 +3,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.2"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">= 3.0"
+    }
+  }
 }
 
 resource "azurerm_virtual_network" "network" {