apply gofmt

clone/builder.go

@@ -2,11 +2,11 @@ package clone
 
 import (
 	packerCommon "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/helper/communicator"
 )
 
 type Builder struct {

clone/builder_acc_test.go

@@ -2,12 +2,11 @@ package clone
 
 import (
 	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
+	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	commonT "github.com/jetbrains-infra/packer-builder-vsphere/common/testing"
 	"os"
-
-	"github.com/hashicorp/packer/packer"
 	"testing"
-	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 )
 
 func TestCloneBuilderAcc_default(t *testing.T) {

clone/config.go

@@ -3,10 +3,10 @@ package clone
 import (
 	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
-	"github.com/hashicorp/packer/helper/config"
 )
 
 type Config struct {

clone/step_clone.go

@@ -1,12 +1,12 @@
 package clone
 
 import (
+	"context"
+	"fmt"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"fmt"
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
-	"context"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 type CloneConfig struct {

common/config_ssh.go

@@ -2,12 +2,11 @@ package common
 
 import (
 	"fmt"
-	"io/ioutil"
-
 	packerssh "github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"golang.org/x/crypto/ssh"
-	"github.com/hashicorp/packer/helper/communicator"
+	"io/ioutil"
 )
 
 func CommHost(state multistep.StateBag) (string, error) {

common/step_config_params.go

@@ -1,11 +1,11 @@
 package common
 
 import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"fmt"
-	"context"
 )
 
 type ConfigParamsConfig struct {

common/step_connect.go

@@ -1,10 +1,10 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
-	"fmt"
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"context"
+	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 type ConnectConfig struct {

common/step_hardware.go

@@ -1,11 +1,11 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/packer"
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"context"
 	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 type HardwareConfig struct {

common/step_run.go

@@ -1,11 +1,11 @@
 package common
 
 import (
+	"context"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"strings"
-	"context"
 )
 
 type RunConfig struct {

common/step_shutdown.go

@@ -1,14 +1,14 @@
 package common
 
 import (
+	"bytes"
+	"context"
+	"fmt"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"fmt"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"log"
 	"time"
-	"bytes"
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"context"
 )
 
 type ShutdownConfig struct {

common/step_snapshot.go

@@ -1,10 +1,10 @@
 package common
 
 import (
+	"context"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"context"
 )
 
 type StepCreateSnapshot struct {

common/step_template.go

@@ -1,10 +1,10 @@
 package common
 
 import (
+	"context"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"context"
 )
 
 type StepConvertToTemplate struct {

common/step_wait_for_ip.go

@@ -1,12 +1,12 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"context"
 	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"time"
-	"context"
 )
 
 type StepWaitForIp struct{}

common/testing/utility.go

@@ -1,14 +1,14 @@
 package testing
 
 import (
-	"fmt"
-	"math/rand"
-	"time"
 	"encoding/json"
+	"fmt"
 	"github.com/hashicorp/packer/packer"
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"testing"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
+	"math/rand"
+	"testing"
+	"time"
 )
 
 func NewVMName() string {
@@ -32,7 +32,6 @@ func RenderConfig(config map[string]interface{}) string {
 	return string(j)
 }
 
-
 func TestConn(t *testing.T) *driver.Driver {
 	d, err := driver.NewDriver(&driver.ConnectConfig{
 		VCenterServer:      "vcenter.vsphere65.test",
@@ -57,4 +56,3 @@ func GetVM(t *testing.T, d *driver.Driver, artifacts []packer.Artifact) *driver.
 
 	return vm
 }
-

driver/datastore.go

@@ -1,11 +1,11 @@
 package driver
 
 import (
+	"fmt"
 	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
-	"fmt"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 type Datastore struct {

driver/driver.go

@@ -1,16 +1,16 @@
 package driver
 
 import (
+	"context"
+	"fmt"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/find"
-	"context"
-	"net/url"
-	"fmt"
 	"github.com/vmware/govmomi/object"
-	"time"
 	"github.com/vmware/govmomi/session"
-	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+	"net/url"
+	"time"
 )
 
 type Driver struct {

driver/driver_test.go

@@ -2,10 +2,10 @@ package driver
 
 import (
 	"fmt"
+	"math/rand"
 	"os"
 	"testing"
 	"time"
-	"math/rand"
 )
 
 // Defines whether acceptance tests should be run

driver/folder.go

@@ -1,10 +1,10 @@
 package driver
 
 import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/mo"
 	"fmt"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 type Folder struct {

driver/host.go

@@ -2,8 +2,8 @@ package driver
 
 import (
 	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 type Host struct {

driver/resource_pool.go

@@ -1,10 +1,10 @@
 package driver
 
 import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/mo"
 	"fmt"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 type ResourcePool struct {

driver/vm.go

@@ -1,14 +1,14 @@
 package driver
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"time"
 	"strings"
-	"context"
+	"time"
 )
 
 type VirtualMachine struct {

driver/vm_cdrom.go

@@ -1,8 +1,8 @@
 package driver
 
 import (
-	"github.com/vmware/govmomi/vim25/types"
 	"errors"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 func (vm *VirtualMachine) AddSATAController() error {

driver/vm_clone_acc_test.go

@@ -1,11 +1,11 @@
 package driver
 
 import (
+	"context"
 	"log"
 	"net"
 	"testing"
 	"time"
-	"context"
 )
 
 func TestVMAcc_clone(t *testing.T) {

driver/vm_keyboard.go

@@ -1,11 +1,11 @@
 package driver
 
 import (
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+	"golang.org/x/mobile/event/key"
 	"strings"
 	"unicode"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/methods"
-	"golang.org/x/mobile/event/key"
 )
 
 type KeyInput struct {

examples/driver/main.go

@@ -1,13 +1,12 @@
 package main
 
 import (
-	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"fmt"
-	"context"
+	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 func main() {
-	d, err := driver.NewDriver(context.TODO(), &driver.ConnectConfig{
+	d, err := driver.NewDriver(&driver.ConnectConfig{
 		VCenterServer:      "vcenter.vsphere65.test",
 		Username:           "root",
 		Password:           "jetbrains",

iso/builder.go

@@ -2,11 +2,11 @@ package iso
 
 import (
 	packerCommon "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/helper/communicator"
 )
 
 type Builder struct {

iso/config.go

@@ -3,10 +3,10 @@ package iso
 import (
 	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
-	"github.com/hashicorp/packer/helper/config"
 )
 
 type Config struct {

iso/step_add_cdrom.go

@@ -1,11 +1,11 @@
 package iso
 
 import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"fmt"
-	"context"
 )
 
 type CDRomConfig struct {
@@ -20,7 +20,7 @@ type StepAddCDRom struct {
 func (c *CDRomConfig) Prepare() []error {
 	var errs []error
 
-	if (c.CdromType != "" && c.CdromType != "ide" && c.CdromType != "sata") {
+	if c.CdromType != "" && c.CdromType != "ide" && c.CdromType != "sata" {
 		errs = append(errs, fmt.Errorf("'cdrom_type' must be 'ide' or 'sata'"))
 	}
 

iso/step_add_floppy.go

@@ -1,11 +1,11 @@
 package iso
 
 import (
+	"context"
+	"fmt"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"fmt"
-	"context"
 )
 
 type FloppyConfig struct {

iso/step_boot_command.go

@@ -1,18 +1,18 @@
 package iso
 
 import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"fmt"
-	"time"
-	"strings"
 	"golang.org/x/mobile/event/key"
-	"unicode/utf8"
-	"github.com/hashicorp/packer/common"
-	"os"
 	"log"
-	"context"
+	"os"
+	"strings"
+	"time"
+	"unicode/utf8"
 )
 
 type BootConfig struct {

iso/step_create.go

@@ -1,12 +1,12 @@
 package iso
 
 import (
+	"context"
 	"fmt"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"context"
 )
 
 type CreateConfig struct {
@@ -34,7 +34,7 @@ func (c *CreateConfig) Prepare() []error {
 		c.GuestOSType = "otherGuest"
 	}
 
-	if (c.Firmware != "" && c.Firmware != "bios" && c.Firmware != "efi") {
+	if c.Firmware != "" && c.Firmware != "bios" && c.Firmware != "efi" {
 		errs = append(errs, fmt.Errorf("'firmware' must be 'bios' or 'efi'"))
 	}
 

iso/step_remove_cdrom.go

@@ -1,10 +1,10 @@
 package iso
 
 import (
+	"context"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
-	"context"
 )
 
 type StepRemoveCDRom struct{}

iso/step_remove_floppy.go

@@ -1,11 +1,11 @@
 package iso
 
 import (
+	"context"
+	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/vmware/govmomi/vim25/types"
-	"context"
 )
 
 type StepRemoveFloppy struct {