New Resources: azurerm_dev_test_(linux|windows)virtual_machine

azurerm/config.go

@@ -154,6 +154,7 @@ type ArmClient struct {
 
 	// DevTestLabs
 	devTestLabsClient            dtl.LabsClient
+	devTestVirtualMachinesClient dtl.VirtualMachinesClient
 	devTestVirtualNetworksClient dtl.VirtualNetworksClient
 
 	// Databases
@@ -773,6 +774,10 @@ func (c *ArmClient) registerDevTestClients(endpoint, subscriptionId string, auth
 	c.configureClient(&labsClient.Client, auth)
 	c.devTestLabsClient = labsClient
 
+	devTestVirtualMachinesClient := dtl.NewVirtualMachinesClientWithBaseURI(endpoint, subscriptionId)
+	c.configureClient(&devTestVirtualMachinesClient.Client, auth)
+	c.devTestVirtualMachinesClient = devTestVirtualMachinesClient
+
 	devTestVirtualNetworksClient := dtl.NewVirtualNetworksClientWithBaseURI(endpoint, subscriptionId)
 	c.configureClient(&devTestVirtualNetworksClient.Client, auth)
 	c.devTestVirtualNetworksClient = devTestVirtualNetworksClient

azurerm/data_source_dev_test_lab.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -16,7 +16,7 @@ func dataSourceArmDevTestLab() *schema.Resource {
 			"name": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: azure.ValidateDevTestLabName(),
+				ValidateFunc: validate.DevTestLabName(),
 			},
 
 			"location": locationForDataSourceSchema(),

azurerm/helpers/azure/devtest.go

@@ -1,14 +1,144 @@
 package azure
 
 import (
-	"regexp"
-
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-func ValidateDevTestLabName() schema.SchemaValidateFunc {
-	return validation.StringMatch(
-		regexp.MustCompile("^[A-Za-z0-9_-]+$"),
-		"Lab Name can only include alphanumeric characters, underscores, hyphens.")
+func SchemaDevTestVirtualMachineInboundNatRule() *schema.Schema {
+	return &schema.Schema{
+		Type:     schema.TypeSet,
+		Optional: true,
+		// since these aren't returned from the API
+		ForceNew: true,
+		Elem: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"protocol": {
+					Type:     schema.TypeString,
+					Required: true,
+					ValidateFunc: validation.StringInSlice([]string{
+						string(dtl.TCP),
+						string(dtl.UDP),
+					}, false),
+				},
+
+				"backend_port": {
+					Type:         schema.TypeInt,
+					Required:     true,
+					ForceNew:     true,
+					ValidateFunc: validate.PortNumber,
+				},
+
+				"frontend_port": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
+			},
+		},
+	}
+}
+
+func ExpandDevTestLabVirtualMachineNatRules(input *schema.Set) []dtl.InboundNatRule {
+	rules := make([]dtl.InboundNatRule, 0)
+	if input == nil {
+		return rules
+	}
+
+	for _, val := range input.List() {
+		v := val.(map[string]interface{})
+		backendPort := v["backend_port"].(int)
+		protocol := v["protocol"].(string)
+
+		rule := dtl.InboundNatRule{
+			TransportProtocol: dtl.TransportProtocol(protocol),
+			BackendPort:       utils.Int32(int32(backendPort)),
+		}
+
+		rules = append(rules, rule)
+	}
+
+	return rules
+}
+
+func ExpandDevTestLabVirtualMachineGalleryImageReference(input []interface{}, osType string) *dtl.GalleryImageReference {
+	if len(input) == 0 {
+		return nil
+	}
+
+	v := input[0].(map[string]interface{})
+	offer := v["offer"].(string)
+	publisher := v["publisher"].(string)
+	sku := v["sku"].(string)
+	version := v["version"].(string)
+
+	return &dtl.GalleryImageReference{
+		Offer:     utils.String(offer),
+		OsType:    utils.String(osType),
+		Publisher: utils.String(publisher),
+		Sku:       utils.String(sku),
+		Version:   utils.String(version),
+	}
+}
+
+func SchemaDevTestVirtualMachineGalleryImageReference() *schema.Schema {
+	return &schema.Schema{
+		Type:     schema.TypeList,
+		Required: true,
+		MaxItems: 1,
+		Elem: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"offer": {
+					Type:     schema.TypeString,
+					Required: true,
+					ForceNew: true,
+				},
+				"publisher": {
+					Type:     schema.TypeString,
+					Required: true,
+					ForceNew: true,
+				},
+				"sku": {
+					Type:     schema.TypeString,
+					Required: true,
+					ForceNew: true,
+				},
+				"version": {
+					Type:     schema.TypeString,
+					Required: true,
+					ForceNew: true,
+				},
+			},
+		},
+	}
+}
+
+func FlattenDevTestVirtualMachineGalleryImage(input *dtl.GalleryImageReference) []interface{} {
+	results := make([]interface{}, 0)
+
+	if input != nil {
+		output := make(map[string]interface{}, 0)
+
+		if input.Offer != nil {
+			output["offer"] = *input.Offer
+		}
+
+		if input.Publisher != nil {
+			output["publisher"] = *input.Publisher
+		}
+
+		if input.Sku != nil {
+			output["sku"] = *input.Sku
+		}
+
+		if input.Version != nil {
+			output["version"] = *input.Version
+		}
+
+		results = append(results, output)
+	}
+
+	return results
 }

azurerm/helpers/validate/devtest.go

@@ -0,0 +1,23 @@
+package validate
+
+import (
+	"regexp"
+
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
+)
+
+func DevTestLabName() schema.SchemaValidateFunc {
+	return validation.StringMatch(
+		regexp.MustCompile("^[A-Za-z0-9_-]+$"),
+		"Lab Name can only include alphanumeric characters, underscores, hyphens.")
+}
+
+func DevTestVirtualNetworkUsagePermissionType() schema.SchemaValidateFunc {
+	return validation.StringInSlice([]string{
+		string(dtl.Allow),
+		string(dtl.Default),
+		string(dtl.Deny),
+	}, false)
+}

azurerm/helpers/azure/devtest_test.go → azurerm/helpers/validate/devtest_test.go

@@ -1,4 +1,4 @@
-package azure
+package validate
 
 import "testing"
 
@@ -12,7 +12,7 @@ func TestValidateDevTestLabName(t *testing.T) {
 		"double-hyphen--valid",
 	}
 	for _, v := range validNames {
-		_, errors := ValidateDevTestLabName()(v, "example")
+		_, errors := DevTestLabName()(v, "example")
 		if len(errors) != 0 {
 			t.Fatalf("%q should be a valid Dev Test Lab Name: %q", v, errors)
 		}
@@ -23,7 +23,7 @@ func TestValidateDevTestLabName(t *testing.T) {
 		"!@£",
 	}
 	for _, v := range invalidNames {
-		_, errors := ValidateDevTestLabName()(v, "name")
+		_, errors := DevTestLabName()(v, "name")
 		if len(errors) == 0 {
 			t.Fatalf("%q should be an invalid Dev Test Lab Name", v)
 		}

azurerm/provider.go

@@ -161,6 +161,8 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_data_lake_store_file":                    resourceArmDataLakeStoreFile(),
 			"azurerm_data_lake_store_firewall_rule":           resourceArmDataLakeStoreFirewallRule(),
 			"azurerm_dev_test_lab":                            resourceArmDevTestLab(),
+			"azurerm_dev_test_linux_virtual_machine":          resourceArmDevTestLinuxVirtualMachine(),
+			"azurerm_dev_test_windows_virtual_machine":        resourceArmDevTestWindowsVirtualMachine(),
 			"azurerm_dev_test_virtual_network":                resourceArmDevTestVirtualNetwork(),
 			"azurerm_dns_a_record":                            resourceArmDnsARecord(),
 			"azurerm_dns_aaaa_record":                         resourceArmDnsAAAARecord(),

azurerm/resource_arm_dev_test_lab.go

@@ -7,7 +7,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -26,7 +26,7 @@ func resourceArmDevTestLab() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: azure.ValidateDevTestLabName(),
+				ValidateFunc: validate.DevTestLabName(),
 			},
 
 			"location": locationSchema(),