From d9a5b694036c20c11f98e444611c966752356687 Mon Sep 17 00:00:00 2001 From: Luke Farnell Date: Mon, 7 Aug 2017 13:20:01 -0400 Subject: [PATCH 1/2] clean up ineffectual assignments --- builder/azure/pkcs12/bmp-string_test.go | 2 +- builder/azure/pkcs12/crypto_test.go | 2 -- builder/azure/pkcs12/pbkdf.go | 1 - packer/plugin/plugin_test.go | 5 +++-- post-processor/vagrant-cloud/step_release_version.go | 5 +++-- provisioner/powershell/provisioner_test.go | 3 +++ provisioner/puppet-masterless/provisioner_test.go | 3 +++ provisioner/puppet-server/provisioner_test.go | 6 +++++- provisioner/windows-shell/provisioner_test.go | 6 +++++- 9 files changed, 23 insertions(+), 10 deletions(-) diff --git a/builder/azure/pkcs12/bmp-string_test.go b/builder/azure/pkcs12/bmp-string_test.go index 8d4599e91..7b861c3e8 100644 --- a/builder/azure/pkcs12/bmp-string_test.go +++ b/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) } diff --git a/builder/azure/pkcs12/crypto_test.go b/builder/azure/pkcs12/crypto_test.go index fb7f8484d..46cbc21cd 100644 --- a/builder/azure/pkcs12/crypto_test.go +++ b/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 } diff --git a/builder/azure/pkcs12/pbkdf.go b/builder/azure/pkcs12/pbkdf.go index 29685723f..ea789566b 100644 --- a/builder/azure/pkcs12/pbkdf.go +++ b/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] } diff --git a/packer/plugin/plugin_test.go b/packer/plugin/plugin_test.go index d35e7bb7b..d5867148b 100644 --- a/packer/plugin/plugin_test.go +++ b/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) diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go index 7b6b25e93..73ba9b6f8 100644 --- a/post-processor/vagrant-cloud/step_release_version.go +++ b/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 diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index a0d6d80c0..f0d375e3b 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/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) diff --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go index 6c58f63d7..84defbef9 100644 --- a/provisioner/puppet-masterless/provisioner_test.go +++ b/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!") } diff --git a/provisioner/puppet-server/provisioner_test.go b/provisioner/puppet-server/provisioner_test.go index a41a6bec5..4c7746c78 100644 --- a/provisioner/puppet-server/provisioner_test.go +++ b/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!") } diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index 62f78f20a..1f2ee2cab 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/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 { From 7c3eb33cda7bf3db54f8abb03b1cadd4a223fa40 Mon Sep 17 00:00:00 2001 From: Luke Farnell Date: Mon, 7 Aug 2017 13:45:50 -0400 Subject: [PATCH 2/2] Fixed spelling mistakes --- builder/alicloud/ecs/step_config_vswitch.go | 2 +- builder/digitalocean/step_snapshot.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go index 734647e07..dfa858d0b 100644 --- a/builder/alicloud/ecs/step_config_vswitch.go +++ b/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) diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go index bd5298137..eb91fdead 100644 --- a/builder/digitalocean/step_snapshot.go +++ b/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