diff --git a/builtin/providers/azurerm/import_arm_cdn_profile_test.go b/builtin/providers/azurerm/import_arm_cdn_profile_test.go new file mode 100644 index 000000000..1db618a9e --- /dev/null +++ b/builtin/providers/azurerm/import_arm_cdn_profile_test.go @@ -0,0 +1,33 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMCdnProfile_importWithTags(t *testing.T) { + resourceName := "azurerm_cdn_profile.test" + + ri := acctest.RandInt() + config := fmt.Sprintf(testAccAzureRMCdnProfile_withTags, ri, ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMCdnProfileDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: config, + }, + + resource.TestStep{ + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/builtin/providers/azurerm/resource_arm_cdn_profile.go b/builtin/providers/azurerm/resource_arm_cdn_profile.go index 878394b5e..7ef7909d6 100644 --- a/builtin/providers/azurerm/resource_arm_cdn_profile.go +++ b/builtin/providers/azurerm/resource_arm_cdn_profile.go @@ -17,6 +17,9 @@ func resourceArmCdnProfile() *schema.Resource { Read: resourceArmCdnProfileRead, Update: resourceArmCdnProfileUpdate, Delete: resourceArmCdnProfileDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "name": { @@ -96,7 +99,7 @@ func resourceArmCdnProfileRead(d *schema.ResourceData, meta interface{}) error { return err } resGroup := id.ResourceGroup - name := id.Path["Profiles"] + name := id.Path["profiles"] resp, err := cdnProfilesClient.Get(name, resGroup) if err != nil { @@ -107,6 +110,10 @@ func resourceArmCdnProfileRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error making Read request on Azure CDN Profile %s: %s", name, err) } + d.Set("name", name) + d.Set("resource_group_name", resGroup) + d.Set("location", azureRMNormalizeLocation(*resp.Location)) + if resp.Sku != nil { d.Set("sku", string(resp.Sku.Name)) } @@ -147,7 +154,7 @@ func resourceArmCdnProfileDelete(d *schema.ResourceData, meta interface{}) error return err } resGroup := id.ResourceGroup - name := id.Path["Profiles"] + name := id.Path["profiles"] _, err = cdnProfilesClient.DeleteIfExists(name, resGroup, make(chan struct{}))