From 0ccfb22b376f1c146790e9ece49314f9d2901c7c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 28 Jul 2023 08:23:15 +0200 Subject: [PATCH] r/web_application_firewall_policy: updating to use the meta client --- internal/services/network/client/client.go | 12 +----------- .../web_application_firewall_policy_data_source.go | 2 +- .../web_application_firewall_policy_resource.go | 6 +++--- .../web_application_firewall_policy_resource_test.go | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/internal/services/network/client/client.go b/internal/services/network/client/client.go index 566d1bcf0951..6b5283bfb6f9 100644 --- a/internal/services/network/client/client.go +++ b/internal/services/network/client/client.go @@ -6,10 +6,8 @@ package client import ( "fmt" - "github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager" - network_2023_02_01 "github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01" - "github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-02-01/webapplicationfirewallpolicies" + "github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager" "github.com/hashicorp/terraform-provider-azurerm/internal/common" "github.com/tombuildsstuff/kermit/sdk/network/2022-07-01/network" ) @@ -65,7 +63,6 @@ type Client struct { VpnServerConfigurationsClient *network.VpnServerConfigurationsClient VpnSitesClient *network.VpnSitesClient WatcherClient *network.WatchersClient - WebApplicationFirewallPoliciesClient *webapplicationfirewallpolicies.WebApplicationFirewallPoliciesClient } func NewClient(o *common.ClientOptions) (*Client, error) { @@ -207,12 +204,6 @@ func NewClient(o *common.ClientOptions) (*Client, error) { WatcherClient := network.NewWatchersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&WatcherClient.Client, o.ResourceManagerAuthorizer) - WebApplicationFirewallPoliciesClient, err := webapplicationfirewallpolicies.NewWebApplicationFirewallPoliciesClientWithBaseURI(o.Environment.ResourceManager) - if err != nil { - return nil, fmt.Errorf("building network web application firewall policies client: %+v", err) - } - o.Configure(WebApplicationFirewallPoliciesClient.Client, o.Authorizers.ResourceManager) - ServiceAssociationLinkClient := network.NewServiceAssociationLinksClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ServiceAssociationLinkClient.Client, o.ResourceManagerAuthorizer) @@ -273,7 +264,6 @@ func NewClient(o *common.ClientOptions) (*Client, error) { VpnServerConfigurationsClient: &vpnServerConfigurationsClient, VpnSitesClient: &vpnSitesClient, WatcherClient: &WatcherClient, - WebApplicationFirewallPoliciesClient: WebApplicationFirewallPoliciesClient, PrivateDnsZoneGroupClient: &PrivateDnsZoneGroupClient, PrivateLinkServiceClient: &PrivateLinkServiceClient, ServiceAssociationLinkClient: &ServiceAssociationLinkClient, diff --git a/internal/services/network/web_application_firewall_policy_data_source.go b/internal/services/network/web_application_firewall_policy_data_source.go index 80304ad84714..9bb18e7ad479 100644 --- a/internal/services/network/web_application_firewall_policy_data_source.go +++ b/internal/services/network/web_application_firewall_policy_data_source.go @@ -43,7 +43,7 @@ func dataWebApplicationFirewallPolicy() *pluginsdk.Resource { } func dataSourceWebApplicationFirewallPolicy(d *pluginsdk.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.WebApplicationFirewallPoliciesClient + client := meta.(*clients.Client).Network.WebApplicationFirewallPolicies subscriptionId := meta.(*clients.Client).Account.SubscriptionId ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/internal/services/network/web_application_firewall_policy_resource.go b/internal/services/network/web_application_firewall_policy_resource.go index 91e81763b132..3533c1eafd70 100644 --- a/internal/services/network/web_application_firewall_policy_resource.go +++ b/internal/services/network/web_application_firewall_policy_resource.go @@ -425,7 +425,7 @@ func resourceWebApplicationFirewallPolicy() *pluginsdk.Resource { } func resourceWebApplicationFirewallPolicyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.WebApplicationFirewallPoliciesClient + client := meta.(*clients.Client).Network.WebApplicationFirewallPolicies subscriptionId := meta.(*clients.Client).Account.SubscriptionId ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -475,7 +475,7 @@ func resourceWebApplicationFirewallPolicyCreateUpdate(d *pluginsdk.ResourceData, } func resourceWebApplicationFirewallPolicyRead(d *pluginsdk.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.WebApplicationFirewallPoliciesClient + client := meta.(*clients.Client).Network.WebApplicationFirewallPolicies ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -522,7 +522,7 @@ func resourceWebApplicationFirewallPolicyRead(d *pluginsdk.ResourceData, meta in } func resourceWebApplicationFirewallPolicyDelete(d *pluginsdk.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.WebApplicationFirewallPoliciesClient + client := meta.(*clients.Client).Network.WebApplicationFirewallPolicies ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/internal/services/network/web_application_firewall_policy_resource_test.go b/internal/services/network/web_application_firewall_policy_resource_test.go index 698eacc43274..3f1542c0dd19 100644 --- a/internal/services/network/web_application_firewall_policy_resource_test.go +++ b/internal/services/network/web_application_firewall_policy_resource_test.go @@ -292,7 +292,7 @@ func (t WebApplicationFirewallResource) Exists(ctx context.Context, clients *cli return nil, err } - resp, err := clients.Network.WebApplicationFirewallPoliciesClient.Get(ctx, *id) + resp, err := clients.Network.WebApplicationFirewallPolicies.Get(ctx, *id) if err != nil { return nil, fmt.Errorf("reading %s: %+v", *id, err) }