Merge pull request #1433 from vmware/cherry-pick-release-changes

Cherry pick release changes
vmware · Oct 21, 2024 · 719e14e · 719e14e
2 parents dbf5369 + 5b7fc26
commit 719e14e
Show file tree

Hide file tree

Showing 37 changed files with 139 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,88 @@
+## 3.7.0 (October 9, 2024)
+
+UPGRADE SUPPORT:
+
+The following objects are promoted from Beta with this release:
+* `data/nsxt_upgrade_postcheck`
+* `data/nsxt_upgrade_prepare_ready`
+* `data/nsxt_edge_upgrade_group`
+* `data/nsxt_host_upgrade_group`
+
+* `resource/nsxt_upgrade_prepare`
+* `resource/nsxt_upgrade_run`
+* `resource/nsxt_upgrade_precheck_acknowledge`
+
+EXPERIMENTAL FEATURES:
+* `resource/nsxt_policy_share`
+* `resource/nsxt_policy_shared_resource`
+
+BUG FIXES:
+* `resource/nsxt_policy_security_policy_rule`: Allow configuration of `nsx_id` ([#1356](https://github.com/vmware/terraform-provider-nsxt/pull/1356))
+* `resource/nsxt_policy_security_policy_rule`: Fix non-empty diff around empty lists ([#1225](https://github.com/vmware/terraform-provider-nsxt/pull/1225))
+* `resource/nsxt_policy_tier1_gateway`: Fix assignment of `tier1_path`, which caused subsequent failures with NAT configuration ([#1287](https://github.com/vmware/terraform-provider-nsxt/pull/1287))
+* Fix crash caused by invalid `context` configuration ([#1224](https://github.com/vmware/terraform-provider-nsxt/pull/1224))
+* `resource/nsxt_policy_ip_block`: Fix non-empty diff caused by `visibilty` attribute in early NSX versions ([#1228](https://github.com/vmware/terraform-provider-nsxt/pull/1228))
+* Fix authentication in session token retrieval. This fixes an issue that was causing denial of service in certain cases ([#1216](https://github.com/vmware/terraform-provider-nsxt/pull/1216))
+* `resource/nsxt_policy_gateway_route_map`: Fix bug around assignment of `out_filter` ([#1211](https://github.com/vmware/terraform-provider-nsxt/pull/1211))
+
+IMPROVEMENTS:
+* `data/nsxt_policy_uplink_host_switch_profile` : Add `realized_id` attribute ([#1294](https://github.com/vmware/terraform-provider-nsxt/pull/1294))
+* Improve validation of `context` attributes across resources that support multitenancy([#1281](https://github.com/vmware/terraform-provider-nsxt/pull/1281))
+* Improve validation of `display_name` and `description` attributes across all resources ([#1270](https://github.com/vmware/terraform-provider-nsxt/pull/1270))
+* Introduce `ignore_tags` feature for segments. With this option, terraform can ignore certain tags auto-assigned by the platform, and not overwrite those ([#1212](https://github.com/vmware/terraform-provider-nsxt/pull/1212))
+
+## 3.6.2 (July 23, 2024)
+
+FABRIC SUPPORT:
+
+The following objects are promoted from Beta with this release:
+* `data/nsxt_compute_collection`
+* `data/nsxt_compute_manager`
+* `data/nsxt_discovered_node`
+* `data/nsxt_failure_domain`
+* `data/nsxt_policy_host_transport_node`
+* `data/nsxt_policy_host_transport_node_collection`
+* `data/nsxt_policy_host_transport_node_profile`
+* `data/nsxt_policy_uplink_host_switch_profile`
+* `data/nsxt_policy_vtep_ha_host_switch_profile`
+* `data/nsxt_transport_node`
+
+* `resource/nsxt_cluster_virtual_ip`
+* `resource/nsxt_compute_manager`
+* `resource/nsxt_edge_cluster`
+* `resource/nsxt_edge_high_availability_profile`
+* `resource/nsxt_edge_transport_node`
+* `resource/nsxt_failure_domain`
+* `resource/nsxt_manager_cluster`
+* `resource/nsxt_policy_compute_sub_cluster`
+* `resource/nsxt_policy_host_transport_node`
+* `resource/nsxt_policy_host_transport_node_collection`
+* `resource/nsxt_policy_host_transport_node_profile`
+* `resource/nsxt_policy_transport_zone`
+* `resource/nsxt_policy_uplink_host_switch_profile`
+* `resource/nsxt_policy_vtep_ha_host_switch_profile`
+
+USER MANAGEMENT SUPPORT:
+The following objects are promoted from Beta with this release:
+* `resource/nsxt_node_user`
+* `resource/nsxt_policy_ldap_identity_source`
+* `resource/nsxt_policy_user_management_role`
+* `resource/nsxt_policy_user_management_role_binding`
+* `resource/nsxt_principal_identity`
+
+FEATURES:
+* `resource/nsxt_policy_parent_security_policy`, `resource/nsxt_policy_security_policy_rule`: With this release, resources that allow configuring security policy rules separately is promoted from `Beta`. Note that you have to use `nsxt_policy_parent_security_policy` as parent resource for the separate rule resource.
+
+BUG FIXES:
+* Ensure correct encoding of password when requesting NSX session token. This fixes a bug of intermittent 403 errors in the provider when NSX password contains certain special characters ([#1216](https://github.com/vmware/terraform-provider-nsxt/pull/1216))
+* `resource/nsxt_policy_lb_virtual_server`: Fix SNI path assignment ([#1197](https://github.com/vmware/terraform-provider-nsxt/pull/1197))
+* `data/nsxt_policy_vm`, `data/nsxt_policy_vms`, `resource/nsxt_policy_vm_tags`: Fix failure to find certain VMs due to inconsistent pagination ([#1194](https://github.com/vmware/terraform-provider-nsxt/pull/1194))
+
+BUG FIXES ON EXPERIMENTAL FEATURES:
+* `resource/nsxt_edge_transport_node`: Fix syslog configuration ([#1206](https://github.com/vmware/terraform-provider-nsxt/pull/1206))
+* `resource/nsxt_policy_ldap_identity_source`: Remove `display_name` property as nsx mandates it is equal to `nsx_id`, which is now defined as `Required` ([#1254](https://github.com/vmware/terraform-provider-nsxt/pull/1254))
+* `resource/nsxt_compute_manager`: Remove default from `set_as_oidc_provider` property and set is as `Computed`, since the default depends on NSX version ([#1261](https://github.com/vmware/terraform-provider-nsxt/pull/1261))
+
 ## 3.6.1 (May 2, 2024)
 
 BUG FIXES:

diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ Some specific resources and attributes may require recent versions of NSX-T. Ple
 
 # Support
 
-The NSX Terraform provider is now VMware supported as well as community supported. For bugs and feature requests please open a Github Issue and label it appropriately or contact VMware support.
+The NSX Terraform provider is Broadcom supported as well as community supported. For bugs and feature requests please open a Github Issue and label it appropriately or contact Broadcom support.
 
 # License
 

diff --git a/website/docs/d/compute_collection.html.markdown b/website/docs/d/compute_collection.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: compute_collection"
 description: A Compute Collection data source.
@@ -21,6 +21,10 @@ data "nsxt_compute_collection" "test_cluster" {
 
 * `id` - (Optional) The ID of Compute Collection to retrieve.
 * `display_name` - (Optional) The Display Name of the Compute Collection to retrieve.
-* `origin_type` - (Optional) ComputeCollection type like VC_Cluster. Here the Compute Manager type prefix would help in differentiating similar named Compute Collection types from different Compute Managers.
+* `origin_type` - (Optional) ComputeCollection type, f.e. `VC_Cluster`. Here the Compute Manager type prefix would help in differentiating similar named Compute Collection types from different Compute Managers.
 * `origin_id` - (Optional) Id of the compute manager from where this Compute Collection was discovered.
 * `cm_local_id` - (Optional) Local Id of the compute collection in the Compute Manager.
+
+## Attributes Reference
+
+All of the arguments above are computed unless specified.
diff --git a/website/docs/d/compute_manager.html.markdown b/website/docs/d/compute_manager.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: compute_manager"
 description: A Compute Manager data source.
@@ -8,7 +8,7 @@ description: A Compute Manager data source.
 # nsxt_compute_manager
 
 This data source provides information about a Compute Manager configured on NSX.
-When only single Compute Manager is present on NSX, no need to specify any filter in the data source (see example below)
+When only single Compute Manager is present on NSX, no need to specify any filter in the data source.
 
 ## Example Usage
 

diff --git a/website/docs/d/compute_manager_realization.html.markdown b/website/docs/d/compute_manager_realization.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Realization"
 layout: "nsxt"
 page_title: "NSXT: compute_manager_realization"
 description: Compute manager resource realization information.

diff --git a/website/docs/d/discovered_node.html.markdown b/website/docs/d/discovered_node.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: discovered_node"
 description: An Discovered Node data source.
@@ -54,3 +54,8 @@ data "nsxt_discovered_node" "test" {
 * `id` - (Optional) External id of the discovered node, ex. a mo-ref from VC.
 * `ip_address` - (Optional) IP Address of the discovered node.
 * `compute_manager_state` - (Optional) Realized state of compute manager. This argument is only needed to ensure dependency upon `nsxt_compute_manager_realization` data source, so that `nsxt_discovered_node` is not evaluated before compute manager is fully functional.
+
+## Attributes Reference
+
+* `id` - External id of the discovered node, ex. a mo-ref from VC.
+* `ip_address` - IP Address of the discovered node.
diff --git a/website/docs/d/failure_domain.html.markdown b/website/docs/d/failure_domain.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: failure_domain"
 description: Failure Domain data source.
@@ -9,8 +9,6 @@ description: Failure Domain data source.
 
 This data source provides information about Failure Domain configured in NSX.
 
-This resource is supported with NSX 3.0.0 onwards.
-
 ## Example Usage
 
 ```hcl

diff --git a/website/docs/d/policy_gateway_interface_realization_info.html.markdown b/website/docs/d/policy_gateway_interface_realization_info.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Realization"
 layout: "nsxt"
 page_title: "NSXT: policy_gateway_interface_realization"
 description: A gateway interface realization information.

diff --git a/website/docs/d/policy_host_transport_node.html.markdown b/website/docs/d/policy_host_transport_node.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node"
 description: A host transport node data source.

diff --git a/website/docs/d/policy_host_transport_node_collection.html.markdown b/website/docs/d/policy_host_transport_node_collection.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node_collection"
 description: A host transport node collection data source.
@@ -23,7 +23,7 @@ data "nsxt_policy_host_transport_node_collection" "host_transport_node_collectio
 
 * `id` - (Optional) The ID of host transport node collection to retrieve.
 * `display_name` - (Optional) The Display Name prefix of the host transport node collection to retrieve.
-* `site_path` - (Optional) The path of the site which the Transport Node Collection belongs to. `path` field of the existing `nsxt_policy_site` can be used here.
+* `site_path` - (Optional) The path of the site which the Transport Node Collection belongs to.
 
 ## Attributes Reference
 

diff --git a/website/docs/d/policy_host_transport_node_collection_realization.html.markdown b/website/docs/d/policy_host_transport_node_collection_realization.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node_collection_realization"
 description: Host transport node collection realization information.

diff --git a/website/docs/d/policy_host_transport_node_profile.html.markdown b/website/docs/d/policy_host_transport_node_profile.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node_profile"
 description: A host transport node profile data source.

diff --git a/website/docs/d/policy_uplink_host_switch_profile.html.markdown b/website/docs/d/policy_uplink_host_switch_profile.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_uplink_host_switch_profile"
 description: An uplink host switch profile data source.

diff --git a/website/docs/d/policy_vtep_ha_host_switch_profile.html.markdown b/website/docs/d/policy_vtep_ha_host_switch_profile.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_vtep_ha_host_switch_profile"
 description: A VTEP HA host switch profile data source.

diff --git a/website/docs/d/transport_node.html.markdown b/website/docs/d/transport_node.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: transport_node"
 description: An Transport Node data source.

diff --git a/website/docs/d/transport_node_realization.html.markdown b/website/docs/d/transport_node_realization.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Realization"
 layout: "nsxt"
 page_title: "NSXT: transport_node_realization"
 description: Transport node resource realization information.
@@ -23,7 +23,7 @@ resource "nsxt_transport_node" "test" {
       transport_zone          = data.nsxt_transport_zone.tz1.id
       transport_zone_profiles = ["52035bb3-ab02-4a08-9884-18631312e50a"]
     }
-    host_switch_profile = [nsxt_policy_uplink_host_switch_profile.hsw_profile1.id]
+    host_switch_profile = [nsxt_policy_uplink_host_switch_profile.hsw_profile1.path]
     pnic {
       device_name = "fp-eth0"
       uplink_name = "uplink1"

diff --git a/website/docs/r/cluster_virtual_ip.html.markdown b/website/docs/r/cluster_virtual_ip.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_cluster_virtual_ip"
 description: A resource to configure virtual IP of NSXT cluster.

diff --git a/website/docs/r/compute_manager.html.markdown b/website/docs/r/compute_manager.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_compute_manager"
 description: A resource to configure a Compute Manager.

diff --git a/website/docs/r/edge_cluster.html.markdown b/website/docs/r/edge_cluster.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_edge_cluster"
 description: A resource to configure an Edge Cluster.

diff --git a/website/docs/r/edge_high_availability_profile.html.markdown b/website/docs/r/edge_high_availability_profile.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_edge_high_availability_profile"
 description: A resource to configure an Edge High Availability Profile.

diff --git a/website/docs/r/edge_transport_node.html.markdown b/website/docs/r/edge_transport_node.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_edge_transport_node"
 description: A resource to configure an Edge Transport Node.
@@ -24,7 +24,7 @@ resource "nsxt_edge_transport_node" "test" {
       transport_zone          = data.nsxt_transport_zone.tz1.id
       transport_zone_profiles = ["52035bb3-ab02-4a08-9884-18631312e50a"]
     }
-    host_switch_profile = [nsxt_policy_uplink_host_switch_profile.hsw_profile1.id]
+    host_switch_profile = [nsxt_policy_uplink_host_switch_profile.hsw_profile1.path]
     pnic {
       device_name = "fp-eth0"
       uplink_name = "uplink1"

diff --git a/website/docs/r/failure_domain.html.markdown b/website/docs/r/failure_domain.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_failure_domain"
 description: A resource to configure a Failure Domain.

diff --git a/website/docs/r/manager_cluster.html.markdown b/website/docs/r/manager_cluster.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_manager_cluster"
 description: A resource to configure an NSXT cluster.

diff --git a/website/docs/r/node_user.html.markdown b/website/docs/r/node_user.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "User Management"
 layout: "nsxt"
 page_title: "NSXT: nsxt_node_user"
 description: A resource to configure Node Users.

diff --git a/website/docs/r/policy_compute_sub_cluster.html.markdown b/website/docs/r/policy_compute_sub_cluster.html.markdown
@@ -1,8 +1,8 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_compute_sub_cluster"
-description: A resource to configure a  Sub Cluster.
+description: A resource to configure a Compute Sub Cluster.
 ---
 
 # nsxt_policy_compute_sub_cluster

diff --git a/website/docs/r/policy_host_transport_node.html.markdown b/website/docs/r/policy_host_transport_node.html.markdown
@@ -1,13 +1,13 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node"
-description: A resource to configure a HostTransportNode.
+description: A resource to configure a Host Transport Node.
 ---
 
 # nsxt_policy_host_transport_node
 
-This resource provides a method for the management of a HostTransportNode.
+This resource provides a method for the management of a Host Transport Node.
 This resource is supported with NSX 4.1.0 onwards.
 
 ## Example Usage

diff --git a/website/docs/r/policy_host_transport_node_collection.html.markdown b/website/docs/r/policy_host_transport_node_collection.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node_collection"
 description: A resource to configure Policy Host Transport Node Collection.
@@ -41,7 +41,7 @@ The following arguments are supported:
 * `sub_cluster_config` - (Optional) List of sub-cluster configuration.
   * `host_switch_config_source` - (Required) List of overridden HostSwitch configuration.
     * `host_switch_id` - (Required) HostSwitch ID.
-    * `transport_node_profile_sub_config_name` - (Required) Name of the TransportNodeProfile sub configuration to be used.
+    * `transport_node_profile_sub_config_name` - (Required) Name of the Transport Node Profile sub configuration to be used.
   * `sub_cluster_id` - (Required) sub-cluster ID.
 * `transport_node_profile_path` - (Optional) Transport Node Profile Path.
 * `remove_nsx_on_destroy` - (Optional) Upon deletion, uninstall NSX from Transport Node Collection member hosts. Default is true. 

diff --git a/website/docs/r/policy_host_transport_node_profile.html.markdown b/website/docs/r/policy_host_transport_node_profile.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_host_transport_node_profile"
 description: A resource to configure a Policy Host Transport Node Profile.

diff --git a/website/docs/r/policy_ldap_identity_source.html.markdown b/website/docs/r/policy_ldap_identity_source.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "User Management"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_ldap_identity_source"
 description: A resource to configure LDAP identity sources.

diff --git a/website/docs/r/policy_parent_security_policy.html.markdown b/website/docs/r/policy_parent_security_policy.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Firewall"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_parent_security_policy"
 description: A resource to configure a Security Policy without rules.

diff --git a/website/docs/r/policy_security_policy_rule.html.markdown b/website/docs/r/policy_security_policy_rule.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Firewall"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_security_policy_rule"
 description: A resource to configure a Security Policy Rule.

diff --git a/website/docs/r/policy_transport_zone.html.markdown b/website/docs/r/policy_transport_zone.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "Beta"
+subcategory: "Fabric"
 layout: "nsxt"
 page_title: "NSXT: nsxt_policy_transport_zone"
 description: A resource to configure Policy Transport Zone.