[MS] Adding support for Image Resources and Custom Images with Managed Disks

azurerm/config.go

@@ -49,6 +49,7 @@ type ArmClient struct {
 	vmScaleSetClient       compute.VirtualMachineScaleSetsClient
 	vmImageClient          compute.VirtualMachineImagesClient
 	vmClient               compute.VirtualMachinesClient
+	imageClient            compute.ImagesClient
 
 	diskClient disk.DisksClient
 
@@ -260,6 +261,12 @@ func (c *Config) getArmClient() (*ArmClient, error) {
 	dkc.Sender = autorest.CreateSender(withRequestLogging())
 	client.diskClient = dkc
 
+	img := compute.NewImagesClientWithBaseURI(endpoint, c.SubscriptionID)
+	setUserAgent(&img.Client)
+	img.Authorizer = auth
+	img.Sender = autorest.CreateSender(withRequestLogging())
+	client.imageClient = img
+
 	ehc := eventhub.NewEventHubsClientWithBaseURI(endpoint, c.SubscriptionID)
 	setUserAgent(&ehc.Client)
 	ehc.Authorizer = auth

azurerm/import_arm_image_test.go

@@ -0,0 +1,48 @@
+package azurerm
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAzureRMImage_importStandalone(t *testing.T) {
+	ri := acctest.RandInt()
+	userName := "testadmin"
+	password := "Password1234s!"
+	hostName := fmt.Sprintf("tftestcustomimagesrc%[1]d", ri)
+	sshPort := "22"
+	preConfig := testAccAzureRMImage_standaloneImage_setup(ri, userName, password, hostName)
+	postConfig := testAccAzureRMImage_standaloneImage_provision(ri, userName, password, hostName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMImageDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				//need to create a vm and then reference it in the image creation
+				Config:  preConfig,
+				Destroy: false,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureVMExists("azurerm_virtual_machine.testsource", true),
+					testGeneralizeVMImage(fmt.Sprintf("acctestRG-%[1]d", ri), "testsource",
+						userName, password, hostName, sshPort),
+				),
+			},
+			resource.TestStep{
+				Config: postConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMImageExists("azurerm_image.test", true),
+				),
+			},
+			resource.TestStep{
+				ResourceName:      "azurerm_image.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/provider.go

@@ -90,6 +90,7 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_lb_rule":                 resourceArmLoadBalancerRule(),
 
 			"azurerm_managed_disk": resourceArmManagedDisk(),
+			"azurerm_image":        resourceArmImage(),
 
 			"azurerm_key_vault":                 resourceArmKeyVault(),
 			"azurerm_local_network_gateway":     resourceArmLocalNetworkGateway(),