Merge branch 'main' into site-org-associations

Signed-off-by: Giuseppe Maxia <[email protected]>

.changes/v3.13.0/1239-improvements.md

@@ -0,0 +1,3 @@
+* Resource and data source `vcd_external_network_v2` add support for Provider Gateway Topology
+  intentions in VCD 10.5.1+ via fields `nat_and_firewall_service_intention` and
+  `route_advertisement_intention` [GH-1239]

.changes/v3.13.0/1269-improvements.md

@@ -0,0 +1,3 @@
+* The `worker_pool` block from `vcd_cse_kubernetes_cluster` resource allows to configure the
+  [cluster autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler) with
+  `autoscaler_max_replicas` and `autoscaler_min_replicas` arguments [GH-1269]

.changes/v3.13.0/1275-bug-fixes.md

@@ -0,0 +1,3 @@
+* Fix [Issue #1202](https://github.com/vmware/terraform-provider-vcd/issues/1270) - Resource and
+  data source `vcd_nsxt_edgegateway` may crash due to exhausting memory while counting huge IPv6
+  subnets by adding count limit defined in`ip_count_read_limit` field [GH-1275]

.changes/v3.13.0/1282-bug-fixes.md

@@ -0,0 +1,2 @@
+* Fix `vcd_nsxt_ipsec_vpn_tunnel` update operations, that failed in VCD 10.6+ when a `security_profile_customization` block is added
+  to the IPSec VPN tunnel [GH-1282]

.changes/v3.13.0/1282-notes.md

@@ -0,0 +1 @@
+* Amend `TestAccVcdOrgOidc` to check the `redirect_uri` in a case-insensitive way [GH-1282]

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
 	github.com/kr/pretty v0.3.1
-	github.com/vmware/go-vcloud-director/v2 v2.25.0-alpha.10
+	github.com/vmware/go-vcloud-director/v2 v2.25.0-alpha.13
 )
 
 require (
@@ -71,6 +71,6 @@ require (
 	google.golang.org/protobuf v1.34.0 // indirect
 )
 
-replace github.com/vmware/go-vcloud-director/v2 => github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240619062331-781eb7c3abc9
+replace github.com/vmware/go-vcloud-director/v2 => github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240620095649-217a353978c6
 
 // replace github.com/vmware/go-vcloud-director/v2 => ../go-vcloud-director

go.sum

@@ -18,8 +18,8 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240619062331-781eb7c3abc9 h1:JzbFjFjzfud6hUpxf6tUU2OeLs4Nr4BlMMk/zz4lLt8=
-github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240619062331-781eb7c3abc9/go.mod h1:vbuNYzuADDBFhi9i2dIKWeNxMK1VFF0dACq01amYBIM=
+github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240620095649-217a353978c6 h1:CfFPIb3jQvAe+Nv/FFnEC1h/7fKXCdleTdooZSh8YxM=
+github.com/dataclouder/go-vcloud-director/v2 v2.17.0-alpha.3.0.20240620095649-217a353978c6/go.mod h1:vbuNYzuADDBFhi9i2dIKWeNxMK1VFF0dACq01amYBIM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

vcd/datasource_vcd_cse_kubernetes_cluster.go

@@ -148,6 +148,16 @@ func datasourceVcdCseKubernetesCluster() *schema.Resource {
 							Computed:    true,
 							Description: "Storage profile of the control plane nodes",
 						},
+						"autoscaler_max_replicas": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Maximum replicas of the autoscaling capabilities of this worker pool",
+						},
+						"autoscaler_min_replicas": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Minimum replicas of the autoscaling capabilities of this worker pool",
+						},
 					},
 				},
 			},

vcd/datasource_vcd_external_network_v2.go

@@ -33,6 +33,16 @@ func datasourceVcdExternalNetworkV2() *schema.Resource {
 				Computed:    true,
 				Description: "Defines if this network uses IP Spaces (VCD 10.4.1+)",
 			},
+			"nat_and_firewall_service_intention": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Defines different types of intentions to configure NAT and Firewall rules (only with IP Spaces, VCD 10.5.1+) One of `PROVIDER_GATEWAY`,`EDGE_GATEWAY`,`PROVIDER_AND_EDGE_GATEWAY`",
+			},
+			"route_advertisement_intention": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Defines intentions to configure route advertisement (only with IP Spaces, VCD 10.5.1+) One of `IP_SPACE_UPLINKS_ADVERTISED_STRICT`,`IP_SPACE_UPLINKS_ADVERTISED_FLEXIBLE`,`ALL_NETWORKS_ADVERTISED`",
+			},
 			"ip_scope": {
 				Type:        schema.TypeSet,
 				Computed:    true,

vcd/datasource_vcd_nsxt_edgegateway.go

@@ -171,6 +171,12 @@ func datasourceVcdNsxtEdgeGateway() *schema.Resource {
 				Computed:    true,
 				Description: "Number of unused IP addresses",
 			},
+			"ip_count_read_limit": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     defaultReadLimitOfUnusedIps,
+				Description: fmt.Sprintf("How many maximum IPs should be reported in 'used_ipcount' and 'unused_ip_count'. Default %d, 0 - unlimited", defaultReadLimitOfUnusedIps),
+			},
 			"total_allocated_ip_count": {
 				Type:        schema.TypeInt,
 				Computed:    true,