Merge pull request #3943 from mitchellh/gofmt

gofmt project.

Makefile

@@ -53,7 +53,7 @@ fmt-examples:
 # source files.
 generate: deps ## Generate dynamically generated code
 	go generate .
-	go fmt command/plugin.go
+	gofmt -w command/plugin.go
 
 test: deps ## Run unit tests
 	@go test $(TEST) $(TESTARGS) -timeout=2m

builder/googlecompute/image_test.go

@@ -1,8 +1,8 @@
 package googlecompute
 
-import(
+import (
-	"testing"
 	"fmt"
+	"testing"
 
 	"github.com/stretchr/testify/assert"
 )

builder/googlecompute/step_teardown_instance.go

@@ -71,8 +71,8 @@ func (s *StepTeardownInstance) Cleanup(state multistep.StateBag) {
 	if err != nil {
 		ui.Error(fmt.Sprintf(
 			"Error deleting disk. Please delete it manually.\n\n"+
-				"DiskName: %s\n" +
+				"DiskName: %s\n"+
-				"Zone: %s\n" +
+				"Zone: %s\n"+
 				"Error: %s", config.DiskName, config.Zone, err))
 	}
 

builder/googlecompute/step_wait_instance_startup_test.go

@@ -2,8 +2,8 @@ package googlecompute
 
 import (
 	"github.com/mitchellh/multistep"
-	"testing"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestStepWaitInstanceStartup(t *testing.T) {

builder/vmware/common/vmx.go

@@ -46,13 +46,13 @@ func EncodeVMX(contents map[string]string) string {
 	// a list of VMX key fragments that the value must not be quoted
 	// fragments are used to cover multliples (i.e. multiple disks)
 	// keys are still lowercase at this point, use lower fragments
-	noQuotes := []string {
+	noQuotes := []string{
 		".virtualssd",
 	}
 
 	// a list of VMX key fragments that are case sensitive
 	// fragments are used to cover multliples (i.e. multiple disks)
-	caseSensitive := []string {
+	caseSensitive := []string{
 		".virtualSSD",
 	}
 
@@ -63,7 +63,7 @@ func EncodeVMX(contents map[string]string) string {
 		for _, q := range noQuotes {
 			if strings.Contains(k, q) {
 				pat = "%s = %s\n"
-				break;
+				break
 			}
 		}
 		key := k

command/plugin.go

@@ -15,50 +15,49 @@ import (
 
 	amazonchrootbuilder "github.com/mitchellh/packer/builder/amazon/chroot"
 	amazonebsbuilder "github.com/mitchellh/packer/builder/amazon/ebs"
-	amazonimportpostprocessor "github.com/mitchellh/packer/post-processor/amazon-import"
 	amazoninstancebuilder "github.com/mitchellh/packer/builder/amazon/instance"
-	ansiblelocalprovisioner "github.com/mitchellh/packer/provisioner/ansible-local"
-	ansibleprovisioner "github.com/mitchellh/packer/provisioner/ansible"
-	artificepostprocessor "github.com/mitchellh/packer/post-processor/artifice"
-	atlaspostprocessor "github.com/mitchellh/packer/post-processor/atlas"
 	azurearmbuilder "github.com/mitchellh/packer/builder/azure/arm"
-	checksumpostprocessor "github.com/mitchellh/packer/post-processor/checksum"
-	chefclientprovisioner "github.com/mitchellh/packer/provisioner/chef-client"
-	chefsoloprovisioner "github.com/mitchellh/packer/provisioner/chef-solo"
-	compresspostprocessor "github.com/mitchellh/packer/post-processor/compress"
 	digitaloceanbuilder "github.com/mitchellh/packer/builder/digitalocean"
 	dockerbuilder "github.com/mitchellh/packer/builder/docker"
-	dockerimportpostprocessor "github.com/mitchellh/packer/post-processor/docker-import"
-	dockerpushpostprocessor "github.com/mitchellh/packer/post-processor/docker-push"
-	dockersavepostprocessor "github.com/mitchellh/packer/post-processor/docker-save"
-	dockertagpostprocessor "github.com/mitchellh/packer/post-processor/docker-tag"
 	filebuilder "github.com/mitchellh/packer/builder/file"
-	fileprovisioner "github.com/mitchellh/packer/provisioner/file"
 	googlecomputebuilder "github.com/mitchellh/packer/builder/googlecompute"
-	googlecomputeexportpostprocessor "github.com/mitchellh/packer/post-processor/googlecompute-export"
-	manifestpostprocessor "github.com/mitchellh/packer/post-processor/manifest"
 	nullbuilder "github.com/mitchellh/packer/builder/null"
 	openstackbuilder "github.com/mitchellh/packer/builder/openstack"
 	parallelsisobuilder "github.com/mitchellh/packer/builder/parallels/iso"
 	parallelspvmbuilder "github.com/mitchellh/packer/builder/parallels/pvm"
-	powershellprovisioner "github.com/mitchellh/packer/provisioner/powershell"
-	puppetmasterlessprovisioner "github.com/mitchellh/packer/provisioner/puppet-masterless"
-	puppetserverprovisioner "github.com/mitchellh/packer/provisioner/puppet-server"
 	qemubuilder "github.com/mitchellh/packer/builder/qemu"
-	saltmasterlessprovisioner "github.com/mitchellh/packer/provisioner/salt-masterless"
-	shelllocalpostprocessor "github.com/mitchellh/packer/post-processor/shell-local"
-	shelllocalprovisioner "github.com/mitchellh/packer/provisioner/shell-local"
-	shellprovisioner "github.com/mitchellh/packer/provisioner/shell"
-	vagrantcloudpostprocessor "github.com/mitchellh/packer/post-processor/vagrant-cloud"
-	vagrantpostprocessor "github.com/mitchellh/packer/post-processor/vagrant"
 	virtualboxisobuilder "github.com/mitchellh/packer/builder/virtualbox/iso"
 	virtualboxovfbuilder "github.com/mitchellh/packer/builder/virtualbox/ovf"
 	vmwareisobuilder "github.com/mitchellh/packer/builder/vmware/iso"
 	vmwarevmxbuilder "github.com/mitchellh/packer/builder/vmware/vmx"
+	amazonimportpostprocessor "github.com/mitchellh/packer/post-processor/amazon-import"
+	artificepostprocessor "github.com/mitchellh/packer/post-processor/artifice"
+	atlaspostprocessor "github.com/mitchellh/packer/post-processor/atlas"
+	checksumpostprocessor "github.com/mitchellh/packer/post-processor/checksum"
+	compresspostprocessor "github.com/mitchellh/packer/post-processor/compress"
+	dockerimportpostprocessor "github.com/mitchellh/packer/post-processor/docker-import"
+	dockerpushpostprocessor "github.com/mitchellh/packer/post-processor/docker-push"
+	dockersavepostprocessor "github.com/mitchellh/packer/post-processor/docker-save"
+	dockertagpostprocessor "github.com/mitchellh/packer/post-processor/docker-tag"
+	googlecomputeexportpostprocessor "github.com/mitchellh/packer/post-processor/googlecompute-export"
+	manifestpostprocessor "github.com/mitchellh/packer/post-processor/manifest"
+	shelllocalpostprocessor "github.com/mitchellh/packer/post-processor/shell-local"
+	vagrantpostprocessor "github.com/mitchellh/packer/post-processor/vagrant"
+	vagrantcloudpostprocessor "github.com/mitchellh/packer/post-processor/vagrant-cloud"
 	vspherepostprocessor "github.com/mitchellh/packer/post-processor/vsphere"
+	ansibleprovisioner "github.com/mitchellh/packer/provisioner/ansible"
+	ansiblelocalprovisioner "github.com/mitchellh/packer/provisioner/ansible-local"
+	chefclientprovisioner "github.com/mitchellh/packer/provisioner/chef-client"
+	chefsoloprovisioner "github.com/mitchellh/packer/provisioner/chef-solo"
+	fileprovisioner "github.com/mitchellh/packer/provisioner/file"
+	powershellprovisioner "github.com/mitchellh/packer/provisioner/powershell"
+	puppetmasterlessprovisioner "github.com/mitchellh/packer/provisioner/puppet-masterless"
+	puppetserverprovisioner "github.com/mitchellh/packer/provisioner/puppet-server"
+	saltmasterlessprovisioner "github.com/mitchellh/packer/provisioner/salt-masterless"
+	shellprovisioner "github.com/mitchellh/packer/provisioner/shell"
+	shelllocalprovisioner "github.com/mitchellh/packer/provisioner/shell-local"
 	windowsrestartprovisioner "github.com/mitchellh/packer/provisioner/windows-restart"
 	windowsshellprovisioner "github.com/mitchellh/packer/provisioner/windows-shell"
-
 )
 
 type PluginCommand struct {
@@ -85,7 +84,6 @@ var Builders = map[string]packer.Builder{
 	"vmware-vmx":      new(vmwarevmxbuilder.Builder),
 }
 
-
 var Provisioners = map[string]packer.Provisioner{
 	"ansible":           new(ansibleprovisioner.Provisioner),
 	"ansible-local":     new(ansiblelocalprovisioner.Provisioner),
@@ -102,7 +100,6 @@ var Provisioners = map[string]packer.Provisioner{
 	"windows-shell":     new(windowsshellprovisioner.Provisioner),
 }
 
-
 var PostProcessors = map[string]packer.PostProcessor{
 	"amazon-import":        new(amazonimportpostprocessor.PostProcessor),
 	"artifice":             new(artificepostprocessor.PostProcessor),
@@ -121,7 +118,6 @@ var PostProcessors = map[string]packer.PostProcessor{
 	"vsphere":              new(vspherepostprocessor.PostProcessor),
 }
 
-
 var pluginRegexp = regexp.MustCompile("packer-(builder|post-processor|provisioner)-(.+)")
 
 func (c *PluginCommand) Run(args []string) int {

communicator/none/communicator_test.go

@@ -13,4 +13,3 @@ func TestCommIsCommunicator(t *testing.T) {
 		t.Fatalf("comm must be a communicator")
 	}
 }
-

provisioner/shell/provisioner_test.go

@@ -4,9 +4,9 @@ import (
 	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
 	"os"
-	"testing"
-	"strings"
 	"regexp"
+	"strings"
+	"testing"
 )
 
 func testConfig() map[string]interface{} {
@@ -306,7 +306,7 @@ func TestProvisioner_RemotePathSetViaRemotePathAndRemoteFile(t *testing.T) {
 		t.Fatalf("should not have error: %s", err)
 	}
 
-	if p.config.RemotePath != expectedRemoteFolder + "/" + expectedRemoteFile {
+	if p.config.RemotePath != expectedRemoteFolder+"/"+expectedRemoteFile {
 		t.Fatalf("remote path does not contain remote_file")
 	}
 }