From c20ce7641a1c9a6b64277dfbe1401a5372c0b18e Mon Sep 17 00:00:00 2001 From: Chris Jaimon Date: Fri, 11 Aug 2023 08:47:17 +0530 Subject: [PATCH 1/2] XDR-4399: Bump terraform version to 1.2.5 --- .terraform-version | 2 +- modules/azure-local-network-gateway/README.md | 7 ++++--- modules/azure-local-network-gateway/main.tf | 8 +++++++- modules/azure-network-security-group/README.md | 5 +++-- modules/azure-network-security-group/main.tf | 8 +++++++- modules/azure-network-security-rule/README.md | 5 +++-- modules/azure-network-security-rule/main.tf | 8 +++++++- modules/azure-public-ip/README.md | 5 +++-- modules/azure-public-ip/main.tf | 8 +++++++- .../README.md | 5 +++-- .../main.tf | 8 +++++++- modules/azure-subnet/README.md | 5 +++-- modules/azure-subnet/main.tf | 8 +++++++- .../azure-virtual-network-gateway-connection/README.md | 5 +++-- modules/azure-virtual-network-gateway-connection/main.tf | 8 +++++++- modules/azure-virtual-network-gateway/README.md | 2 +- modules/azure-virtual-network-gateway/main.tf | 8 +++++++- modules/azure-virtual-network-peering/README.md | 5 +++-- modules/azure-virtual-network-peering/main.tf | 8 +++++++- modules/azure-virtual-network/README.md | 5 +++-- modules/azure-virtual-network/main.tf | 8 +++++++- 21 files changed, 100 insertions(+), 31 deletions(-) diff --git a/.terraform-version b/.terraform-version index 18efdb9..c813fe1 100644 --- 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 index bbf8100..052b75d 100644 --- a/modules/azure-local-network-gateway/README.md +++ b/modules/azure-local-network-gateway/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.12.0 | +| [azurerm](#provider\_azurerm) | 3.69.0 | ## Modules @@ -27,7 +28,7 @@ No modules. |------|-------------|------|---------|:--------:| | [address\_space](#input\_address\_space) | The list of string CIDRs representing the address spaces the gateway exposes. | `list(string)` | `[]` | no | | [bgp\_settings](#input\_bgp\_settings) | The Local Network Gateway's BGP speaker settings. | 
list(object({
    asn                 = number
    bgp_peering_address = string
    peer_weight         = optional(number)
  }))
| `[]` | no | -| [gateway](#input\_gateway) | gateway\_address - The gateway IP address to connect with.
gateway\_fqdn - The gateway FQDN to connect with. | 
object({
    address  = optional(string)
    fqdn = optional(string)
  })
| 
{
  "address": null,
  "fqdn": null
}
| no | +| [gateway](#input\_gateway) | gateway\_address - The gateway IP address to connect with.
gateway\_fqdn - The gateway FQDN to connect with. | 
object({
    address = optional(string)
    fqdn    = optional(string)
  })
| 
{
  "address": null,
  "fqdn": null
}
| no | | [location](#input\_location) | The location in which this network security group will be provisioned. | `string` | n/a | yes | | [name](#input\_name) | The name of the connection. | `string` | n/a | yes | | [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 index ddb2174..94c5e57 100644 --- a/modules/azure-local-network-gateway/main.tf +++ b/modules/azure-local-network-gateway/main.tf @@ -3,7 +3,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - required_version = ">= 0.12" + required_version = ">= 1.2" + required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 3.0" + } + } experiments = [module_variable_optional_attrs] } diff --git a/modules/azure-network-security-group/README.md b/modules/azure-network-security-group/README.md index 460d3dc..df1735f 100644 --- a/modules/azure-network-security-group/README.md +++ b/modules/azure-network-security-group/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | n/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 index 401eec1..802a6af 100644 --- 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 index 510b357..ac4db34 100644 --- a/modules/azure-network-security-rule/README.md +++ b/modules/azure-network-security-rule/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.10.0 | +| [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 index a8a9cfb..a017f1a 100644 --- a/modules/azure-network-security-rule/main.tf +++ b/modules/azure-network-security-rule/main.tf @@ -3,7 +3,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - required_version = ">= 0.12" + required_version = ">= 1.2" + required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 3.0" + } + } experiments = [module_variable_optional_attrs] } diff --git a/modules/azure-public-ip/README.md b/modules/azure-public-ip/README.md index 2d19d48..6d107b3 100644 --- a/modules/azure-public-ip/README.md +++ b/modules/azure-public-ip/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.12.0 | +| [azurerm](#provider\_azurerm) | 3.69.0 | ## Modules diff --git a/modules/azure-public-ip/main.tf b/modules/azure-public-ip/main.tf index 9da7522..08f30ef 100644 --- 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 index 5d32837..9d250fa 100644 --- 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 | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | n/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 index d4c6212..5fb8b92 100644 --- 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 index b3640d4..8170bc0 100644 --- a/modules/azure-subnet/README.md +++ b/modules/azure-subnet/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.12.0 | +| [azurerm](#provider\_azurerm) | >= 3.0 | ## Modules diff --git a/modules/azure-subnet/main.tf b/modules/azure-subnet/main.tf index ca59715..7dbdedd 100644 --- a/modules/azure-subnet/main.tf +++ b/modules/azure-subnet/main.tf @@ -3,7 +3,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - required_version = ">= 0.12" + required_version = ">= 1.2" + required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 3.0" + } + } experiments = [module_variable_optional_attrs] } diff --git a/modules/azure-virtual-network-gateway-connection/README.md b/modules/azure-virtual-network-gateway-connection/README.md index e66ca4f..1de1025 100644 --- a/modules/azure-virtual-network-gateway-connection/README.md +++ b/modules/azure-virtual-network-gateway-connection/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | n/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 index 8d743e0..83925dd 100644 --- a/modules/azure-virtual-network-gateway-connection/main.tf +++ b/modules/azure-virtual-network-gateway-connection/main.tf @@ -3,7 +3,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - required_version = ">= 0.12" + required_version = ">= 1.2" + required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 3.0" + } + } experiments = [module_variable_optional_attrs] } diff --git a/modules/azure-virtual-network-gateway/README.md b/modules/azure-virtual-network-gateway/README.md index 2c95b71..0d1b2b2 100644 --- a/modules/azure-virtual-network-gateway/README.md +++ b/modules/azure-virtual-network-gateway/README.md @@ -3,7 +3,7 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | ## Providers diff --git a/modules/azure-virtual-network-gateway/main.tf b/modules/azure-virtual-network-gateway/main.tf index e42ff25..3578018 100644 --- a/modules/azure-virtual-network-gateway/main.tf +++ b/modules/azure-virtual-network-gateway/main.tf @@ -3,7 +3,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - required_version = ">= 0.12" + required_version = ">= 1.2" + required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 3.0" + } + } experiments = [module_variable_optional_attrs] } diff --git a/modules/azure-virtual-network-peering/README.md b/modules/azure-virtual-network-peering/README.md index 97f1a1b..c29f062 100644 --- a/modules/azure-virtual-network-peering/README.md +++ b/modules/azure-virtual-network-peering/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | n/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 index b09790d..1850057 100644 --- 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 index 64fbfec..006e9ea 100644 --- a/modules/azure-virtual-network/README.md +++ b/modules/azure-virtual-network/README.md @@ -3,13 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 1.2 | +| [azurerm](#requirement\_azurerm) | >= 3.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | n/a | +| [azurerm](#provider\_azurerm) | 3.69.0 | ## Modules diff --git a/modules/azure-virtual-network/main.tf b/modules/azure-virtual-network/main.tf index c9c0ac8..7c1fa59 100644 --- 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" { From 51e37917a48d837476347d1fc6ac2098a0d4bbe7 Mon Sep 17 00:00:00 2001 From: Chris Jaimon Date: Fri, 11 Aug 2023 09:02:51 +0530 Subject: [PATCH 2/2] XDR-4399: Fix tflint issues --- modules/azure-local-network-gateway/main.tf | 2 +- modules/azure-network-security-rule/main.tf | 2 +- modules/azure-subnet/main.tf | 2 +- modules/azure-virtual-network-gateway-connection/main.tf | 4 ++-- modules/azure-virtual-network-gateway/main.tf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/azure-local-network-gateway/main.tf b/modules/azure-local-network-gateway/main.tf index 94c5e57..905e75e 100644 --- a/modules/azure-local-network-gateway/main.tf +++ b/modules/azure-local-network-gateway/main.tf @@ -10,7 +10,7 @@ terraform { version = ">= 3.0" } } - experiments = [module_variable_optional_attrs] + experiments = [module_variable_optional_attrs] } resource "azurerm_local_network_gateway" "remote" { diff --git a/modules/azure-network-security-rule/main.tf b/modules/azure-network-security-rule/main.tf index a017f1a..c8b8bce 100644 --- a/modules/azure-network-security-rule/main.tf +++ b/modules/azure-network-security-rule/main.tf @@ -10,7 +10,7 @@ terraform { version = ">= 3.0" } } - experiments = [module_variable_optional_attrs] + experiments = [module_variable_optional_attrs] } resource "azurerm_network_security_rule" "rule" { diff --git a/modules/azure-subnet/main.tf b/modules/azure-subnet/main.tf index 7dbdedd..4f71d90 100644 --- a/modules/azure-subnet/main.tf +++ b/modules/azure-subnet/main.tf @@ -10,7 +10,7 @@ terraform { version = ">= 3.0" } } - experiments = [module_variable_optional_attrs] + experiments = [module_variable_optional_attrs] } resource "azurerm_subnet" "subnet" { diff --git a/modules/azure-virtual-network-gateway-connection/main.tf b/modules/azure-virtual-network-gateway-connection/main.tf index 83925dd..0f9ab08 100644 --- a/modules/azure-virtual-network-gateway-connection/main.tf +++ b/modules/azure-virtual-network-gateway-connection/main.tf @@ -10,7 +10,7 @@ terraform { version = ">= 3.0" } } - experiments = [module_variable_optional_attrs] + experiments = [module_variable_optional_attrs] } resource "azurerm_virtual_network_gateway_connection" "connection" { @@ -41,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/main.tf b/modules/azure-virtual-network-gateway/main.tf index 3578018..9d720d7 100644 --- a/modules/azure-virtual-network-gateway/main.tf +++ b/modules/azure-virtual-network-gateway/main.tf @@ -10,7 +10,7 @@ terraform { version = ">= 3.0" } } - experiments = [module_variable_optional_attrs] + experiments = [module_variable_optional_attrs] } resource "azurerm_virtual_network_gateway" "gateway" {