Merge pull request #259 from echuvyrov/managedimagestatefix

[MS] Added default caching value as expected by API - fixing #224
hashicorp · Aug 21, 2017 · 9cdb2a1 · 9cdb2a1
2 parents 1dbc1e7 + 9e668cd
commit 9cdb2a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/azurerm/resource_arm_image.go b/azurerm/resource_arm_image.go
@@ -83,7 +83,7 @@ func resourceArmImage() *schema.Resource {
 						"caching": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
+							Default:  string(compute.None),
 							ValidateFunc: validation.StringInSlice([]string{
 								string(compute.None),
 								string(compute.ReadOnly),
@@ -127,7 +127,7 @@ func resourceArmImage() *schema.Resource {
 						"caching": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
+							Default:  string(compute.None),
 							ValidateFunc: validation.StringInSlice([]string{
 								string(compute.None),
 								string(compute.ReadOnly),
@@ -301,7 +301,7 @@ func flattenAzureRmStorageProfileOsDisk(d *schema.ResourceData, storageProfile *
 			result["managed_disk_id"] = *osDisk.ManagedDisk.ID
 		}
 		result["blob_uri"] = *osDisk.BlobURI
-		result["caching"] = osDisk.Caching
+		result["caching"] = string(osDisk.Caching)
 		if osDisk.DiskSizeGB != nil {
 			result["size_gb"] = *osDisk.DiskSizeGB
 		}