provider/azurerm: Add azurerm_virtual_machine_scale_set resource (#…

…6711)
hashicorp · Jun 10, 2016 · 514d842 · 514d842
1 parent 5e23e87
commit 514d842
Show file tree

Hide file tree

Showing 6 changed files with 1,629 additions and 19 deletions.
diff --git a/builtin/providers/azurerm/config.go b/builtin/providers/azurerm/config.go
@@ -27,6 +27,7 @@ type ArmClient struct {
 	usageOpsClient         compute.UsageOperationsClient
 	vmExtensionImageClient compute.VirtualMachineExtensionImagesClient
 	vmExtensionClient      compute.VirtualMachineExtensionsClient
+	vmScaleSetClient       compute.VirtualMachineScaleSetsClient
 	vmImageClient          compute.VirtualMachineImagesClient
 	vmClient               compute.VirtualMachinesClient
 
@@ -166,6 +167,12 @@ func (c *Config) getArmClient() (*ArmClient, error) {
 	vmic.Sender = autorest.CreateSender(withRequestLogging())
 	client.vmImageClient = vmic
 
+	vmssc := compute.NewVirtualMachineScaleSetsClient(c.SubscriptionID)
+	setUserAgent(&vmssc.Client)
+	vmssc.Authorizer = spt
+	vmssc.Sender = autorest.CreateSender(withRequestLogging())
+	client.vmScaleSetClient = vmssc
+
 	vmc := compute.NewVirtualMachinesClient(c.SubscriptionID)
 	setUserAgent(&vmc.Client)
 	vmc.Authorizer = spt

diff --git a/builtin/providers/azurerm/provider.go b/builtin/providers/azurerm/provider.go
@@ -5,13 +5,14 @@ import (
 	"reflect"
 	"strings"
 
+	"sync"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/terraform/helper/mutexkv"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	riviera "github.com/jen20/riviera/azure"
-	"sync"
 )
 
 // Provider returns a terraform.ResourceProvider.
@@ -45,24 +46,25 @@ func Provider() terraform.ResourceProvider {
 
 		ResourcesMap: map[string]*schema.Resource{
 			// These resources use the Azure ARM SDK
-			"azurerm_availability_set":       resourceArmAvailabilitySet(),
-			"azurerm_cdn_endpoint":           resourceArmCdnEndpoint(),
-			"azurerm_cdn_profile":            resourceArmCdnProfile(),
-			"azurerm_local_network_gateway":  resourceArmLocalNetworkGateway(),
-			"azurerm_network_interface":      resourceArmNetworkInterface(),
-			"azurerm_network_security_group": resourceArmNetworkSecurityGroup(),
-			"azurerm_network_security_rule":  resourceArmNetworkSecurityRule(),
-			"azurerm_public_ip":              resourceArmPublicIp(),
-			"azurerm_route":                  resourceArmRoute(),
-			"azurerm_route_table":            resourceArmRouteTable(),
-			"azurerm_storage_account":        resourceArmStorageAccount(),
-			"azurerm_storage_blob":           resourceArmStorageBlob(),
-			"azurerm_storage_container":      resourceArmStorageContainer(),
-			"azurerm_storage_queue":          resourceArmStorageQueue(),
-			"azurerm_subnet":                 resourceArmSubnet(),
-			"azurerm_template_deployment":    resourceArmTemplateDeployment(),
-			"azurerm_virtual_machine":        resourceArmVirtualMachine(),
-			"azurerm_virtual_network":        resourceArmVirtualNetwork(),
+			"azurerm_availability_set":          resourceArmAvailabilitySet(),
+			"azurerm_cdn_endpoint":              resourceArmCdnEndpoint(),
+			"azurerm_cdn_profile":               resourceArmCdnProfile(),
+			"azurerm_local_network_gateway":     resourceArmLocalNetworkGateway(),
+			"azurerm_network_interface":         resourceArmNetworkInterface(),
+			"azurerm_network_security_group":    resourceArmNetworkSecurityGroup(),
+			"azurerm_network_security_rule":     resourceArmNetworkSecurityRule(),
+			"azurerm_public_ip":                 resourceArmPublicIp(),
+			"azurerm_route":                     resourceArmRoute(),
+			"azurerm_route_table":               resourceArmRouteTable(),
+			"azurerm_storage_account":           resourceArmStorageAccount(),
+			"azurerm_storage_blob":              resourceArmStorageBlob(),
+			"azurerm_storage_container":         resourceArmStorageContainer(),
+			"azurerm_storage_queue":             resourceArmStorageQueue(),
+			"azurerm_subnet":                    resourceArmSubnet(),
+			"azurerm_template_deployment":       resourceArmTemplateDeployment(),
+			"azurerm_virtual_machine":           resourceArmVirtualMachine(),
+			"azurerm_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(),
+			"azurerm_virtual_network":           resourceArmVirtualNetwork(),
 
 			// These resources use the Riviera SDK
 			"azurerm_dns_a_record":      resourceArmDnsARecord(),