Merge pull request #436 from terraform-providers/image

Data Source / Resource `azurerm_image` - Fixing a crash when blob_uri wasn't specified
hashicorp · Oct 26, 2017 · 15ef3a7 · 15ef3a7
2 parents d2c9208 + 12b48e1
commit 15ef3a7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/azurerm/resource_arm_image.go b/azurerm/resource_arm_image.go
@@ -293,7 +293,9 @@ func flattenAzureRmImageOSDisk(d *schema.ResourceData, osDisk *compute.ImageOSDi
 	result := make(map[string]interface{})
 
 	if disk := osDisk; disk != nil {
-		result["blob_uri"] = *osDisk.BlobURI
+		if osDisk.BlobURI != nil {
+			result["blob_uri"] = *osDisk.BlobURI
+		}
 		result["caching"] = string(osDisk.Caching)
 		if osDisk.DiskSizeGB != nil {
 			result["size_gb"] = *osDisk.DiskSizeGB
@@ -314,7 +316,9 @@ func flattenAzureRmImageDataDisks(d *schema.ResourceData, diskImages *[]compute.
 	if images := diskImages; images != nil {
 		for i, disk := range *images {
 			l := make(map[string]interface{})
-			l["blob_uri"] = disk.BlobURI
+			if disk.BlobURI != nil {
+				l["blob_uri"] = *disk.BlobURI
+			}
 			l["caching"] = string(disk.Caching)
 			if disk.DiskSizeGB != nil {
 				l["size_gb"] = *disk.DiskSizeGB