Merge pull request #143 from athiththan11/main-4.14.0

Update Firewall and PostgreSQL-Flexible-Server modules to support AzureRM 4.x.x

Author: athiththan11

CHANGELOG.md

@@ -16,6 +16,16 @@ All notable changes to this project will be documented in this file.
 
 ### Security
 
+## [v2.5.0] - 2025-01-28
+
+### Added
+
+### Changed
+
+- Update Firewall and PostgreSQL-Flexible-Server modules to support AzureRM 4.x.x
+
+### Fixed
+
 ## [v2.4.0] - 2025-01-26
 
 ### Added

modules/azurerm/Firewall/network.tf

@@ -10,9 +10,9 @@
 # --------------------------------------------------------------------------------------
 
 resource "azurerm_subnet" "firewall_subnet" {
-  name                                      = "AzureFirewallSubnet"
-  resource_group_name                       = var.resource_group_name
-  virtual_network_name                      = var.virtual_network_name
-  address_prefixes                          = [var.subnet_address_prefixes]
-  private_endpoint_network_policies_enabled = var.firewall_subnet_enforce_private_link_endpoint_network_policies
+  name                              = "AzureFirewallSubnet"
+  resource_group_name               = var.resource_group_name
+  virtual_network_name              = var.virtual_network_name
+  address_prefixes                  = [var.subnet_address_prefixes]
+  private_endpoint_network_policies = var.private_endpoint_network_policies
 }

modules/azurerm/Firewall/variables.tf

@@ -65,8 +65,8 @@ variable "public_ip_prefixes" {
   }))
 }
 
-variable "firewall_subnet_enforce_private_link_endpoint_network_policies" {
-  default     = false
-  description = "Enable or Disable network policies for the private link endpoint on the firewall subnet"
-  type        = bool
+variable "private_endpoint_network_policies" {
+  default     = "Disabled"
+  description = "Enable or Disable network policies for the private endpoint on the subnet. Possible values are Disabled, Enabled, NetworkSecurityGroupEnabled and RouteTableEnabled"
+  type        = string
 }

modules/azurerm/Firewall/versions.tf

@@ -14,7 +14,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.0.0"
+      version = ">= 4.0.0"
     }
   }
 }

modules/azurerm/PostgreSQL-Flexible-Server/postgresql_server.tf

@@ -10,22 +10,23 @@
 # --------------------------------------------------------------------------------------
 
 resource "azurerm_postgresql_flexible_server" "postgresql_flexible_server" {
-  name                         = join("-", ["postgresql", var.server_name])
-  resource_group_name          = var.resource_group_name
-  location                     = var.location
-  version                      = var.postgresql_server_version
-  delegated_subnet_id          = var.subnet_id
-  private_dns_zone_id          = var.private_dns_zone_id
-  administrator_login          = var.postgresql_server_admin_username
-  administrator_password       = var.postgresql_server_admin_password
-  zone                         = var.availability_zone
-  storage_mb                   = var.storage_size
-  geo_redundant_backup_enabled = var.geo_redundant_backup_enabled
-  sku_name                     = var.sku_name
-  backup_retention_days        = var.backup_retention_days
-  create_mode                  = var.create_mode
-  source_server_id             = var.source_server_id
-  tags                         = var.tags
+  name                          = join("-", ["postgresql", var.server_name])
+  resource_group_name           = var.resource_group_name
+  location                      = var.location
+  version                       = var.postgresql_server_version
+  delegated_subnet_id           = var.subnet_id
+  private_dns_zone_id           = var.private_dns_zone_id
+  administrator_login           = var.postgresql_server_admin_username
+  administrator_password        = var.postgresql_server_admin_password
+  zone                          = var.availability_zone
+  storage_mb                    = var.storage_size
+  geo_redundant_backup_enabled  = var.geo_redundant_backup_enabled
+  sku_name                      = var.sku_name
+  backup_retention_days         = var.backup_retention_days
+  create_mode                   = var.create_mode
+  source_server_id              = var.source_server_id
+  public_network_access_enabled = var.public_network_access_enabled
+  tags                          = var.tags
 
   dynamic "high_availability" {
     for_each = var.high_availability_mode != null ? [1] : []

modules/azurerm/PostgreSQL-Flexible-Server/variables.tf

@@ -130,3 +130,9 @@ variable "high_availability_standby_availability_zone" {
   description = "Specifies the Availability Zone in which the standby Flexible Server should be located."
   type        = number
 }
+
+variable "public_network_access_enabled" {
+  default     = false
+  description = "Enable or disable public network access to the PostgreSQL Server"
+  type        = bool
+}

modules/azurerm/PostgreSQL-Flexible-Server/versions.tf

@@ -14,7 +14,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.52.0"
+      version = ">= 4.0.0"
     }
   }
 }