Skip to content

Commit

Permalink
[azurerm_image] - prevent crash when using data_disk (#3797)
Browse files Browse the repository at this point in the history
* fixes Issue #1656
  • Loading branch information
dedamico authored and katbyte committed Jul 6, 2019
1 parent 13b764f commit d7459a5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions azurerm/resource_arm_image.go
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ func expandAzureRmImageOsDisk(d *schema.ResourceData) (*compute.ImageOSDisk, err
osState := compute.OperatingSystemStateTypes(v)
osDisk.OsState = osState
}

managedDiskID := config["managed_disk_id"].(string)
if managedDiskID != "" {
managedDisk := &compute.SubResource{
Expand Down Expand Up @@ -429,21 +428,22 @@ func expandAzureRmImageDataDisks(d *schema.ResourceData) ([]compute.ImageDataDis
for _, diskConfig := range disks {
config := diskConfig.(map[string]interface{})

managedDiskID := d.Get("managed_disk_id").(string)
blobURI := d.Get("blob_uri").(string)
managedDiskID := config["managed_disk_id"].(string)

blobURI := config["blob_uri"].(string)
lun := int32(config["lun"].(int))

dataDisk := compute.ImageDataDisk{
Lun: &lun,
BlobURI: &blobURI,
}

if size := d.Get("size_gb"); size != 0 {
if size := config["size_gb"]; size != 0 {
diskSize := int32(size.(int))
dataDisk.DiskSizeGB = &diskSize
}

if v := d.Get("caching").(string); v != "" {
if v := config["caching"].(string); v != "" {
caching := compute.CachingTypes(v)
dataDisk.Caching = caching
}
Expand Down

0 comments on commit d7459a5

Please sign in to comment.