Merge pull request #3544 from terraform-providers/f/refactor

Refactor: migrating clients into packages
hashicorp · May 30, 2019 · d66f52a · d66f52a
2 parents 19a3f4c + 5990af0
commit d66f52a
Show file tree

Hide file tree

Showing 133 changed files with 594 additions and 498 deletions.
diff --git a/azurerm/automation_variable.go b/azurerm/automation_variable.go
@@ -120,7 +120,7 @@ func datasourceAutomationVariableCommonSchema(attType schema.ValueType) map[stri
 }
 
 func resourceAutomationVariableCreateUpdate(d *schema.ResourceData, meta interface{}, varType string) error {
-	client := meta.(*ArmClient).automationVariableClient
+	client := meta.(*ArmClient).automation.VariableClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)
@@ -188,7 +188,7 @@ func resourceAutomationVariableCreateUpdate(d *schema.ResourceData, meta interfa
 }
 
 func resourceAutomationVariableRead(d *schema.ResourceData, meta interface{}, varType string) error {
-	client := meta.(*ArmClient).automationVariableClient
+	client := meta.(*ArmClient).automation.VariableClient
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := parseAzureResourceID(d.Id())
@@ -235,7 +235,7 @@ func resourceAutomationVariableRead(d *schema.ResourceData, meta interface{}, va
 }
 
 func datasourceAutomationVariableRead(d *schema.ResourceData, meta interface{}, varType string) error {
-	client := meta.(*ArmClient).automationVariableClient
+	client := meta.(*ArmClient).automation.VariableClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)
@@ -279,7 +279,7 @@ func datasourceAutomationVariableRead(d *schema.ResourceData, meta interface{},
 }
 
 func resourceAutomationVariableDelete(d *schema.ResourceData, meta interface{}, varType string) error {
-	client := meta.(*ArmClient).automationVariableClient
+	client := meta.(*ArmClient).automation.VariableClient
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := parseAzureResourceID(d.Id())

diff --git a/azurerm/automation_variable_test.go b/azurerm/automation_variable_test.go
@@ -90,7 +90,7 @@ func testCheckAzureRMAutomationVariableExists(resourceName string, varType strin
 		resourceGroup := rs.Primary.Attributes["resource_group_name"]
 		accountName := rs.Primary.Attributes["automation_account_name"]
 
-		client := testAccProvider.Meta().(*ArmClient).automationVariableClient
+		client := testAccProvider.Meta().(*ArmClient).automation.VariableClient
 		ctx := testAccProvider.Meta().(*ArmClient).StopContext
 
 		if resp, err := client.Get(ctx, resourceGroup, accountName, name); err != nil {
@@ -105,7 +105,7 @@ func testCheckAzureRMAutomationVariableExists(resourceName string, varType strin
 }
 
 func testCheckAzureRMAutomationVariableDestroy(s *terraform.State, varType string) error {
-	client := testAccProvider.Meta().(*ArmClient).automationVariableClient
+	client := testAccProvider.Meta().(*ArmClient).automation.VariableClient
 	ctx := testAccProvider.Meta().(*ArmClient).StopContext
 
 	resourceName := fmt.Sprintf("azurerm_automation_variable_%s", strings.ToLower(varType))

diff --git a/azurerm/common_hdinsight.go b/azurerm/common_hdinsight.go
@@ -12,7 +12,7 @@ import (
 
 func hdinsightClusterUpdate(clusterKind string, readFunc schema.ReadFunc) schema.UpdateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
-		client := meta.(*ArmClient).hdinsightClustersClient
+		client := meta.(*ArmClient).hdinsight.ClustersClient
 		ctx := meta.(*ArmClient).StopContext
 
 		id, err := parseAzureResourceID(d.Id())
@@ -60,7 +60,7 @@ func hdinsightClusterUpdate(clusterKind string, readFunc schema.ReadFunc) schema
 
 func hdinsightClusterDelete(clusterKind string) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
-		client := meta.(*ArmClient).hdinsightClustersClient
+		client := meta.(*ArmClient).hdinsight.ClustersClient
 		ctx := meta.(*ArmClient).StopContext
 
 		id, err := parseAzureResourceID(d.Id())

diff --git a/azurerm/common_hdinsight_test.go b/azurerm/common_hdinsight_test.go
@@ -15,7 +15,7 @@ func testCheckAzureRMHDInsightClusterDestroy(terraformResourceName string) func(
 				continue
 			}
 
-			client := testAccProvider.Meta().(*ArmClient).hdinsightClustersClient
+			client := testAccProvider.Meta().(*ArmClient).hdinsight.ClustersClient
 			ctx := testAccProvider.Meta().(*ArmClient).StopContext
 			name := rs.Primary.Attributes["name"]
 			resourceGroup := rs.Primary.Attributes["resource_group_name"]
@@ -43,7 +43,7 @@ func testCheckAzureRMHDInsightClusterExists(resourceName string) resource.TestCh
 		clusterName := rs.Primary.Attributes["name"]
 		resourceGroup := rs.Primary.Attributes["resource_group_name"]
 
-		client := testAccProvider.Meta().(*ArmClient).hdinsightClustersClient
+		client := testAccProvider.Meta().(*ArmClient).hdinsight.ClustersClient
 		ctx := testAccProvider.Meta().(*ArmClient).StopContext
 		resp, err := client.Get(ctx, resourceGroup, clusterName)
 		if err != nil {

diff --git a/azurerm/config.go b/azurerm/config.go
diff --git a/azurerm/data_source_api_management.go b/azurerm/data_source_api_management.go
@@ -152,7 +152,7 @@ func dataSourceApiManagementService() *schema.Resource {
 }
 
 func dataSourceApiManagementRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).apiManagementServiceClient
+	client := meta.(*ArmClient).apimgmt.ServiceClient
 
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/azurerm/data_source_api_management_api.go b/azurerm/data_source_api_management_api.go
@@ -106,7 +106,7 @@ func dataSourceApiManagementApi() *schema.Resource {
 
 func dataSourceApiManagementApiRead(d *schema.ResourceData, meta interface{}) error {
 	ctx := meta.(*ArmClient).StopContext
-	client := meta.(*ArmClient).apiManagementApiClient
+	client := meta.(*ArmClient).apimgmt.ApiClient
 
 	resourceGroup := d.Get("resource_group_name").(string)
 	serviceName := d.Get("api_management_name").(string)

diff --git a/azurerm/data_source_api_management_group.go b/azurerm/data_source_api_management_group.go
@@ -44,7 +44,7 @@ func dataSourceApiManagementGroup() *schema.Resource {
 }
 
 func dataSourceApiManagementGroupRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).apiManagementGroupClient
+	client := meta.(*ArmClient).apimgmt.GroupClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/azurerm/data_source_api_management_product.go b/azurerm/data_source_api_management_product.go
@@ -58,7 +58,7 @@ func dataSourceApiManagementProduct() *schema.Resource {
 	}
 }
 func dataSourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).apiManagementProductsClient
+	client := meta.(*ArmClient).apimgmt.ProductsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/azurerm/data_source_api_management_user.go b/azurerm/data_source_api_management_user.go
@@ -48,7 +48,7 @@ func dataSourceArmApiManagementUser() *schema.Resource {
 }
 
 func dataSourceArmApiManagementUserRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).apiManagementUsersClient
+	client := meta.(*ArmClient).apimgmt.UsersClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/azurerm/data_source_container_registry.go b/azurerm/data_source_container_registry.go
@@ -59,7 +59,7 @@ func dataSourceArmContainerRegistry() *schema.Resource {
 }
 
 func dataSourceArmContainerRegistryRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).containerRegistryClient
+	client := meta.(*ArmClient).containers.RegistryClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

diff --git a/azurerm/data_source_dns_zone.go b/azurerm/data_source_dns_zone.go
@@ -66,7 +66,7 @@ func dataSourceArmDnsZone() *schema.Resource {
 }
 
 func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).zonesClient
+	client := meta.(*ArmClient).dns.ZonesClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

diff --git a/azurerm/data_source_hdinsight_cluster.go b/azurerm/data_source_hdinsight_cluster.go
@@ -84,8 +84,8 @@ func dataSourceArmHDInsightSparkCluster() *schema.Resource {
 }
 
 func dataSourceArmHDInsightClusterRead(d *schema.ResourceData, meta interface{}) error {
-	clustersClient := meta.(*ArmClient).hdinsightClustersClient
-	configurationsClient := meta.(*ArmClient).hdinsightConfigurationsClient
+	clustersClient := meta.(*ArmClient).hdinsight.ClustersClient
+	configurationsClient := meta.(*ArmClient).hdinsight.ConfigurationsClient
 	ctx := meta.(*ArmClient).StopContext
 
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go
@@ -341,7 +341,7 @@ func dataSourceArmKubernetesCluster() *schema.Resource {
 }
 
 func dataSourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).kubernetesClustersClient
+	client := meta.(*ArmClient).containers.KubernetesClustersClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

diff --git a/azurerm/data_source_kubernetes_service_version.go b/azurerm/data_source_kubernetes_service_version.go
@@ -37,7 +37,7 @@ func dataSourceArmKubernetesServiceVersions() *schema.Resource {
 }
 
 func dataSourceArmKubernetesServiceVersionsRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).containerServicesClient
+	client := meta.(*ArmClient).containers.ServicesClient
 	ctx := meta.(*ArmClient).StopContext
 
 	location := azureRMNormalizeLocation(d.Get("location").(string))

diff --git a/azurerm/data_source_log_analytics_workspace.go b/azurerm/data_source_log_analytics_workspace.go
@@ -60,7 +60,7 @@ func dataSourceLogAnalyticsWorkspace() *schema.Resource {
 }
 
 func dataSourceLogAnalyticsWorkspaceRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).workspacesClient
+	client := meta.(*ArmClient).logAnalytics.WorkspacesClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)

diff --git a/azurerm/feature_flags.go b/azurerm/feature_flags.go
@@ -1,13 +1,10 @@
 package azurerm
 
-import (
-	"os"
-	"strings"
-)
+import "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/flags"
 
 // NOTE: we'll need to add an infobox to MySQL|PostgreSQL Configuration when this goes live
 // since these resources can't support import
 // in addition the virtual resources will need adjusting
 
 // This file contains feature flags for functionality which will prove more challenging to implement en-mass
-var requireResourcesToBeImported = strings.EqualFold(os.Getenv("ARM_PROVIDER_STRICT"), "true")
+var requireResourcesToBeImported = flags.RequireResourcesToBeImported
diff --git a/azurerm/internal/flags/features.go b/azurerm/internal/flags/features.go
@@ -0,0 +1,13 @@
+package flags
+
+import (
+	"os"
+	"strings"
+)
+
+// NOTE: we'll need to add an infobox to MySQL|PostgreSQL Configuration when this goes live
+// since these resources can't support import
+// in addition the virtual resources will need adjusting
+
+// This file contains feature flags for functionality which will prove more challenging to implement en-mass
+var RequireResourcesToBeImported = strings.EqualFold(os.Getenv("ARM_PROVIDER_STRICT"), "true")
diff --git a/azurerm/internal/services/apimgmt/client.go b/azurerm/internal/services/apimgmt/client.go
@@ -0,0 +1,29 @@
+package apimgmt
+
+import "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2018-01-01/apimanagement"
+
+type Client struct {
+	ApiClient                  apimanagement.APIClient
+	ApiPoliciesClient          apimanagement.APIPolicyClient
+	ApiOperationsClient        apimanagement.APIOperationClient
+	ApiOperationPoliciesClient apimanagement.APIOperationPolicyClient
+	ApiSchemasClient           apimanagement.APISchemaClient
+	ApiVersionSetClient        apimanagement.APIVersionSetClient
+	AuthorizationServersClient apimanagement.AuthorizationServerClient
+	CertificatesClient         apimanagement.CertificateClient
+	GroupClient                apimanagement.GroupClient
+	GroupUsersClient           apimanagement.GroupUserClient
+	LoggerClient               apimanagement.LoggerClient
+	OpenIdConnectClient        apimanagement.OpenIDConnectProviderClient
+	PolicyClient               apimanagement.PolicyClient
+	ProductsClient             apimanagement.ProductClient
+	ProductApisClient          apimanagement.ProductAPIClient
+	ProductGroupsClient        apimanagement.ProductGroupClient
+	ProductPoliciesClient      apimanagement.ProductPolicyClient
+	PropertyClient             apimanagement.PropertyClient
+	ServiceClient              apimanagement.ServiceClient
+	SignInClient               apimanagement.SignInSettingsClient
+	SignUpClient               apimanagement.SignUpSettingsClient
+	SubscriptionsClient        apimanagement.SubscriptionClient
+	UsersClient                apimanagement.UserClient
+}
diff --git a/azurerm/internal/services/automation/client.go b/azurerm/internal/services/automation/client.go
@@ -0,0 +1,16 @@
+package automation
+
+import "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation"
+
+type Client struct {
+	AccountClient               automation.AccountClient
+	AgentRegistrationInfoClient automation.AgentRegistrationInformationClient
+	CredentialClient            automation.CredentialClient
+	DscConfigurationClient      automation.DscConfigurationClient
+	DscNodeConfigurationClient  automation.DscNodeConfigurationClient
+	ModuleClient                automation.ModuleClient
+	RunbookClient               automation.RunbookClient
+	RunbookDraftClient          automation.RunbookDraftClient
+	ScheduleClient              automation.ScheduleClient
+	VariableClient              automation.VariableClient
+}
diff --git a/azurerm/internal/services/containers/client.go b/azurerm/internal/services/containers/client.go
@@ -0,0 +1,15 @@
+package containers
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance"
+	"github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry"
+	"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2019-02-01/containerservice"
+)
+
+type Client struct {
+	KubernetesClustersClient   containerservice.ManagedClustersClient
+	GroupsClient               containerinstance.ContainerGroupsClient
+	RegistryClient             containerregistry.RegistriesClient
+	RegistryReplicationsClient containerregistry.ReplicationsClient
+	ServicesClient             containerservice.ContainerServicesClient
+}
diff --git a/azurerm/internal/services/devspace/client.go b/azurerm/internal/services/devspace/client.go
@@ -0,0 +1,7 @@
+package devspace
+
+import "github.com/Azure/azure-sdk-for-go/services/preview/devspaces/mgmt/2018-06-01-preview/devspaces"
+
+type Client struct {
+	ControllersClient devspaces.ControllersClient
+}
diff --git a/azurerm/internal/services/dns/client.go b/azurerm/internal/services/dns/client.go
@@ -0,0 +1,8 @@
+package dns
+
+import "github.com/Azure/azure-sdk-for-go/services/preview/dns/mgmt/2018-03-01-preview/dns"
+
+type Client struct {
+	RecordSetsClient dns.RecordSetsClient
+	ZonesClient      dns.ZonesClient
+}
diff --git a/azurerm/internal/services/hdinsight/client.go b/azurerm/internal/services/hdinsight/client.go
@@ -0,0 +1,9 @@
+package hdinsight
+
+import "github.com/Azure/azure-sdk-for-go/services/preview/hdinsight/mgmt/2018-06-01-preview/hdinsight"
+
+type Client struct {
+	ApplicationsClient   hdinsight.ApplicationsClient
+	ClustersClient       hdinsight.ClustersClient
+	ConfigurationsClient hdinsight.ConfigurationsClient
+}
diff --git a/azurerm/internal/services/loganalytics/client.go b/azurerm/internal/services/loganalytics/client.go
@@ -0,0 +1,12 @@
+package loganalytics
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
+	"github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement"
+)
+
+type Client struct {
+	LinkedServicesClient operationalinsights.LinkedServicesClient
+	SolutionsClient      operationsmanagement.SolutionsClient
+	WorkspacesClient     operationalinsights.WorkspacesClient
+}
diff --git a/azurerm/internal/services/media/client.go b/azurerm/internal/services/media/client.go
@@ -0,0 +1,7 @@
+package media
+
+import "github.com/Azure/azure-sdk-for-go/services/mediaservices/mgmt/2018-07-01/media"
+
+type Client struct {
+	ServicesClient media.MediaservicesClient
+}
diff --git a/azurerm/internal/services/redis/client.go b/azurerm/internal/services/redis/client.go
@@ -0,0 +1,9 @@
+package redis
+
+import "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
+
+type Client struct {
+	Client               redis.Client
+	FirewallRulesClient  redis.FirewallRulesClient
+	PatchSchedulesClient redis.PatchSchedulesClient
+}