New data source for azurerm_compute_resource_skus

hashicorp · Jul 5, 2019 · 4fe4b93 · 4fe4b93
1 parent 1917292
commit 4fe4b93
Show file tree

Hide file tree

Showing 6 changed files with 358 additions and 152 deletions.
diff --git a/azurerm/config.go b/azurerm/config.go
@@ -175,11 +175,7 @@ type ArmClient struct {
 	galleriesClient            compute.GalleriesClient
 	galleryImagesClient        compute.GalleryImagesClient
 	galleryImageVersionsClient compute.GalleryImageVersionsClient
-<<<<<<< HEAD
-	resourceSkusClient				 compute.ResourceSkusClient
-=======
 	resourceSkusClient         compute.ResourceSkusClient
->>>>>>> 5acb4dc0bc503b9c171c6ed56c510cea389c047e
 	snapshotsClient            compute.SnapshotsClient
 	usageOpsClient             compute.UsageClient
 	vmExtensionImageClient     compute.VirtualMachineExtensionImagesClient
@@ -532,18 +528,6 @@ func (c *ArmClient) registerComputeClients(endpoint, subscriptionId string, auth
 	galleryImageVersionsClient := compute.NewGalleryImageVersionsClientWithBaseURI(endpoint, subscriptionId)
 	c.configureClient(&galleryImageVersionsClient.Client, auth)
 	c.galleryImageVersionsClient = galleryImageVersionsClient
-<<<<<<< HEAD
-
-	resourceSkusClient := compute.NewResourceSkusClientWithBaseURI(endpoint, subscriptionId)
-	c.configureClient(&resourceSkusClient.Client, auth)
-	c.resourceSkusClient = resourceSkusClient
-}
-
-func (c *ArmClient) registerDatabricksClients(endpoint, subscriptionId string, auth autorest.Authorizer) {
-	workspacesClient := databricksSvc.NewWorkspacesClientWithBaseURI(endpoint, subscriptionId)
-	c.configureClient(&workspacesClient.Client, auth)
-=======
->>>>>>> 5acb4dc0bc503b9c171c6ed56c510cea389c047e
 
 	resourceSkusClient := compute.NewResourceSkusClientWithBaseURI(endpoint, subscriptionId)
 	c.configureClient(&resourceSkusClient.Client, auth)