Merge pull request #5224 from lfarnell/code-cleanup

Code Cleanup

builder/alicloud/ecs/step_config_vswitch.go

@@ -113,7 +113,7 @@ func (s *stepConfigAlicloudVSwitch) Run(state multistep.StateBag) multistep.Step
 	}
 	if err := client.WaitForVSwitchAvailable(vpcId, s.VSwitchId, ALICLOUD_DEFAULT_TIMEOUT); err != nil {
 		state.Put("error", err)
-		ui.Error(fmt.Sprintf("Timeout waiting for vswitch to become avaiable: %v", err))
+		ui.Error(fmt.Sprintf("Timeout waiting for vswitch to become available: %v", err))
 		return multistep.ActionHalt
 	}
 	state.Put("vswitchid", vswitchId)

builder/azure/pkcs12/bmp-string_test.go

@@ -63,7 +63,7 @@ func TestBMPString(t *testing.T) {
 
 	// some character outside the BMP should error
 	tst = "\U0001f000 East wind (Mahjong)"
-	str, err = bmpString(tst)
+	_, err = bmpString(tst)
 	if err == nil {
 		t.Errorf("expected '%s' to throw error because the first character is not in the BMP", tst)
 	}

builder/azure/pkcs12/crypto_test.go

@@ -21,7 +21,6 @@ func pbDecrypterFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher
 
 	k := deriveKeyByAlg[algorithmName](params.Salt, password, params.Iterations)
 	iv := deriveIVByAlg[algorithmName](params.Salt, password, params.Iterations)
-	password = nil
 
 	code, err := blockcodeByAlg[algorithmName](k)
 	if err != nil {
@@ -34,7 +33,6 @@ func pbDecrypterFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher
 
 func pbDecrypt(info decryptable, password []byte) (decrypted []byte, err error) {
 	cbc, err := pbDecrypterFor(info.GetAlgorithm(), password)
-	password = nil
 	if err != nil {
 		return nil, err
 	}

builder/azure/pkcs12/pbkdf.go

@@ -113,7 +113,6 @@ func pbkdf(hash func([]byte) []byte, u, v int, salt, password []byte, r int, ID
 		for len(P) < times*v {
 			P = append(P, password...)
 		}
-		password = nil
 		P = P[:times*v]
 	}
 

builder/digitalocean/step_snapshot.go

@@ -85,12 +85,12 @@ func (s *stepSnapshot) Run(state multistep.StateBag) multistep.StepAction {
 			}
 			imageTransfer, _, err := client.ImageActions.Transfer(context.TODO(), images[0].ID, transferRequest)
 			if err != nil {
-				err := fmt.Errorf("Error transfering snapshot: %s", err)
+				err := fmt.Errorf("Error transferring snapshot: %s", err)
 				state.Put("error", err)
 				ui.Error(err.Error())
 				return multistep.ActionHalt
 			}
-			ui.Say(fmt.Sprintf("Transfering Snapshot ID: %d", imageTransfer.ID))
+			ui.Say(fmt.Sprintf("transferring Snapshot ID: %d", imageTransfer.ID))
 			if err := waitForImageState(godo.ActionCompleted, imageTransfer.ID, action.ID,
 				client, 20*time.Minute); err != nil {
 				// If we get an error the first time, actually report it

packer/plugin/plugin_test.go

@@ -2,12 +2,13 @@ package plugin
 
 import (
 	"fmt"
-	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"os/exec"
 	"testing"
 	"time"
+
+	"github.com/hashicorp/packer/packer"
 )
 
 func helperProcess(s ...string) *exec.Cmd {
@@ -48,7 +49,7 @@ func TestHelperProcess(*testing.T) {
 		os.Exit(2)
 	}
 
-	cmd, args := args[0], args[1:]
+	cmd, _ := args[0], args[1:]
 	switch cmd {
 	case "bad-version":
 		fmt.Printf("%s1|tcp|:1234\n", APIVersion)

post-processor/vagrant-cloud/step_release_version.go

@@ -2,9 +2,10 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"strings"
 )
 
 type stepReleaseVersion struct {
@@ -30,7 +31,7 @@ func (s *stepReleaseVersion) Run(state multistep.StateBag) multistep.StepAction
 
 	if err != nil || (resp.StatusCode != 200) {
 		cloudErrors := &VagrantCloudErrors{}
-		err = decodeBody(resp, cloudErrors)
+		_ = decodeBody(resp, cloudErrors)
 		if strings.Contains(cloudErrors.FormatErrors(), "already been released") {
 			ui.Message("Not releasing version, already released")
 			return multistep.ActionContinue

provisioner/powershell/provisioner_test.go

@@ -41,6 +41,9 @@ func TestProvisionerPrepare_extractScript(t *testing.T) {
 	// File contents should contain 2 lines concatenated by newlines: foo\nbar
 	readFile, err := ioutil.ReadFile(file)
 	expectedContents := "foo\nbar\n"
+	if err != nil {
+		t.Fatalf("Should not be error: %s", err)
+	}
 	s := string(readFile[:])
 	if s != expectedContents {
 		t.Fatalf("Expected generated inlineScript to equal '%s', got '%s'", expectedContents, s)

provisioner/puppet-masterless/provisioner_test.go

@@ -200,6 +200,9 @@ func TestProvisionerPrepare_facterFacts(t *testing.T) {
 	delete(config, "facter")
 	p = new(Provisioner)
 	err = p.Prepare(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
 	if p.config.Facter == nil {
 		t.Fatalf("err: Default facts are not set in the Puppet provisioner!")
 	}

provisioner/puppet-server/provisioner_test.go

@@ -1,10 +1,11 @@
 package puppetserver
 
 import (
-	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
+
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
@@ -167,6 +168,9 @@ func TestProvisionerPrepare_facterFacts(t *testing.T) {
 	delete(config, "facter")
 	p = new(Provisioner)
 	err = p.Prepare(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
 	if p.config.Facter == nil {
 		t.Fatalf("err: Default facts are not set in the Puppet provisioner!")
 	}

provisioner/windows-shell/provisioner_test.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"log"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
@@ -34,6 +35,9 @@ func TestProvisionerPrepare_extractScript(t *testing.T) {
 
 	// File contents should contain 2 lines concatenated by newlines: foo\nbar
 	readFile, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Fatalf("Should not be error: %s", err)
+	}
 	expectedContents := "foo\nbar\n"
 	s := string(readFile[:])
 	if s != expectedContents {