applicationgateways - update to use hashicorp/go-azure-sdk

internal/services/network/application_gateway_resource_test.go

@@ -13,10 +13,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-azure-helpers/lang/pointer"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-09-01/applicationgateways"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 	"github.com/tombuildsstuff/kermit/sdk/network/2022-07-01/network"
@@ -1322,17 +1323,17 @@ func TestAccApplicationGateway_removeFirewallPolicy(t *testing.T) {
 }
 
 func (t ApplicationGatewayResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
-	id, err := parse.ApplicationGatewayID(state.ID)
+	id, err := applicationgateways.ParseApplicationGatewayID(state.ID)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := clients.Network.ApplicationGatewaysClient.Get(ctx, id.ResourceGroup, id.Name)
+	resp, err := clients.Network.Client.ApplicationGateways.Get(ctx, *id)
 	if err != nil {
-		return nil, fmt.Errorf("reading Application Gateway (%s): %+v", id, err)
+		return nil, fmt.Errorf("retrieving %s: %+v", id, err)
 	}
 
-	return utils.Bool(resp.ID != nil), nil
+	return pointer.To(resp.Model != nil), nil
 }
 
 func (r ApplicationGatewayResource) basic(data acceptance.TestData) string {

internal/services/network/client/client.go

@@ -6,6 +6,7 @@ package client
 import (
 	"fmt"
 
+	network_2022_07_01 "github.com/hashicorp/go-azure-sdk/resource-manager/network/2022-07-01"
 	network_2023_09_01 "github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-09-01"
 	"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
@@ -15,6 +16,13 @@ import (
 type Client struct {
 	*network_2023_09_01.Client
 
+	// This additional version has been added to facilitate migration of the remaining network
+	// resources to `hashicorp/go-azure-sdk` because upgrading directly to 2023-09-01 will have introduced
+	// breaking changes
+	// TODO 4.0 the following resources/data sources should be updated to use 2023-09-01 just prior to releasing 4.0:
+	// `azurerm_application_gateway` (resource and data source)
+	V20220701Client *network_2022_07_01.Client
+
 	// Usages of the clients below use `Azure/azure-sdk-for-go` and should be updated
 	// to use `hashicorp/go-azure-sdk` (available above).
 	ApplicationGatewaysClient              *network.ApplicationGatewaysClient
@@ -179,8 +187,15 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
 		return nil, fmt.Errorf("building clients for Network: %+v", err)
 	}
 
+	v20220701Client, err := network_2022_07_01.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
+		o.Configure(c, o.Authorizers.ResourceManager)
+	})
+	if err != nil {
+		return nil, fmt.Errorf("building 2022-07-01 clients for Network: %+v", err)
+	}
 	return &Client{
-		Client: client,
+		Client:          client,
+		V20220701Client: v20220701Client,
 
 		ApplicationGatewaysClient:              &ApplicationGatewaysClient,
 		CustomIPPrefixesClient:                 &customIpPrefixesClient,