From 980011806c14b264cb6f5defc0098a661130f7cb Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Thu, 23 May 2024 08:38:03 +0200
Subject: [PATCH] fix permadiff in cloud nat module (#2301)

---
 modules/net-cloudnat/README.md                        | 2 +-
 modules/net-cloudnat/variables.tf                     | 2 +-
 tests/fast/stages/s2_networking_e_nva_bgp/simple.yaml | 2 --
 tests/modules/net_cloudnat/examples/hybrid.yaml       | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/net-cloudnat/README.md b/modules/net-cloudnat/README.md
index 34fb56066..6d30f0392 100644
--- a/modules/net-cloudnat/README.md
+++ b/modules/net-cloudnat/README.md
@@ -165,7 +165,7 @@ module "vpc1-nat" {
 | [project_id](variables.tf#L82) | Project where resources will be created. | <code>string</code> | ✓ |  |
 | [region](variables.tf#L87) | Region where resources will be created. | <code>string</code> | ✓ |  |
 | [addresses](variables.tf#L17) | Optional list of external address self links. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |
-| [config_port_allocation](variables.tf#L23) | Configuration for how to assign ports to virtual machines. min_ports_per_vm and max_ports_per_vm have no effect unless enable_dynamic_port_allocation is set to 'true'. | <code title="object&#40;&#123;&#10;  enable_endpoint_independent_mapping &#61; optional&#40;bool, true&#41;&#10;  enable_dynamic_port_allocation      &#61; optional&#40;bool, false&#41;&#10;  min_ports_per_vm                    &#61; optional&#40;number&#41;&#10;  max_ports_per_vm                    &#61; optional&#40;number&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [config_port_allocation](variables.tf#L23) | Configuration for how to assign ports to virtual machines. min_ports_per_vm and max_ports_per_vm have no effect unless enable_dynamic_port_allocation is set to 'true'. | <code title="object&#40;&#123;&#10;  enable_endpoint_independent_mapping &#61; optional&#40;bool, true&#41;&#10;  enable_dynamic_port_allocation      &#61; optional&#40;bool, false&#41;&#10;  min_ports_per_vm                    &#61; optional&#40;number&#41;&#10;  max_ports_per_vm                    &#61; optional&#40;number, 65536&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [config_source_subnetworks](variables.tf#L39) | Subnetwork configuration. | <code title="object&#40;&#123;&#10;  all                 &#61; optional&#40;bool, true&#41;&#10;  primary_ranges_only &#61; optional&#40;bool&#41;&#10;  subnetworks &#61; optional&#40;list&#40;object&#40;&#123;&#10;    self_link        &#61; string&#10;    all_ranges       &#61; optional&#40;bool, true&#41;&#10;    secondary_ranges &#61; optional&#40;list&#40;string&#41;&#41;&#10;  &#125;&#41;&#41;, &#91;&#93;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [config_timeouts](variables.tf#L58) | Timeout configurations. | <code title="object&#40;&#123;&#10;  icmp            &#61; optional&#40;number&#41;&#10;  tcp_established &#61; optional&#40;number&#41;&#10;  tcp_time_wait   &#61; optional&#40;number&#41;&#10;  tcp_transitory  &#61; optional&#40;number&#41;&#10;  udp             &#61; optional&#40;number&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [logging_filter](variables.tf#L71) | Enables logging if not null, value is one of 'ERRORS_ONLY', 'TRANSLATIONS_ONLY', 'ALL'. | <code>string</code> |  | <code>null</code> |
diff --git a/modules/net-cloudnat/variables.tf b/modules/net-cloudnat/variables.tf
index 27484ee31..d8ca6413c 100644
--- a/modules/net-cloudnat/variables.tf
+++ b/modules/net-cloudnat/variables.tf
@@ -26,7 +26,7 @@ variable "config_port_allocation" {
     enable_endpoint_independent_mapping = optional(bool, true)
     enable_dynamic_port_allocation      = optional(bool, false)
     min_ports_per_vm                    = optional(number)
-    max_ports_per_vm                    = optional(number)
+    max_ports_per_vm                    = optional(number, 65536)
   })
   default  = {}
   nullable = false
diff --git a/tests/fast/stages/s2_networking_e_nva_bgp/simple.yaml b/tests/fast/stages/s2_networking_e_nva_bgp/simple.yaml
index e0316d393..ec1929601 100644
--- a/tests/fast/stages/s2_networking_e_nva_bgp/simple.yaml
+++ b/tests/fast/stages/s2_networking_e_nva_bgp/simple.yaml
@@ -1515,7 +1515,6 @@ values:
     log_config:
       - enable: false
         filter: ALL
-    max_ports_per_vm: null
     name: ew1
     nat_ip_allocate_option: AUTO_ONLY
     nat_ips: null
@@ -1548,7 +1547,6 @@ values:
     log_config:
       - enable: false
         filter: ALL
-    max_ports_per_vm: null
     name: ew4
     nat_ip_allocate_option: AUTO_ONLY
     nat_ips: null
diff --git a/tests/modules/net_cloudnat/examples/hybrid.yaml b/tests/modules/net_cloudnat/examples/hybrid.yaml
index dbfdd4981..8b00b509d 100644
--- a/tests/modules/net_cloudnat/examples/hybrid.yaml
+++ b/tests/modules/net_cloudnat/examples/hybrid.yaml
@@ -28,7 +28,6 @@ values:
     log_config:
       - enable: false
         filter: ALL
-    max_ports_per_vm: null
     name: vpc1-nat
     nat_ip_allocate_option: null
     nat_ips: null