Fix bsu builder

builder/bsu/step_create_omi.go

@@ -29,15 +29,30 @@ func (s *stepCreateOMI) Run(ctx context.Context, state multistep.StateBag) multi
 	ui.Say(fmt.Sprintf("Creating OMI %s from vm %s", omiName, vm.GetVmId()))
 	blockDeviceMapping := config.BlockDevices.BuildOscOMIDevices()
 	createOpts := oscgo.CreateImageRequest{
-		VmId:                vm.VmId,
-		ImageName:           &omiName,
-		BlockDeviceMappings: &blockDeviceMapping,
+		ImageName: &omiName,
 	}
-	if config.OMIDescription != "" {
-		createOpts.Description = &config.OMIDescription
+	if len(blockDeviceMapping) == 0 {
+		createOpts.SetVmId(vm.GetVmId())
+	} else {
+		createOpts.SetBlockDeviceMappings(blockDeviceMapping)
+		if rootDName := config.RootDeviceName; rootDName != "" {
+			createOpts.SetRootDeviceName(rootDName)
+		} else {
+			err := fmt.Errorf("Error: MissingParameter: You must provide 'RootDeviceName' when creating omi with 'omi_block_device_mappings'.")
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	}
+	if prodCode := config.ProductCodes; prodCode != nil {
+		createOpts.SetProductCodes(prodCode)
+	}
+
+	if description := config.OMIDescription; description != "" {
+		createOpts.SetDescription(description)
 	}
-	if config.ProductCodes != nil {
-		createOpts.ProductCodes = &config.ProductCodes
+	if prodCode := config.ProductCodes; prodCode != nil {
+		createOpts.SetProductCodes(prodCode)
 	}
 
 	resp, _, err := oscconn.Api.ImageApi.CreateImage(oscconn.Auth).CreateImageRequest(createOpts).Execute()

builder/bsusurrogate/step_register_omi.go

@@ -153,8 +153,7 @@ func (s *StepRegisterOMI) combineDevices(snapshotIDs map[string]string) []oscgo.
 func copyToDeviceMappingImage(device osc.BlockDeviceMappingVmCreation) oscgo.BlockDeviceMappingImage {
 	log.Printf("Copy device mapping image ")
 	deviceImage := oscgo.BlockDeviceMappingImage{
-		DeviceName:        device.DeviceName,
-		VirtualDeviceName: device.VirtualDeviceName,
+		DeviceName: device.DeviceName,
 		Bsu: &oscgo.BsuToCreate{
 			DeleteOnVmDeletion: device.Bsu.DeleteOnVmDeletion,
 			Iops:               device.Bsu.Iops,

builder/common/block_device.go

@@ -2,8 +2,6 @@ package common
 
 import (
 	"fmt"
-	"log"
-	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
@@ -35,43 +33,39 @@ type LaunchBlockDevices struct {
 	LaunchMappings []BlockDevice `mapstructure:"launch_block_device_mappings"`
 }
 
-func buildOscBlockDevicesImage(b []BlockDevice) []oscgo.BlockDeviceMappingImage {
-	var blockDevices []oscgo.BlockDeviceMappingImage
-
-	for _, blockDevice := range b {
-		mapping := oscgo.BlockDeviceMappingImage{
-			DeviceName: &blockDevice.DeviceName,
-		}
-
-		if blockDevice.VirtualName != "" {
-			if strings.HasPrefix(blockDevice.VirtualName, "ephemeral") {
-				mapping.VirtualDeviceName = &blockDevice.VirtualName
-			}
-		} else {
-			bsu := oscgo.BsuToCreate{
-				DeleteOnVmDeletion: &blockDevice.DeleteOnVmDeletion,
-			}
+func setBsuToCreate(blockDevice BlockDevice) oscgo.BsuToCreate {
+	bsu := oscgo.NewBsuToCreate()
 
-			if blockDevice.VolumeType != "" {
-				bsu.VolumeType = &blockDevice.VolumeType
-			}
+	if deleteOnVmDeletion := blockDevice.DeleteOnVmDeletion; !deleteOnVmDeletion {
+		bsu.SetDeleteOnVmDeletion(deleteOnVmDeletion)
+	}
+	if volType := blockDevice.VolumeType; volType != "" {
+		bsu.SetVolumeType(volType)
+	}
+	if volSize := blockDevice.VolumeSize; volSize > 0 {
+		bsu.SetVolumeSize(int32(blockDevice.VolumeSize))
 
-			if blockDevice.VolumeSize > 0 {
-				bsu.VolumeSize = oscgo.PtrInt32(int32(blockDevice.VolumeSize))
-			}
+	}
+	// IOPS is only valid for io1 type
+	if blockDevice.VolumeType == "io1" {
+		bsu.SetIops(int32(blockDevice.IOPS))
+	}
+	if snapId := blockDevice.SnapshotId; snapId != "" {
+		bsu.SetSnapshotId(snapId)
+	}
 
-			// IOPS is only valid for io1 type
-			if blockDevice.VolumeType == "io1" {
-				bsu.Iops = oscgo.PtrInt32(int32(blockDevice.IOPS))
-			}
+	return *bsu
+}
 
-			if blockDevice.SnapshotId != "" {
-				bsu.SnapshotId = &blockDevice.SnapshotId
-			}
+func buildOscBlockDevicesImage(b []BlockDevice) []oscgo.BlockDeviceMappingImage {
+	var blockDevices []oscgo.BlockDeviceMappingImage
+	for _, blockDevice := range b {
+		mapping := oscgo.BlockDeviceMappingImage{}
 
-			mapping.Bsu = &bsu
+		if deviceName := blockDevice.DeviceName; deviceName != "" {
+			mapping.SetDeviceName(deviceName)
 		}
-
+		mapping.SetBsu(setBsuToCreate(blockDevice))
 		blockDevices = append(blockDevices, mapping)
 	}
 	return blockDevices
@@ -83,41 +77,16 @@ func buildOscBlockDevicesVmCreation(b []BlockDevice) []oscgo.BlockDeviceMappingV
 	var blockDevices []oscgo.BlockDeviceMappingVmCreation
 
 	for _, blockDevice := range b {
-		mapping := oscgo.BlockDeviceMappingVmCreation{
-			DeviceName: &blockDevice.DeviceName,
+		mapping := oscgo.BlockDeviceMappingVmCreation{}
+
+		if deviceName := blockDevice.DeviceName; deviceName != "" {
+			mapping.SetDeviceName(deviceName)
 		}
 
 		if blockDevice.NoDevice {
 			mapping.NoDevice = aws.String("")
-			//blockDevices = mapping[0]
-		} else if blockDevice.VirtualName != "" {
-			if strings.HasPrefix(blockDevice.VirtualName, "ephemeral") {
-				mapping.VirtualDeviceName = &blockDevice.VirtualName
-			}
 		} else {
-			bsu := oscgo.BsuToCreate{
-				DeleteOnVmDeletion: &blockDevice.DeleteOnVmDeletion,
-			}
-
-			if blockDevice.VolumeType != "" {
-				bsu.VolumeType = &blockDevice.VolumeType
-			}
-
-			if blockDevice.VolumeSize > 0 {
-				bsu.VolumeSize = oscgo.PtrInt32(int32(blockDevice.VolumeSize))
-
-			}
-
-			// IOPS is only valid for io1 type
-			if blockDevice.VolumeType == "io1" {
-				bsu.Iops = oscgo.PtrInt32(int32(blockDevice.IOPS))
-			}
-
-			if blockDevice.SnapshotId != "" {
-				bsu.SnapshotId = &blockDevice.SnapshotId
-			}
-
-			mapping.Bsu = &bsu
+			mapping.SetBsu(setBsuToCreate(blockDevice))
 		}
 
 		log.Printf("block device mapping")

builder/common/omi_config.go

@@ -23,6 +23,7 @@ type OMIConfig struct {
 	SnapshotAccountIDs      []string `mapstructure:"snapshot_account_ids"`
 	GlobalPermission        bool     `mapstructure:"global_permission"`
 	ProductCodes            []string `mapstructure:"product_codes"`
+	RootDeviceName          string   `mapstructure:"root_device_name"`
 }
 
 func (c *OMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error {

builder/common/step_update_omi.go

@@ -32,8 +32,8 @@ func (s *StepUpdateOMIAttributes) Run(_ context.Context, state multistep.StateBa
 
 	// Determine if there is any work to do.
 	valid := false
-	valid = valid || (s.AccountIds != nil && len(s.AccountIds) > 0)
-	valid = valid || (s.SnapshotAccountIds != nil && len(s.SnapshotAccountIds) > 0)
+	valid = valid || (len(s.AccountIds) > 0)
+	valid = valid || (len(s.SnapshotAccountIds) > 0)
 	valid = valid || s.GlobalPermission == true
 	if !valid {
 		return multistep.ActionContinue
@@ -74,7 +74,7 @@ func (s *StepUpdateOMIAttributes) Run(_ context.Context, state multistep.StateBa
 		}
 	}
 
-	if s.AccountIds == nil || len(s.AccountIds) == 0 {
+	if len(s.AccountIds) == 0 {
 		return multistep.ActionContinue
 	}