fix panic that occurs when ami_block_device_mappings and does not explicitly contain the root volume

9 years ago · 5f92de6a39
parent 9bc0e17e1c
commit 5f92de6a39
1 changed files with 2 additions and 1 deletions
--- a/builder/amazon/ebssurrogate/step_register_ami.go
+++ b/builder/amazon/ebssurrogate/step_register_ami.go
@ -25,7 +25,8 @@ func (s *StepRegisterAMI) Run(state multistep.StateBag) multistep.StepAction {

 	ui.Say("Registering the AMI...")

-	blockDevicesExcludingRoot := make([]*ec2.BlockDeviceMapping, 0, len(s.BlockDevices)-1)
+	// Defensive coding to make sure we only add the root volume once
+	blockDevicesExcludingRoot := make([]*ec2.BlockDeviceMapping, 0, len(s.BlockDevices))
 	for _, blockDevice := range s.BlockDevices {
 		if *blockDevice.DeviceName == s.RootDevice.SourceDeviceName {
 			continue