Switch more client registrations to new format

azurerm/data_source_batch_account.go

@@ -66,7 +66,7 @@ func dataSourceArmBatchAccount() *schema.Resource {
 }
 
 func dataSourceArmBatchAccountRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchAccountClient
+	client := meta.(*ArmClient).batch.AccountClient
 
 	resourceGroup := d.Get("resource_group_name").(string)
 	name := d.Get("name").(string)

azurerm/data_source_batch_certificate.go

@@ -50,7 +50,7 @@ func dataSourceArmBatchCertificate() *schema.Resource {
 
 func dataSourceArmBatchCertificateRead(d *schema.ResourceData, meta interface{}) error {
 	ctx := meta.(*ArmClient).StopContext
-	client := meta.(*ArmClient).batchCertificateClient
+	client := meta.(*ArmClient).batch.CertificateClient
 
 	resourceGroupName := d.Get("resource_group_name").(string)
 	accountName := d.Get("account_name").(string)

azurerm/data_source_batch_pool.go

@@ -252,7 +252,7 @@ func dataSourceArmBatchPool() *schema.Resource {
 }
 
 func dataSourceArmBatchPoolRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchPoolClient
+	client := meta.(*ArmClient).batch.PoolClient
 
 	name := d.Get("name").(string)
 	accountName := d.Get("account_name").(string)

azurerm/data_source_builtin_role_definition.go

@@ -81,7 +81,7 @@ As such this Data Source will be removed in v2.0 of the AzureRM Provider.
 }
 
 func dataSourceArmBuiltInRoleDefinitionRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).roleDefinitionsClient
+	client := meta.(*ArmClient).authorization.RoleDefinitionsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

azurerm/data_source_cosmos_db_account.go

@@ -178,7 +178,7 @@ func dataSourceArmCosmosDbAccount() *schema.Resource {
 }
 
 func dataSourceArmCosmosDbAccountRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).cosmosAccountsClient
+	client := meta.(*ArmClient).cosmos.DatabaseClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)

azurerm/data_source_key_vault.go

@@ -154,7 +154,7 @@ func dataSourceArmKeyVault() *schema.Resource {
 }
 
 func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).keyVaultClient
+	client := meta.(*ArmClient).keyvault.VaultsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

azurerm/data_source_key_vault_key.go

@@ -79,8 +79,8 @@ func dataSourceArmKeyVaultKey() *schema.Resource {
 }
 
 func dataSourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error {
-	vaultClient := meta.(*ArmClient).keyVaultClient
-	client := meta.(*ArmClient).keyVaultManagementClient
+	vaultClient := meta.(*ArmClient).keyvault.VaultsClient
+	client := meta.(*ArmClient).keyvault.ManagementClient
 	ctx := meta.(*ArmClient).StopContext
 
 	keyVaultBaseUri := d.Get("vault_uri").(string)

azurerm/data_source_key_vault_secret.go

@@ -63,8 +63,8 @@ func dataSourceArmKeyVaultSecret() *schema.Resource {
 }
 
 func dataSourceArmKeyVaultSecretRead(d *schema.ResourceData, meta interface{}) error {
-	vaultClient := meta.(*ArmClient).keyVaultClient
-	client := meta.(*ArmClient).keyVaultManagementClient
+	vaultClient := meta.(*ArmClient).keyvault.VaultsClient
+	client := meta.(*ArmClient).keyvault.ManagementClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

azurerm/data_source_role_definition.go

@@ -100,7 +100,7 @@ func dataSourceArmRoleDefinition() *schema.Resource {
 }
 
 func dataSourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).roleDefinitionsClient
+	client := meta.(*ArmClient).authorization.RoleDefinitionsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

azurerm/data_source_stream_analytics_job.go

@@ -72,8 +72,8 @@ func dataSourceArmStreamAnalyticsJob() *schema.Resource {
 }
 
 func dataSourceArmStreamAnalyticsJobRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).streamAnalyticsJobsClient
-	transformationsClient := meta.(*ArmClient).streamAnalyticsTransformationsClient
+	client := meta.(*ArmClient).streamanalytics.JobsClient
+	transformationsClient := meta.(*ArmClient).streamanalytics.TransformationsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

azurerm/internal/services/authorization/client.go

@@ -0,0 +1,23 @@
+package authorization
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	RoleAssignmentsClient authorization.RoleAssignmentsClient
+	RoleDefinitionsClient authorization.RoleDefinitionsClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.RoleAssignmentsClient = authorization.NewRoleAssignmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.RoleAssignmentsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.RoleDefinitionsClient = authorization.NewRoleDefinitionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.RoleDefinitionsClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/batch/client.go

@@ -0,0 +1,31 @@
+package batch
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	AccountClient     batch.AccountClient
+	ApplicationClient batch.ApplicationClient
+	CertificateClient batch.CertificateClient
+	PoolClient        batch.PoolClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.AccountClient = batch.NewAccountClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.AccountClient.Client, o.ResourceManagerAuthorizer)
+
+	c.ApplicationClient = batch.NewApplicationClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ApplicationClient.Client, o.ResourceManagerAuthorizer)
+
+	c.CertificateClient = batch.NewCertificateClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.CertificateClient.Client, o.ResourceManagerAuthorizer)
+
+	c.PoolClient = batch.NewPoolClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.PoolClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/cosmos/client.go

@@ -0,0 +1,19 @@
+package cosmos
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	DatabaseClient documentdb.DatabaseAccountsClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.DatabaseClient = documentdb.NewDatabaseAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.DatabaseClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/keyvault/client.go

@@ -0,0 +1,24 @@
+package keyvault
+
+import (
+	keyvaultmgmt "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
+	"github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	VaultsClient     keyvault.VaultsClient
+	ManagementClient keyvaultmgmt.BaseClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.VaultsClient = keyvault.NewVaultsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.VaultsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.ManagementClient = keyvaultmgmt.New()
+	o.ConfigureClient(&c.ManagementClient.Client, o.KeyVaultAuthorizer)
+
+	return &c
+}

azurerm/internal/services/mariadb/client.go

@@ -0,0 +1,27 @@
+package mariadb
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	DatabasesClient     mariadb.DatabasesClient
+	FirewallRulesClient mariadb.FirewallRulesClient
+	ServersClient       mariadb.ServersClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.DatabasesClient = mariadb.NewDatabasesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.DatabasesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.FirewallRulesClient = mariadb.NewFirewallRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.FirewallRulesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.ServersClient = mariadb.NewServersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ServersClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/mysql/client.go

@@ -0,0 +1,35 @@
+package mysql
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	ConfigurationsClient      mysql.ConfigurationsClient
+	DatabasesClient           mysql.DatabasesClient
+	FirewallRulesClient       mysql.FirewallRulesClient
+	ServersClient             mysql.ServersClient
+	VirtualNetworkRulesClient mysql.VirtualNetworkRulesClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.ConfigurationsClient = mysql.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ConfigurationsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.DatabasesClient = mysql.NewDatabasesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.DatabasesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.FirewallRulesClient = mysql.NewFirewallRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.FirewallRulesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.ServersClient = mysql.NewServersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ServersClient.Client, o.ResourceManagerAuthorizer)
+
+	c.VirtualNetworkRulesClient = mysql.NewVirtualNetworkRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.VirtualNetworkRulesClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/postgres/client.go

@@ -0,0 +1,35 @@
+package postgres
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	ConfigurationsClient      postgresql.ConfigurationsClient
+	DatabasesClient           postgresql.DatabasesClient
+	FirewallRulesClient       postgresql.FirewallRulesClient
+	ServersClient             postgresql.ServersClient
+	VirtualNetworkRulesClient postgresql.VirtualNetworkRulesClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.ConfigurationsClient = postgresql.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ConfigurationsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.DatabasesClient = postgresql.NewDatabasesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.DatabasesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.FirewallRulesClient = postgresql.NewFirewallRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.FirewallRulesClient.Client, o.ResourceManagerAuthorizer)
+
+	c.ServersClient = postgresql.NewServersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.ServersClient.Client, o.ResourceManagerAuthorizer)
+
+	c.VirtualNetworkRulesClient = postgresql.NewVirtualNetworkRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.VirtualNetworkRulesClient.Client, o.ResourceManagerAuthorizer)
+
+	return &c
+}

azurerm/internal/services/streamanalytics/client.go

@@ -0,0 +1,34 @@
+package streamanalytics
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	FunctionsClient       streamanalytics.FunctionsClient
+	JobsClient            streamanalytics.StreamingJobsClient
+	InputsClient          streamanalytics.InputsClient
+	OutputsClient         streamanalytics.OutputsClient
+	TransformationsClient streamanalytics.TransformationsClient
+}
+
+func BuildClient(o *common.ClientOptions) *Client {
+	c := Client{}
+
+	c.FunctionsClient = streamanalytics.NewFunctionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.FunctionsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.JobsClient = streamanalytics.NewStreamingJobsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.JobsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.InputsClient = streamanalytics.NewInputsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.InputsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.OutputsClient = streamanalytics.NewOutputsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.OutputsClient.Client, o.ResourceManagerAuthorizer)
+
+	c.TransformationsClient = streamanalytics.NewTransformationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&c.TransformationsClient.Client, o.ResourceManagerAuthorizer)
+	return &c
+}

azurerm/resource_arm_batch_account.go

@@ -93,7 +93,7 @@ func resourceArmBatchAccount() *schema.Resource {
 }
 
 func resourceArmBatchAccountCreate(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchAccountClient
+	client := meta.(*ArmClient).batch.AccountClient
 	ctx := meta.(*ArmClient).StopContext
 
 	log.Printf("[INFO] preparing arguments for Azure Batch account creation.")
@@ -171,7 +171,7 @@ func resourceArmBatchAccountCreate(d *schema.ResourceData, meta interface{}) err
 }
 
 func resourceArmBatchAccountRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchAccountClient
+	client := meta.(*ArmClient).batch.AccountClient
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := parseAzureResourceID(d.Id())
@@ -223,7 +223,7 @@ func resourceArmBatchAccountRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceArmBatchAccountUpdate(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchAccountClient
+	client := meta.(*ArmClient).batch.AccountClient
 	ctx := meta.(*ArmClient).StopContext
 
 	log.Printf("[INFO] preparing arguments for Azure Batch account update.")
@@ -266,7 +266,7 @@ func resourceArmBatchAccountUpdate(d *schema.ResourceData, meta interface{}) err
 }
 
 func resourceArmBatchAccountDelete(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).batchAccountClient
+	client := meta.(*ArmClient).batch.AccountClient
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := parseAzureResourceID(d.Id())

azurerm/resource_arm_batch_account_test.go

@@ -171,7 +171,7 @@ func testCheckAzureRMBatchAccountExists(resourceName string) resource.TestCheckF
 
 		// Ensure resource group exists in API
 		ctx := testAccProvider.Meta().(*ArmClient).StopContext
-		conn := testAccProvider.Meta().(*ArmClient).batchAccountClient
+		conn := testAccProvider.Meta().(*ArmClient).batch.AccountClient
 
 		resp, err := conn.Get(ctx, resourceGroup, batchAccount)
 		if err != nil {
@@ -187,7 +187,7 @@ func testCheckAzureRMBatchAccountExists(resourceName string) resource.TestCheckF
 }
 
 func testCheckAzureRMBatchAccountDestroy(s *terraform.State) error {
-	conn := testAccProvider.Meta().(*ArmClient).batchAccountClient
+	conn := testAccProvider.Meta().(*ArmClient).batch.AccountClient
 	ctx := testAccProvider.Meta().(*ArmClient).StopContext
 
 	for _, rs := range s.RootModule().Resources {