From 02421bad333d082f2496d6bc0b68dcfc619c2f05 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 19 Jun 2019 12:15:18 +0200 Subject: [PATCH] simplify BlockDevice prepares --- builder/amazon/chroot/block_device.go | 7 ++++--- builder/amazon/ebssurrogate/block_device.go | 10 ---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/builder/amazon/chroot/block_device.go b/builder/amazon/chroot/block_device.go index 442b782b5..3e789d258 100644 --- a/builder/amazon/chroot/block_device.go +++ b/builder/amazon/chroot/block_device.go @@ -44,10 +44,11 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp } func (b *BlockDevice) Prepare(ctx *interpolate.Context) error { - if b.DeviceName == "" { - return fmt.Errorf("The `device_name` must be specified " + - "for every device in the block device mapping.") + err := b.BlockDevice.Prepare(ctx) + if err != nil { + return err } + // Warn that encrypted must be true when setting kms_key_id if b.KmsKeyId != "" && b.Encrypted != nil && *b.Encrypted == false { return fmt.Errorf("The device %v, must also have `encrypted: "+ diff --git a/builder/amazon/ebssurrogate/block_device.go b/builder/amazon/ebssurrogate/block_device.go index 65b576dd5..c09b3508e 100644 --- a/builder/amazon/ebssurrogate/block_device.go +++ b/builder/amazon/ebssurrogate/block_device.go @@ -3,7 +3,6 @@ package ebssurrogate import ( - "fmt" "strings" "github.com/aws/aws-sdk-go/aws" @@ -86,15 +85,6 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp return mapping } -func (b *BlockDevice) Prepare(ctx *interpolate.Context) error { - if b.DeviceName == "" { - return fmt.Errorf("The `device_name` must be specified " + - "for every device in the block device mapping.") - } - - return nil -} - func (bds BlockDevices) Prepare(ctx *interpolate.Context) (errs []error) { for _, block := range bds { if err := block.Prepare(ctx); err != nil {