network - fix tests for 4.0 (#27063)

* network - fix tests for 4.0 * update note to follow O+C formatting --------- Co-authored-by: Steph <[email protected]>
hashicorp · Aug 16, 2024 · 09bc334 · 09bc334
1 parent 00b2264
commit 09bc334
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/internal/services/network/network_interface_data_source.go b/internal/services/network/network_interface_data_source.go
@@ -279,7 +279,7 @@ func dataSourceNetworkInterfaceRead(d *pluginsdk.ResourceData, meta interface{})
 
 		d.Set("applied_dns_servers", appliedDNSServers)
 		d.Set("dns_servers", dnsServers)
-		if !features.FourPointOh() {
+		if !features.FourPointOhBeta() {
 			d.Set("enable_ip_forwarding", props.EnableIPForwarding)
 			d.Set("enable_accelerated_networking", props.EnableAcceleratedNetworking)
 		}

diff --git a/internal/services/network/private_endpoint_resource.go b/internal/services/network/private_endpoint_resource.go
@@ -28,7 +28,6 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	cosmosParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/cosmos/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse"
@@ -204,10 +203,10 @@ func resourcePrivateEndpoint() *pluginsdk.Resource {
 						},
 						// lintignore:S013
 						"member_name": {
-							Type:         pluginsdk.TypeString,
-							Required:     features.FourPointOhBeta(),
-							Optional:     !features.FourPointOhBeta(),
-							Computed:     !features.FourPointOhBeta(),
+							Type: pluginsdk.TypeString,
+							// NOTE: O+C This value should remain optional computed as there are certain cases where Azure will error if you pass in a member id when it isn't expecting one.
+							Optional:     true,
+							Computed:     true,
 							ForceNew:     true,
 							ValidateFunc: validation.StringIsNotEmpty,
 						},

diff --git a/internal/services/network/private_endpoint_resource_test.go b/internal/services/network/private_endpoint_resource_test.go
@@ -207,7 +207,7 @@ func TestAccPrivateEndpoint_privateDnsZoneUpdate(t *testing.T) {
 	})
 }
 
-func TestAccPrivateEndpoint_statiIpAddress(t *testing.T) {
+func TestAccPrivateEndpoint_staticIpAddress(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_private_endpoint", "test")
 	r := PrivateEndpointResource{}
 

diff --git a/internal/services/network/virtual_hub_connection_resource_test.go b/internal/services/network/virtual_hub_connection_resource_test.go
@@ -471,7 +471,7 @@ resource "azurerm_subnet" "test" {
   address_prefixes     = [cidrsubnet("10.5.1.0/24", 4, count.index)]
 
   private_endpoint_network_policies             = "Disabled"
-  enforce_private_link_service_network_policies = true
+  private_link_service_network_policies_enabled = true
 
   service_endpoints = [
     "Microsoft.AzureActiveDirectory",