From 3389fded480d4470eb9af545626752a75f141998 Mon Sep 17 00:00:00 2001 From: Dany Garcia Date: Thu, 19 Nov 2020 09:29:50 -0800 Subject: [PATCH] merging latest master --- builder/amazon/chroot/step_create_volume.go | 1 + builder/amazon/chroot/step_create_volume_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 0d68bf551..59b6f0507 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/template/interpolate" ) diff --git a/builder/amazon/chroot/step_create_volume_test.go b/builder/amazon/chroot/step_create_volume_test.go index 177cc07b1..787312feb 100644 --- a/builder/amazon/chroot/step_create_volume_test.go +++ b/builder/amazon/chroot/step_create_volume_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - confighelper "github.com/hashicorp/packer/helper/config" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" )