fix imports

`find . -type f -name '*.go' -not -path "./vendor/*" -exec goimports -w {} \;`

builder/alicloud/ecs/step_attach_keypair.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"time"
@@ -9,7 +10,6 @@ import (
 	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"time"
 )
 
 type stepAttachKeyPar struct {

builder/alicloud/ecs/step_check_source_image.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_config_eip.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_config_key_pair.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"

builder/alicloud/ecs/step_config_public_ip.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/ecs"

builder/alicloud/ecs/step_config_security_group.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/alicloud/ecs/step_config_vpc.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/alicloud/ecs/step_config_vswitch.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/alicloud/ecs/step_create_image.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_create_instance.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"log"

builder/alicloud/ecs/step_delete_images_snapshots.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 	"log"
 

builder/alicloud/ecs/step_mount_disk.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/ecs"

builder/alicloud/ecs/step_pre_validate.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_region_copy_image.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_run_instance.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/ecs"

builder/alicloud/ecs/step_share_image.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/common"

builder/alicloud/ecs/step_stop_instance.go

@@ -1,6 +1,7 @@
 package ecs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/denverdino/aliyungo/ecs"

builder/amazon/chroot/step_attach_volume.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"

builder/amazon/chroot/step_check_root_device.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"

builder/amazon/chroot/step_chroot_provision.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"log"
 
 	"github.com/hashicorp/packer/helper/multistep"

builder/amazon/chroot/step_copy_files.go

@@ -2,14 +2,13 @@ package chroot
 
 import (
 	"bytes"
+	"context"
 	"fmt"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
 	"log"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/mitchellh/multistep"
 )
 
 // StepCopyFiles copies some files from the host into the chroot environment.

builder/amazon/chroot/step_create_volume.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
 	"log"
 

builder/amazon/chroot/step_early_cleanup.go

@@ -1,10 +1,12 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
+	"log"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"log"
 )
 
 // StepEarlyCleanup performs some of the cleanup steps early in order to

builder/amazon/chroot/step_early_unflock.go

@@ -1,10 +1,12 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
+	"log"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"log"
 )
 
 // StepEarlyUnflock unlocks the flock.

builder/amazon/chroot/step_flock.go

@@ -1,15 +1,14 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/mitchellh/multistep"
 )
 
 // StepFlock provisions the instance within a chroot.

builder/amazon/chroot/step_instance_info.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
 	"log"
 

builder/amazon/chroot/step_mount_device.go

@@ -2,6 +2,7 @@ package chroot
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"log"
 	"os"

builder/amazon/chroot/step_mount_extra.go

@@ -2,15 +2,14 @@ package chroot
 
 import (
 	"bytes"
+	"context"
 	"fmt"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
 	"os"
 	"os/exec"
 	"syscall"
 
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/mitchellh/multistep"
 )
 
 // StepMountExtra mounts the attached device.

builder/amazon/chroot/step_post_mount_commands.go

@@ -1,6 +1,8 @@
 package chroot
 
 import (
+	"context"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )

builder/amazon/chroot/step_pre_mount_commands.go

@@ -1,6 +1,8 @@
 package chroot
 
 import (
+	"context"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )

builder/amazon/chroot/step_prepare_device.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"

builder/amazon/chroot/step_register_ami.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/chroot/step_snapshot.go

@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/amazon/common/step_ami_region_copy.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"sync"
 

builder/amazon/common/step_create_tags.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/common/step_deregister_ami.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/common/step_encrypted_ami.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"log"
 

builder/amazon/common/step_get_password.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/base64"

builder/amazon/common/step_key_pair.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"

builder/amazon/common/step_modify_ami_attributes.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/common/step_modify_ebs_instance.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/common/step_pre_validate.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/common/step_run_spot_instance.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 	"io/ioutil"

builder/amazon/common/step_security_group.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"time"

builder/amazon/common/step_source_ami_info.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"sort"

builder/amazon/common/step_stop_ebs_instance.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"

builder/amazon/ebs/step_cleanup_volumes.go

@@ -1,6 +1,7 @@
 package ebs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/ebs/step_create_ami.go

@@ -1,6 +1,7 @@
 package ebs
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"

builder/amazon/ebssurrogate/step_register_ami.go

@@ -1,6 +1,7 @@
 package ebssurrogate
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/ebssurrogate/step_snapshot_new_root.go

@@ -1,6 +1,7 @@
 package ebssurrogate
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/amazon/ebsvolume/step_tag_ebs_volumes.go

@@ -1,6 +1,7 @@
 package ebsvolume
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"

builder/amazon/instance/step_bundle_volume.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"

builder/amazon/instance/step_register_ami.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"

builder/amazon/instance/step_upload_bundle.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/helper/multistep"

builder/amazon/instance/step_upload_x509_cert.go

@@ -1,10 +1,12 @@
 package instance
 
 import (
+	"context"
 	"fmt"
+	"os"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"os"
 )
 
 type StepUploadX509Cert struct{}

builder/azure/arm/step_capture_image.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"

builder/azure/arm/step_create_resource_group.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 

builder/azure/arm/step_delete_os_disk.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/url"

builder/azure/arm/step_delete_resource_group.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/Azure/go-autorest/autorest"

builder/azure/arm/step_deploy_template.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/url"

builder/azure/arm/step_get_certificate.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 	"time"
 

builder/azure/arm/step_get_ip_address.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"

builder/azure/arm/step_get_os_disk.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"

builder/azure/arm/step_power_off_compute.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common"

builder/azure/arm/step_set_certificate.go

@@ -1,6 +1,8 @@
 package arm
 
 import (
+	"context"
+
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"

builder/azure/arm/step_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/helper/multistep"
-	"testing"
 )
 
 func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) {

builder/azure/arm/step_validate_template.go

@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"

builder/azure/common/lin/step_create_cert.go

@@ -1,6 +1,7 @@
 package lin
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha1"

builder/azure/common/lin/step_generalize_os.go

@@ -2,10 +2,12 @@ package lin
 
 import (
 	"bytes"
+	"context"
 	"fmt"
+	"log"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"log"
 )
 
 type StepGeneralizeOS struct {

builder/cloudstack/step_configure_networking.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"strings"

builder/cloudstack/step_create_instance.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"encoding/base64"
 	"errors"
 	"fmt"

builder/cloudstack/step_create_security_group.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/common/uuid"

builder/cloudstack/step_create_template.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 	"time"
 

builder/cloudstack/step_keypair.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"

builder/cloudstack/step_prepare_config.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"regexp"

builder/cloudstack/step_shutdown_instance.go

@@ -1,6 +1,7 @@
 package cloudstack
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/helper/multistep"

builder/docker/step_commit.go

@@ -1,7 +1,9 @@
 package docker
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )

builder/docker/step_commit_test.go

@@ -2,10 +2,9 @@ package docker
 
 import (
 	"errors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func testStepCommitState(t *testing.T) multistep.StateBag {

builder/docker/step_connect_docker.go

@@ -1,12 +1,12 @@
 package docker
 
 import (
+	"context"
 	"fmt"
-	"github.com/hashicorp/packer/helper/multistep"
 	"os/exec"
 	"strings"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 type StepConnectDocker struct{}

builder/docker/step_export.go

@@ -1,6 +1,7 @@
 package docker
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"

builder/docker/step_export_test.go

@@ -3,12 +3,11 @@ package docker
 import (
 	"bytes"
 	"errors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"io/ioutil"
 	"os"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func testStepExportState(t *testing.T) multistep.StateBag {

builder/docker/step_pull.go

@@ -1,6 +1,7 @@
 package docker
 
 import (
+	"context"
 	"fmt"
 	"log"
 

builder/docker/step_pull_test.go

@@ -2,10 +2,9 @@ package docker
 
 import (
 	"errors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func TestStepPull_impl(t *testing.T) {

builder/docker/step_run.go

@@ -1,7 +1,9 @@
 package docker
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )

builder/docker/step_run_test.go

@@ -1,11 +1,11 @@
 package docker
 
 import (
+	"context"
 	"errors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func testStepRunState(t *testing.T) multistep.StateBag {

builder/docker/step_temp_dir.go

@@ -1,14 +1,13 @@
 package docker
 
 import (
+	"context"
 	"fmt"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/mitchellh/multistep"
 )
 
 // StepTempDir creates a temporary directory that we use in order to

builder/docker/step_test.go

@@ -2,9 +2,10 @@ package docker
 
 import (
 	"bytes"
+	"testing"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"testing"
 )
 
 func testState(t *testing.T) multistep.StateBag {

builder/googlecompute/step_check_existing_image.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/packer/helper/multistep"

builder/googlecompute/step_check_existing_image_test.go

@@ -1,10 +1,9 @@
 package googlecompute
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func TestStepCheckExistingImage_impl(t *testing.T) {

builder/googlecompute/step_create_image.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/googlecompute/step_create_instance.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"

builder/googlecompute/step_create_ssh_key.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"

builder/googlecompute/step_create_windows_password.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"

builder/googlecompute/step_instance_info.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/googlecompute/step_instance_info_test.go

@@ -2,11 +2,10 @@ package googlecompute
 
 import (
 	"errors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 	"time"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func TestStepInstanceInfo_impl(t *testing.T) {

builder/googlecompute/step_teardown_instance.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"

builder/googlecompute/step_teardown_instance_test.go

@@ -1,10 +1,9 @@
 package googlecompute
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
 
-	"github.com/mitchellh/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func TestStepTeardownInstance_impl(t *testing.T) {

builder/googlecompute/step_wait_startup_script.go

@@ -1,6 +1,7 @@
 package googlecompute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 

builder/googlecompute/step_wait_startup_script_test.go

@@ -1,6 +1,8 @@
 package googlecompute
 
 import (
+	"testing"
+
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/stretchr/testify/assert"
 )

builder/hyperv/common/step_clone_vm.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"path/filepath"