Merge pull request #2052 from aznashwan/azure

provider/azure: added a number of storage and networking resources.

builtin/providers/azure/config.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/svanharmelen/azure-sdk-for-go/management"
+	"github.com/Azure/azure-sdk-for-go/management"
 )
 
 // Config is the configuration structure used to instantiate a

builtin/providers/azure/constants.go

@@ -0,0 +1,48 @@
+package azure
+
+const (
+	// terraformAzureLabel is used as the label for the hosted service created
+	// by Terraform on Azure.
+	terraformAzureLabel = "terraform-on-azure"
+
+	// terraformAzureDescription is the description used for the hosted service
+	// created by Terraform on Azure.
+	terraformAzureDescription = "Hosted service automatically created by terraform."
+)
+
+// parameterDescriptions holds a list of descriptions for all the available
+// parameters of an Azure configuration.
+var parameterDescriptions = map[string]string{
+	// provider descriptions:
+	"management_url": "The URL of the management API all requests should be sent to.\n" +
+		"Defaults to 'https://management.core.windows.net/', which is the default Azure API URL.\n" +
+		"This should be filled in only if you have your own datacenter with its own hosted management API.",
+	"management_certificate": "The certificate for connecting to the management API specified with 'management_url'",
+	"subscription_id":        "The subscription ID to be used when connecting to the management API.",
+	"publish_settings_file":  "The publish settings file, either created by you or downloaded from 'https://manage.windowsazure.com/publishsettings'",
+	// general resource descriptions:
+	"name":         "Name of the resource to be created as it will appear in the Azure dashboard.",
+	"service_name": "Name of the hosted service within Azure. Will have a DNS entry as dns-name.cloudapp.net",
+	"location": "The Azure location where the resource will be located.\n" +
+		"A list of Azure locations can be found here: http://azure.microsoft.com/en-us/regions/",
+	"reverse_dns_fqdn": "The reverse of the fully qualified domain name. Optional.",
+	"label":            "Label by which the resource will be identified by. Optional.",
+	"description":      "Brief description of the resource. Optional.",
+	// hosted service descriptions:
+	"ephemeral_contents": "Sets whether the associated contents of this resource should also be\n" +
+		"deleted upon this resource's deletion. Default is false.",
+	// instance descriptions:
+	"image":                          "The image the new VM will be booted from. Mandatory.",
+	"size":                           "The size in GB of the disk to be created. Mandatory.",
+	"os_type":                        "The OS type of the VM. Either Windows or Linux. Mandatory.",
+	"storage_account":                "The storage account (pool) name. Mandatory.",
+	"storage_container":              "The storage container name from the storage pool given with 'storage_pool'.",
+	"user_name":                      "The user name to be configured on the new VM.",
+	"user_password":                  "The user password to be configured on the new VM.",
+	"default_certificate_thumbprint": "The thumbprint of the WinRM Certificate to be used as a default.",
+	// local network descriptions:
+	"vpn_gateway_address":    "The IP address of the VPN gateway bridged through this virtual network.",
+	"address_space_prefixes": "List of address space prefixes in the format '<IP>/netmask'",
+	// dns descriptions:
+	"dns_address": "Address of the DNS server. Required.",
+}

builtin/providers/azure/provider.go

@@ -32,10 +32,18 @@ func Provider() terraform.ResourceProvider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
-			"azure_data_disk":       resourceAzureDataDisk(),
-			"azure_instance":        resourceAzureInstance(),
-			"azure_security_group":  resourceAzureSecurityGroup(),
-			"azure_virtual_network": resourceAzureVirtualNetwork(),
+			"azure_instance":                 resourceAzureInstance(),
+			"azure_data_disk":                resourceAzureDataDisk(),
+			"azure_hosted_service":           resourceAzureHostedService(),
+			"azure_storage_service":          resourceAzureStorageService(),
+			"azure_storage_container":        resourceAzureStorageContainer(),
+			"azure_storage_blob":             resourceAzureStorageBlob(),
+			"azure_storage_queue":            resourceAzureStorageQueue(),
+			"azure_virtual_network":          resourceAzureVirtualNetwork(),
+			"azure_dns_server":               resourceAzureDnsServer(),
+			"azure_local_network_connection": resourceAzureLocalNetworkConnection(),
+			"azure_security_group":           resourceAzureSecurityGroup(),
+			"azure_security_group_rule":      resourceAzureSecurityGroupRule(),
 		},
 
 		ConfigureFunc: providerConfigure,

builtin/providers/azure/provider_test.go

@@ -11,6 +11,18 @@ import (
 var testAccProviders map[string]terraform.ResourceProvider
 var testAccProvider *schema.Provider
 
+const testAccSecurityGroupName = "terraform-security-group"
+
+// testAccStorageServiceName is used as the name for the Storage Service
+// created in all storage-related tests.
+// It is much more convenient to provide a Storage Service which
+// has been created beforehand as the creation of one takes a lot
+// and would greatly impede the multitude of tests which rely on one.
+// NOTE: the storage container should be located in `West US`.
+var testAccStorageServiceName = os.Getenv("AZURE_STORAGE")
+
+const testAccStorageContainerName = "terraform-testing-container"
+
 func init() {
 	testAccProvider = Provider().(*schema.Provider)
 	testAccProviders = map[string]terraform.ResourceProvider{

builtin/providers/azure/resource_azure_data_disk.go

@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
+	"github.com/Azure/azure-sdk-for-go/management"
+	"github.com/Azure/azure-sdk-for-go/management/virtualmachinedisk"
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/svanharmelen/azure-sdk-for-go/management"
-	"github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk"
 )
 
 const dataDiskBlobStorageURL = "http://%s.blob.core.windows.net/disks/%s.vhd"
@@ -50,7 +50,7 @@ func resourceAzureDataDisk() *schema.Resource {
 				Default:  "None",
 			},
 
-			"storage": &schema.Schema{
+			"storage_service_name": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -321,7 +321,7 @@ func mediaLink(d *schema.ResourceData) string {
 		name = fmt.Sprintf("%s-%d", d.Get("virtual_machine").(string), d.Get("lun").(int))
 	}
 
-	return fmt.Sprintf(dataDiskBlobStorageURL, d.Get("storage").(string), name.(string))
+	return fmt.Sprintf(dataDiskBlobStorageURL, d.Get("storage_service_name").(string), name.(string))
 }
 
 func verifyDataDiskParameters(d *schema.ResourceData) error {
@@ -332,7 +332,7 @@ func verifyDataDiskParameters(d *schema.ResourceData) error {
 	}
 
 	if _, ok := d.GetOk("media_link"); !ok {
-		if _, ok := d.GetOk("storage"); !ok {
+		if _, ok := d.GetOk("storage_service_name"); !ok {
 			return fmt.Errorf("If not supplying 'media_link', you must supply 'storage'.")
 		}
 	}

builtin/providers/azure/resource_azure_data_disk_test.go

@@ -2,14 +2,13 @@ package azure
 
 import (
 	"fmt"
-	"os"
 	"strconv"
 	"testing"
 
+	"github.com/Azure/azure-sdk-for-go/management"
+	"github.com/Azure/azure-sdk-for-go/management/virtualmachinedisk"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	"github.com/svanharmelen/azure-sdk-for-go/management"
-	"github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk"
 )
 
 func TestAccAzureDataDisk_basic(t *testing.T) {
@@ -174,7 +173,7 @@ resource "azure_instance" "foo" {
     name = "terraform-test"
     image = "Ubuntu Server 14.04 LTS"
     size = "Basic_A1"
-    storage = "%s"
+    storage_service_name = "%s"
     location = "West US"
     username = "terraform"
     password = "Pass!admin123"
@@ -183,16 +182,16 @@ resource "azure_instance" "foo" {
 resource "azure_data_disk" "foo" {
     lun = 0
     size = 10
-    storage = "${azure_instance.foo.storage}"
+    storage_service_name = "${azure_instance.foo.storage_service_name}"
     virtual_machine = "${azure_instance.foo.id}"
-}`, os.Getenv("AZURE_STORAGE"))
+}`, testAccStorageServiceName)
 
 var testAccAzureDataDisk_advanced = fmt.Sprintf(`
 resource "azure_instance" "foo" {
     name = "terraform-test1"
     image = "Ubuntu Server 14.04 LTS"
     size = "Basic_A1"
-    storage = "%s"
+    storage_service_name = "%s"
     location = "West US"
     username = "terraform"
     password = "Pass!admin123"
@@ -202,16 +201,16 @@ resource "azure_data_disk" "foo" {
     lun = 1
     size = 10
     caching = "ReadOnly"
-    storage = "${azure_instance.foo.storage}"
+    storage_service_name = "${azure_instance.foo.storage_service_name}"
     virtual_machine = "${azure_instance.foo.id}"
-}`, os.Getenv("AZURE_STORAGE"))
+}`, testAccStorageServiceName)
 
 var testAccAzureDataDisk_update = fmt.Sprintf(`
 resource "azure_instance" "foo" {
     name = "terraform-test1"
     image = "Ubuntu Server 14.04 LTS"
     size = "Basic_A1"
-    storage = "%s"
+    storage_service_name = "%s"
     location = "West US"
     username = "terraform"
     password = "Pass!admin123"
@@ -221,7 +220,7 @@ resource "azure_instance" "bar" {
     name = "terraform-test2"
     image = "Ubuntu Server 14.04 LTS"
     size = "Basic_A1"
-    storage = "${azure_instance.foo.storage}"
+    storage_service_name = "${azure_instance.foo.storage_service_name}"
     location = "West US"
     username = "terraform"
     password = "Pass!admin123"
@@ -231,6 +230,6 @@ resource "azure_data_disk" "foo" {
     lun = 2
     size = 20
     caching = "ReadWrite"
-    storage = "${azure_instance.bar.storage}"
+    storage_service_name = "${azure_instance.bar.storage_service_name}"
     virtual_machine = "${azure_instance.bar.id}"
-}`, os.Getenv("AZURE_STORAGE"))
+}`, testAccStorageServiceName)