refactoring clients: phase 4 (#5127)

* resources: refactoring the client into a package

* relay: refactoring the client into a package

* redis: refactoring to use the new pattern

* recoveryservices: refactoring to use modules

* privatedns: refactoring to use the new structure

* postgresql: refactoring to use the new structure

* portal: refactoring to use the new structure

* policy: refactoring to use the new package

* notificationhub: refactoring to use the new structure

* network: refactoring to use the new structure

* netapp: refactoring to use the new structure

* refactor: consistent naming

azurerm/config.go

@@ -9,17 +9,6 @@ import (
 	"github.com/hashicorp/go-azure-helpers/sender"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/notificationhub"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/portal"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/privatedns"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/recoveryservices"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/redis"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/relay"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/resource"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/scheduler"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/search"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/securitycenter"
@@ -136,17 +125,6 @@ func (client *ArmClient) Build(o *common.ClientOptions) error {
 	}
 
 	// TODO: move these Clients inside of Common so this method can be moved in there
-	client.Netapp = netapp.BuildClient(o)
-	client.Network = network.BuildClient(o)
-	client.NotificationHubs = notificationhub.BuildClient(o)
-	client.Policy = policy.BuildClient(o)
-	client.Portal = portal.BuildClient(o)
-	client.Postgres = postgres.BuildClient(o)
-	client.PrivateDns = privatedns.BuildClient(o)
-	client.RecoveryServices = recoveryservices.BuildClient(o)
-	client.Redis = redis.BuildClient(o)
-	client.Relay = relay.BuildClient(o)
-	client.Resource = resource.BuildClient(o)
 	client.Search = search.BuildClient(o)
 	client.SecurityCenter = securitycenter.BuildClient(o)
 	client.ServiceBus = servicebus.BuildClient(o)

azurerm/data_source_healthcare_service.go

@@ -116,7 +116,7 @@ func dataSourceArmHealthcareService() *schema.Resource {
 }
 
 func dataSourceArmHealthcareServiceRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).Healthcare.HealthcareServiceClient
+	client := meta.(*ArmClient).HealthCare.HealthcareServiceClient
 	ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d)
 	defer cancel()
 

azurerm/data_source_mssql_elasticpool.go

@@ -65,7 +65,7 @@ func dataSourceArmMsSqlElasticpool() *schema.Resource {
 }
 
 func dataSourceArmMsSqlElasticpoolRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).Mssql.ElasticPoolsClient
+	client := meta.(*ArmClient).MSSQL.ElasticPoolsClient
 	ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d)
 	defer cancel()
 

azurerm/data_source_netapp_account.go

@@ -36,7 +36,7 @@ func dataSourceArmNetAppAccount() *schema.Resource {
 }
 
 func dataSourceArmNetAppAccountRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).Netapp.AccountClient
+	client := meta.(*ArmClient).NetApp.AccountClient
 	ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d)
 	defer cancel()
 

azurerm/data_source_netapp_pool.go

@@ -50,7 +50,7 @@ func dataSourceArmNetAppPool() *schema.Resource {
 }
 
 func dataSourceArmNetAppPoolRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).Netapp.PoolClient
+	client := meta.(*ArmClient).NetApp.PoolClient
 	ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d)
 	defer cancel()
 

azurerm/data_source_user_assigned_identity.go

@@ -48,7 +48,7 @@ func dataSourceArmUserAssignedIdentity() *schema.Resource {
 }
 
 func dataSourceArmUserAssignedIdentityRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).Msi.UserAssignedIdentitiesClient
+	client := meta.(*ArmClient).MSI.UserAssignedIdentitiesClient
 	ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d)
 	defer cancel()
 

azurerm/internal/clients/client.go

@@ -42,17 +42,17 @@ import (
 	msi "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/client"
 	mssql "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql/client"
 	mysql "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mysql/client"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/notificationhub"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/portal"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/privatedns"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/recoveryservices"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/redis"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/relay"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/resource"
+	netapp "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp/client"
+	network "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/client"
+	notificationhub "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/notificationhub/client"
+	policy "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy/client"
+	portal "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/portal/client"
+	postgres "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres/client"
+	privatedns "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/privatedns/client"
+	recoveryServices "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/recoveryservices/client"
+	redis "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/redis/client"
+	relay "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/relay/client"
+	resource "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/resource/client"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/scheduler"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/search"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/securitycenter"
@@ -99,7 +99,7 @@ type Client struct {
 	Frontdoor   *frontdoor.Client
 	Graph       *graph.Client
 	HDInsight   *hdinsight.Client
-	Healthcare  *healthcare.Client
+	HealthCare  *healthcare.Client
 
 	// Phrase 3
 	IoTHub           *iothub.Client
@@ -112,19 +112,19 @@ type Client struct {
 	MariaDB          *mariadb.Client
 	Media            *media.Client
 	Monitor          *monitor.Client
-	Msi              *msi.Client
-	Mssql            *mssql.Client
-	Mysql            *mysql.Client
+	MSI              *msi.Client
+	MSSQL            *mssql.Client
+	MySQL            *mysql.Client
 
-	// TODO: Phase 4
-	Netapp           *netapp.Client
+	// Phase 4
+	NetApp           *netapp.Client
 	Network          *network.Client
 	NotificationHubs *notificationhub.Client
 	Policy           *policy.Client
 	Portal           *portal.Client
 	Postgres         *postgres.Client
 	PrivateDns       *privatedns.Client
-	RecoveryServices *recoveryservices.Client
+	RecoveryServices *recoveryServices.Client
 	Redis            *redis.Client
 	Relay            *relay.Client
 	Resource         *resource.Client
@@ -169,7 +169,7 @@ func (client *Client) Build(o *common.ClientOptions) error {
 	client.Frontdoor = frontdoor.NewClient(o)
 	client.Graph = graph.NewClient(o)
 	client.HDInsight = hdinsight.NewClient(o)
-	client.Healthcare = healthcare.NewClient(o)
+	client.HealthCare = healthcare.NewClient(o)
 	client.IoTHub = iothub.NewClient(o)
 	client.KeyVault = keyvault.NewClient(o)
 	client.Kusto = kusto.NewClient(o)
@@ -180,9 +180,21 @@ func (client *Client) Build(o *common.ClientOptions) error {
 	client.MariaDB = mariadb.NewClient(o)
 	client.Media = media.NewClient(o)
 	client.Monitor = monitor.NewClient(o)
-	client.Msi = msi.NewClient(o)
-	client.Mssql = mssql.NewClient(o)
-	client.Mysql = mysql.NewClient(o)
+	client.MSI = msi.NewClient(o)
+	client.MSSQL = mssql.NewClient(o)
+	client.MySQL = mysql.NewClient(o)
+
+	client.NetApp = netapp.NewClient(o)
+	client.Network = network.NewClient(o)
+	client.NotificationHubs = notificationhub.NewClient(o)
+	client.Policy = policy.NewClient(o)
+	client.Portal = portal.NewClient(o)
+	client.Postgres = postgres.NewClient(o)
+	client.PrivateDns = privatedns.NewClient(o)
+	client.RecoveryServices = recoveryServices.NewClient(o)
+	client.Redis = redis.NewClient(o)
+	client.Relay = relay.NewClient(o)
+	client.Resource = resource.NewClient(o)
 
 	return nil
 }

azurerm/internal/provider/services.go

@@ -39,6 +39,16 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mysql"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/notificationhub"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/portal"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/postgres"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/privatedns"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/recoveryservices"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/redis"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/relay"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/resource"
 )
 
 func SupportedServices() []common.ServiceRegistration {
@@ -80,5 +90,16 @@ func SupportedServices() []common.ServiceRegistration {
 		msi.Registration{},
 		mssql.Registration{},
 		mysql.Registration{},
+
+		network.Registration{},
+		notificationhub.Registration{},
+		policy.Registration{},
+		portal.Registration{},
+		postgres.Registration{},
+		privatedns.Registration{},
+		recoveryservices.Registration{},
+		redis.Registration{},
+		relay.Registration{},
+		resource.Registration{},
 	}
 }

azurerm/internal/services/netapp/client.go → azurerm/internal/services/netapp/client/client.go

@@ -1,4 +1,4 @@
-package netapp
+package client
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
@@ -10,7 +10,7 @@ type Client struct {
 	PoolClient    *netapp.PoolsClient
 }
 
-func BuildClient(o *common.ClientOptions) *Client {
+func NewClient(o *common.ClientOptions) *Client {
 	accountClient := netapp.NewAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&accountClient.Client, o.ResourceManagerAuthorizer)
 

azurerm/internal/services/netapp/registration.go

@@ -0,0 +1,22 @@
+package netapp
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+type Registration struct{}
+
+// Name is the name of this Service
+func (r Registration) Name() string {
+	return "NetApp"
+}
+
+// SupportedDataSources returns the supported Data Sources supported by this Service
+func (r Registration) SupportedDataSources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}
+
+// SupportedResources returns the supported Resources supported by this Service
+func (r Registration) SupportedResources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}

azurerm/internal/services/network/client.go → azurerm/internal/services/network/client/client.go

@@ -1,4 +1,4 @@
-package network
+package client
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network"
@@ -43,7 +43,7 @@ type Client struct {
 	PrivateLinkServiceClient             *network.PrivateLinkServicesClient
 }
 
-func BuildClient(o *common.ClientOptions) *Client {
+func NewClient(o *common.ClientOptions) *Client {
 	ApplicationGatewaysClient := network.NewApplicationGatewaysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&ApplicationGatewaysClient.Client, o.ResourceManagerAuthorizer)
 

azurerm/internal/services/network/registration.go

@@ -0,0 +1,22 @@
+package network
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+type Registration struct{}
+
+// Name is the name of this Service
+func (r Registration) Name() string {
+	return "Network"
+}
+
+// SupportedDataSources returns the supported Data Sources supported by this Service
+func (r Registration) SupportedDataSources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}
+
+// SupportedResources returns the supported Resources supported by this Service
+func (r Registration) SupportedResources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}

azurerm/internal/services/notificationhub/client.go → azurerm/internal/services/notificationhub/client/client.go

@@ -1,4 +1,4 @@
-package notificationhub
+package client
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/notificationhubs/mgmt/2017-04-01/notificationhubs"
@@ -10,15 +10,15 @@ type Client struct {
 	NamespacesClient *notificationhubs.NamespacesClient
 }
 
-func BuildClient(o *common.ClientOptions) *Client {
-	NamespacesClient := notificationhubs.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&NamespacesClient.Client, o.ResourceManagerAuthorizer)
+func NewClient(o *common.ClientOptions) *Client {
+	hubsClient := notificationhubs.NewClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&hubsClient.Client, o.ResourceManagerAuthorizer)
 
-	HubsClient := notificationhubs.NewClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&HubsClient.Client, o.ResourceManagerAuthorizer)
+	namespacesClient := notificationhubs.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&namespacesClient.Client, o.ResourceManagerAuthorizer)
 
 	return &Client{
-		HubsClient:       &HubsClient,
-		NamespacesClient: &NamespacesClient,
+		HubsClient:       &hubsClient,
+		NamespacesClient: &namespacesClient,
 	}
 }

azurerm/internal/services/notificationhub/registration.go

@@ -0,0 +1,22 @@
+package notificationhub
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+type Registration struct{}
+
+// Name is the name of this Service
+func (r Registration) Name() string {
+	return "Notification Hub"
+}
+
+// SupportedDataSources returns the supported Data Sources supported by this Service
+func (r Registration) SupportedDataSources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}
+
+// SupportedResources returns the supported Resources supported by this Service
+func (r Registration) SupportedResources() map[string]*schema.Resource {
+	return map[string]*schema.Resource{}
+}