From 05c22066847838e11cf11718d592d48a3e783d64 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 18:17:48 +0100 Subject: [PATCH 01/18] builder/amazon/common: fix incorrect printf verb type in amiRegionCopy Fixes the following vet reports: builder/amazon/common/step_ami_region_copy.go:81: arg target for printf verb %s of wrong type: github.com/mitchellh/goamz/aws.Region builder/amazon/common/step_ami_region_copy.go:93: arg target for printf verb %s of wrong type: github.com/mitchellh/goamz/aws.Region --- builder/amazon/common/step_ami_region_copy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index 6e61b40d1..898eacc08 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -79,7 +79,7 @@ func amiRegionCopy(state multistep.StateBag, auth aws.Auth, imageId string, if err != nil { return "", fmt.Errorf("Error Copying AMI (%s) to region (%s): %s", - imageId, target, err) + imageId, target.Name, err) } stateChange := StateChangeConf{ @@ -91,7 +91,7 @@ func amiRegionCopy(state multistep.StateBag, auth aws.Auth, imageId string, if _, err := WaitForState(&stateChange); err != nil { return "", fmt.Errorf("Error waiting for AMI (%s) in region (%s): %s", - resp.ImageId, target, err) + resp.ImageId, target.Name, err) } return resp.ImageId, nil From 505f51ff27249d664e77fb5bc1bdae1b9f39969a Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 18:43:09 +0100 Subject: [PATCH 02/18] builder/amazon/ebs: fix incorrect printf verb type Fixes the following vet report: builder/amazon/ebs/step_create_ami.go:90: arg resp.Return for printf verb %s of wrong type: bool --- builder/amazon/ebs/step_create_ami.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index 967ad2d39..f380ea0b1 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -87,7 +87,7 @@ func (s *stepCreateAMI) Cleanup(state multistep.StateBag) { ui.Error(fmt.Sprintf("Error deregistering AMI, may still be around: %s", err)) return } else if resp.Return == false { - ui.Error(fmt.Sprintf("Error deregistering AMI, may still be around: %s", resp.Return)) + ui.Error(fmt.Sprintf("Error deregistering AMI, may still be around: %t", resp.Return)) return } } From 413b84af6b4ca20f4fd128ee2730acdab8f09c19 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 18:54:51 +0100 Subject: [PATCH 03/18] builder/digitalocean: fix incorrect printf verb types Fixes the following vet reports: builder/digitalocean/builder_test.go:267: arg b.config.SSHUsername for printf verb %d of wrong type: string builder/digitalocean/builder_test.go:300: arg b.config.RawSSHTimeout for printf verb %d of wrong type: string builder/digitalocean/builder_test.go:341: arg b.config.RawStateTimeout for printf verb %d of wrong type: string builder/digitalocean/builder_test.go:382: arg b.config.PrivateNetworking for printf verb %s of wrong type: bool builder/digitalocean/builder_test.go:397: arg b.config.PrivateNetworking for printf verb %s of wrong type: bool --- builder/digitalocean/builder_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/digitalocean/builder_test.go b/builder/digitalocean/builder_test.go index d6857bbe6..bd3bb1d21 100644 --- a/builder/digitalocean/builder_test.go +++ b/builder/digitalocean/builder_test.go @@ -264,7 +264,7 @@ func TestBuilderPrepare_SSHUsername(t *testing.T) { } if b.config.SSHUsername != "root" { - t.Errorf("invalid: %d", b.config.SSHUsername) + t.Errorf("invalid: %s", b.config.SSHUsername) } // Test set @@ -297,7 +297,7 @@ func TestBuilderPrepare_SSHTimeout(t *testing.T) { } if b.config.RawSSHTimeout != "1m" { - t.Errorf("invalid: %d", b.config.RawSSHTimeout) + t.Errorf("invalid: %s", b.config.RawSSHTimeout) } // Test set @@ -338,7 +338,7 @@ func TestBuilderPrepare_StateTimeout(t *testing.T) { } if b.config.RawStateTimeout != "6m" { - t.Errorf("invalid: %d", b.config.RawStateTimeout) + t.Errorf("invalid: %s", b.config.RawStateTimeout) } // Test set @@ -379,7 +379,7 @@ func TestBuilderPrepare_PrivateNetworking(t *testing.T) { } if b.config.PrivateNetworking != false { - t.Errorf("invalid: %s", b.config.PrivateNetworking) + t.Errorf("invalid: %t", b.config.PrivateNetworking) } // Test set @@ -394,7 +394,7 @@ func TestBuilderPrepare_PrivateNetworking(t *testing.T) { } if b.config.PrivateNetworking != true { - t.Errorf("invalid: %s", b.config.PrivateNetworking) + t.Errorf("invalid: %t", b.config.PrivateNetworking) } } From 002e50f493be42ccab2d2d479eeaa3e3bd054d73 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:16:19 +0100 Subject: [PATCH 04/18] builder/googlecompute: fix formatting directives Fixes the following vet reports: builder/googlecompute/step_create_instance_test.go:42: possible formatting directive in Fatal call builder/googlecompute/step_teardown_instance_test.go:29: possible formatting directive in Fatal call builder/googlecompute/step_teardown_instance_test.go:39: possible formatting directive in Fatal call --- builder/googlecompute/step_create_instance_test.go | 2 +- builder/googlecompute/step_teardown_instance_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index c7272bea8..baae10849 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -39,7 +39,7 @@ func TestStepCreateInstance(t *testing.T) { t.Fatal("should've deleted instance") } if driver.DeleteInstanceZone != config.Zone { - t.Fatal("bad zone: %#v", driver.DeleteInstanceZone) + t.Fatalf("bad zone: %#v", driver.DeleteInstanceZone) } } diff --git a/builder/googlecompute/step_teardown_instance_test.go b/builder/googlecompute/step_teardown_instance_test.go index f007d5179..bd32ea26d 100644 --- a/builder/googlecompute/step_teardown_instance_test.go +++ b/builder/googlecompute/step_teardown_instance_test.go @@ -26,7 +26,7 @@ func TestStepTeardownInstance(t *testing.T) { t.Fatal("should've deleted instance") } if driver.DeleteInstanceZone != config.Zone { - t.Fatal("bad zone: %#v", driver.DeleteInstanceZone) + t.Fatalf("bad zone: %#v", driver.DeleteInstanceZone) } // cleanup @@ -36,6 +36,6 @@ func TestStepTeardownInstance(t *testing.T) { t.Fatal("should've deleted disk") } if driver.DeleteDiskZone != config.Zone { - t.Fatal("bad zone: %#v", driver.DeleteDiskZone) + t.Fatalf("bad zone: %#v", driver.DeleteDiskZone) } } From f5782084e57a03c65731f80c2bdfc85c258c9ded Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:18:06 +0100 Subject: [PATCH 05/18] builder/openstack: address vet reports Fixes the following vet reports: builder/openstack/artifact.go:44: arg a.ImageId for printf verb %d of wrong type: string builder/openstack/step_wait_for_rackconnect.go:24: arg server for printf verb %s of wrong type: *github.com/mitchellh/gophercloud-fork-40444fb.Server --- builder/openstack/artifact.go | 2 +- builder/openstack/step_wait_for_rackconnect.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/builder/openstack/artifact.go b/builder/openstack/artifact.go index f55ff8727..6e75fad3e 100644 --- a/builder/openstack/artifact.go +++ b/builder/openstack/artifact.go @@ -41,6 +41,6 @@ func (a *Artifact) State(name string) interface{} { } func (a *Artifact) Destroy() error { - log.Printf("Destroying image: %d", a.ImageId) + log.Printf("Destroying image: %s", a.ImageId) return a.Conn.DeleteImageById(a.ImageId) } diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go index 94affbe37..ee6ee6138 100644 --- a/builder/openstack/step_wait_for_rackconnect.go +++ b/builder/openstack/step_wait_for_rackconnect.go @@ -21,7 +21,6 @@ func (s *StepWaitForRackConnect) Run(state multistep.StateBag) multistep.StepAct csp := state.Get("csp").(gophercloud.CloudServersProvider) server := state.Get("server").(*gophercloud.Server) ui := state.Get("ui").(packer.Ui) - fmt.Printf("%s", server) ui.Say(fmt.Sprintf("Waiting for server (%s) to become RackConnect ready...", server.Id)) From b19f9b97776d9f296fdfd5150ec133ed7f30496a Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:20:13 +0100 Subject: [PATCH 06/18] builder/parallels/iso: fix incorrect printf verb type Fixes the following vet report: builder/parallels/iso/builder_test.go:78: arg b.config.DiskSize for printf verb %s of wrong type: uint --- builder/parallels/iso/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go index 9c7f56f6b..b7d4cac50 100644 --- a/builder/parallels/iso/builder_test.go +++ b/builder/parallels/iso/builder_test.go @@ -75,7 +75,7 @@ func TestBuilderPrepare_DiskSize(t *testing.T) { } if b.config.DiskSize != 60000 { - t.Fatalf("bad size: %s", b.config.DiskSize) + t.Fatalf("bad size: %d", b.config.DiskSize) } } From cceb4b286821da7163e97da14eccc04e07e21840 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:21:45 +0100 Subject: [PATCH 07/18] builder/qemu: fix incorrect printf verb type Fixes the following vet report: builder/qemu/builder_test.go:163: arg b.config.DiskSize for printf verb %s of wrong type: uint --- builder/qemu/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/qemu/builder_test.go b/builder/qemu/builder_test.go index 86c561263..e3415d514 100644 --- a/builder/qemu/builder_test.go +++ b/builder/qemu/builder_test.go @@ -160,7 +160,7 @@ func TestBuilderPrepare_DiskSize(t *testing.T) { } if b.config.DiskSize != 60000 { - t.Fatalf("bad size: %s", b.config.DiskSize) + t.Fatalf("bad size: %d", b.config.DiskSize) } } From 96b62af551bfccfa5215755cefa185a24b39837b Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:23:02 +0100 Subject: [PATCH 08/18] builder/virtualbox/iso: fix incorrect printf verb type Fixes the following vet report: builder/virtualbox/iso/builder_test.go:86: arg b.config.DiskSize for printf verb %s of wrong type: uint --- builder/virtualbox/iso/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go index 3b8e59569..714587f24 100644 --- a/builder/virtualbox/iso/builder_test.go +++ b/builder/virtualbox/iso/builder_test.go @@ -83,7 +83,7 @@ func TestBuilderPrepare_DiskSize(t *testing.T) { } if b.config.DiskSize != 60000 { - t.Fatalf("bad size: %s", b.config.DiskSize) + t.Fatalf("bad size: %d", b.config.DiskSize) } } From fdb64f6f25a2f81483169504b155d5a4bd9b3fab Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:25:25 +0100 Subject: [PATCH 09/18] builder/vmware/common: fix missing format argument for Fatalf call in test Fixes the following vet report: builder/vmware/common/step_shutdown_test.go:130: missing argument for Fatalf("%s"): format reads arg 1, have only 0 args --- builder/vmware/common/step_shutdown_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go index b3c13a9f6..cdbda852d 100644 --- a/builder/vmware/common/step_shutdown_test.go +++ b/builder/vmware/common/step_shutdown_test.go @@ -127,7 +127,7 @@ func TestStepShutdown_locks(t *testing.T) { lockPath := filepath.Join(dir.dir, "nope.lck") err := ioutil.WriteFile(lockPath, []byte("foo"), 0644) if err != nil { - t.Fatalf("err: %s") + t.Fatalf("err: %s", err) } // Remove the lock file after a certain time From 57468b3d1adee0b76d4b1f1139c89831290ea57e Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:27:17 +0100 Subject: [PATCH 10/18] builder/vmware/iso: fix incorrect printf verb type in test Fixes the following vet report: builder/vmware/iso/builder_test.go:178: arg b.config.DiskSize for printf verb %s of wrong type: uint --- builder/vmware/iso/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go index b6c0cfd81..1749b396e 100644 --- a/builder/vmware/iso/builder_test.go +++ b/builder/vmware/iso/builder_test.go @@ -175,7 +175,7 @@ func TestBuilderPrepare_DiskSize(t *testing.T) { } if b.config.DiskSize != 60000 { - t.Fatalf("bad size: %s", b.config.DiskSize) + t.Fatalf("bad size: %d", b.config.DiskSize) } } From 952ae5161bf80cd2590edd72ee0743f7446c3185 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:51:55 +0100 Subject: [PATCH 11/18] common: fix formatting directives in tests Fixes the following vet reports: common/step_create_floppy_test.go:79: possible formatting directive in Fatal call common/step_create_floppy_test.go:89: possible formatting directive in Fatal call common/step_create_floppy_test.go:180: possible formatting directive in Fatal call common/step_create_floppy_test.go:190: possible formatting directive in Fatal call --- common/step_create_floppy_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/step_create_floppy_test.go b/common/step_create_floppy_test.go index b6e591a41..d1a3000a7 100644 --- a/common/step_create_floppy_test.go +++ b/common/step_create_floppy_test.go @@ -76,7 +76,7 @@ func TestStepCreateFloppy(t *testing.T) { floppy_path := state.Get("floppy_path").(string) if _, err := os.Stat(floppy_path); err != nil { - t.Fatal("file not found: %s for %v", floppy_path, step.Files) + t.Fatalf("file not found: %s for %v", floppy_path, step.Files) } if len(step.FilesAdded) != expected { @@ -86,7 +86,7 @@ func TestStepCreateFloppy(t *testing.T) { step.Cleanup(state) if _, err := os.Stat(floppy_path); err == nil { - t.Fatal("file found: %s for %v", floppy_path, step.Files) + t.Fatalf("file found: %s for %v", floppy_path, step.Files) } } } @@ -177,7 +177,7 @@ func xxxTestStepCreateFloppy_notfound(t *testing.T) { floppy_path := state.Get("floppy_path").(string) if _, err := os.Stat(floppy_path); err != nil { - t.Fatal("file not found: %s for %v", floppy_path, step.Files) + t.Fatalf("file not found: %s for %v", floppy_path, step.Files) } if len(step.FilesAdded) != expected { @@ -187,7 +187,7 @@ func xxxTestStepCreateFloppy_notfound(t *testing.T) { step.Cleanup(state) if _, err := os.Stat(floppy_path); err == nil { - t.Fatal("file found: %s for %v", floppy_path, step.Files) + t.Fatalf("file found: %s for %v", floppy_path, step.Files) } } } From c4d4e0a21fccdd1ba4766aa62a37594e78bef482 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Mon, 15 Dec 2014 19:54:44 +0100 Subject: [PATCH 12/18] communicator/ssh: bind variable value to closure Fixes the following vet report: communicator/ssh/communicator_test.go:88: range variable newChannel captured by func literal --- communicator/ssh/communicator_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/communicator/ssh/communicator_test.go b/communicator/ssh/communicator_test.go index c5b8832dd..aa241cca8 100644 --- a/communicator/ssh/communicator_test.go +++ b/communicator/ssh/communicator_test.go @@ -83,10 +83,10 @@ func newMockLineServer(t *testing.T) string { } t.Log("Accepted channel") - go func() { + go func(channelType string) { defer channel.Close() - conn.OpenChannel(newChannel.ChannelType(), nil) - }() + conn.OpenChannel(channelType, nil) + }(newChannel.ChannelType()) } conn.Close() }() From d9abb5458b8bcccbd50d0bea76247cc14a40fb83 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Tue, 16 Dec 2014 06:28:37 +0100 Subject: [PATCH 13/18] packer: fix formatting directives in test Fixes the following vet reports: packer/template_test.go:496: possible formatting directive in Fatal call packer/template_test.go:528: possible formatting directive in Fatal call --- packer/template_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/template_test.go b/packer/template_test.go index bf11fc7d0..b676672b1 100644 --- a/packer/template_test.go +++ b/packer/template_test.go @@ -497,7 +497,7 @@ func TestParseTemplate_Provisioners(t *testing.T) { result, err := ParseTemplate([]byte(data), nil) if err != nil { - t.Fatal("err: %s", err) + t.Fatalf("err: %s", err) } if result == nil { t.Fatal("should have result") @@ -529,7 +529,7 @@ func TestParseTemplate_ProvisionerPauseBefore(t *testing.T) { result, err := ParseTemplate([]byte(data), nil) if err != nil { - t.Fatal("err: %s", err) + t.Fatalf("err: %s", err) } if result == nil { t.Fatal("should have result") From 9c31822a2b4eeefd9edf9440279a57987a9d0696 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Wed, 25 Feb 2015 05:37:36 +0100 Subject: [PATCH 14/18] post-processor/vagrant: address vet report Fixes the following vet report: post-processor/vagrant/post-processor_test.go:135: possible formatting directive in Fatal call --- post-processor/vagrant/post-processor_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-processor/vagrant/post-processor_test.go b/post-processor/vagrant/post-processor_test.go index 5d2d9ce2f..1bcb50be3 100644 --- a/post-processor/vagrant/post-processor_test.go +++ b/post-processor/vagrant/post-processor_test.go @@ -132,7 +132,7 @@ func TestPostProcessorPrepare_vagrantfileTemplateExists(t *testing.T) { c["vagrantfile_template"] = name if err := f.Close(); err != nil { - t.Fatal("err: %s", err) + t.Fatalf("err: %s", err) } if err := os.Remove(name); err != nil { From 8144c92dd01bbc1e0ddb49a3e373664093e5ce37 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Tue, 16 Dec 2014 07:11:36 +0100 Subject: [PATCH 15/18] post-processor/vagrant-cloud: fix incorrect printf verb types Fixes the following vet reports: post-processor/vagrant-cloud/client.go:81: arg resp for printf verb %s of wrong type: *net/http.Response post-processor/vagrant-cloud/client.go:99: arg resp for printf verb %s of wrong type: *net/http.Response post-processor/vagrant-cloud/client.go:131: arg resp for printf verb %s of wrong type: *net/http.Response post-processor/vagrant-cloud/client.go:156: arg resp for printf verb %s of wrong type: *net/http.Response post-processor/vagrant-cloud/client.go:175: arg resp for printf verb %s of wrong type: *net/http.Response --- post-processor/vagrant-cloud/client.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go index 104f13832..0c475075d 100644 --- a/post-processor/vagrant-cloud/client.go +++ b/post-processor/vagrant-cloud/client.go @@ -78,7 +78,7 @@ func (v VagrantCloudClient) Get(path string) (*http.Response, error) { req.Header.Add("Content-Type", "application/json") resp, err := v.client.Do(req) - log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%s", resp) + log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%+v", resp) return resp, err } @@ -96,7 +96,7 @@ func (v VagrantCloudClient) Delete(path string) (*http.Response, error) { req.Header.Add("Content-Type", "application/json") resp, err := v.client.Do(req) - log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%s", resp) + log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%+v", resp) return resp, err } @@ -128,7 +128,7 @@ func (v VagrantCloudClient) Upload(path string, url string) (*http.Response, err resp, err := v.client.Do(request) - log.Printf("Post-Processor Vagrant Cloud Upload Response: \n\n%s", resp) + log.Printf("Post-Processor Vagrant Cloud Upload Response: \n\n%+v", resp) return resp, err } @@ -153,7 +153,7 @@ func (v VagrantCloudClient) Post(path string, body interface{}) (*http.Response, resp, err := v.client.Do(req) - log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%s", resp) + log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%+v", resp) return resp, err } @@ -172,7 +172,7 @@ func (v VagrantCloudClient) Put(path string) (*http.Response, error) { resp, err := v.client.Do(req) - log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%s", resp) + log.Printf("Post-Processor Vagrant Cloud API Response: \n\n%+v", resp) return resp, err } From 92704b693a9a107be5919bccfd2b29b37e7eaaca Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Tue, 16 Dec 2014 07:14:19 +0100 Subject: [PATCH 16/18] provisioner/puppet-masterless: fix missing format argument Fixes the following vet report: provisioner/puppet-masterless/provisioner.go:196: missing argument for Errorf(%d): format reads arg 1, have only 0 args --- provisioner/puppet-masterless/provisioner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index 307ecce38..efb5e53e2 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -190,7 +190,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { fmt.Errorf("module_path[%d] is invalid: %s", i, err)) } else if !info.IsDir() { errs = packer.MultiErrorAppend(errs, - fmt.Errorf("module_path[%d] must point to a directory")) + fmt.Errorf("module_path[%d] must point to a directory", i)) } } From 3165b0c936f17f5cde3b42d713f9af26ed76c696 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Tue, 16 Dec 2014 07:46:45 +0100 Subject: [PATCH 17/18] provisioner/salt-masterless: fix incorrect printf verb types Fixes the following vet reports: provisioner/salt-masterless/provisioner.go:119: arg cmd for printf verb %s of wrong type: *github.com/mitchellh/packer/packer.RemoteCmd provisioner/salt-masterless/provisioner.go:121: arg err for printf verb %d of wrong type: error provisioner/salt-masterless/provisioner.go:142: arg err for printf verb %d of wrong type: error provisioner/salt-masterless/provisioner.go:157: arg err for printf verb %d of wrong type: error provisioner/salt-masterless/provisioner.go:172: arg err for printf verb %d of wrong type: error provisioner/salt-masterless/provisioner.go:216: arg err for printf verb %d of wrong type: error --- provisioner/salt-masterless/provisioner.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 07710cdd5..1e2877fe3 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -118,14 +118,14 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { } ui.Message(fmt.Sprintf("Downloading saltstack bootstrap to /tmp/install_salt.sh")) if err = cmd.StartWithUi(comm, ui); err != nil { - return fmt.Errorf("Unable to download Salt: %d", err) + return fmt.Errorf("Unable to download Salt: %s", err) } cmd = &packer.RemoteCmd{ Command: fmt.Sprintf("sudo sh /tmp/install_salt.sh %s", p.config.BootstrapArgs), } - ui.Message(fmt.Sprintf("Installing Salt with command %s", cmd)) + ui.Message(fmt.Sprintf("Installing Salt with command %s", cmd.Command)) if err = cmd.StartWithUi(comm, ui); err != nil { - return fmt.Errorf("Unable to install Salt: %d", err) + return fmt.Errorf("Unable to install Salt: %s", err) } } @@ -146,7 +146,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { src = filepath.ToSlash(filepath.Join(p.config.TempConfigDir, "minion")) dst = "/etc/salt/minion" if err = p.moveFile(ui, comm, dst, src); err != nil { - return fmt.Errorf("Unable to move %s/minion to /etc/salt/minion: %d", p.config.TempConfigDir, err) + return fmt.Errorf("Unable to move %s/minion to /etc/salt/minion: %s", p.config.TempConfigDir, err) } } @@ -161,7 +161,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { src = filepath.ToSlash(filepath.Join(p.config.TempConfigDir, "states")) dst = "/srv/salt" if err = p.moveFile(ui, comm, dst, src); err != nil { - return fmt.Errorf("Unable to move %s/states to /srv/salt: %d", p.config.TempConfigDir, err) + return fmt.Errorf("Unable to move %s/states to /srv/salt: %s", p.config.TempConfigDir, err) } if p.config.LocalPillarRoots != "" { @@ -176,7 +176,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { src = filepath.ToSlash(filepath.Join(p.config.TempConfigDir, "pillar")) dst = "/srv/pillar" if err = p.moveFile(ui, comm, dst, src); err != nil { - return fmt.Errorf("Unable to move %s/pillar to /srv/pillar: %d", p.config.TempConfigDir, err) + return fmt.Errorf("Unable to move %s/pillar to /srv/pillar: %s", p.config.TempConfigDir, err) } } @@ -220,7 +220,7 @@ func (p *Provisioner) moveFile(ui packer.Ui, comm packer.Communicator, dst, src err = fmt.Errorf("Bad exit status: %d", cmd.ExitStatus) } - return fmt.Errorf("Unable to move %s/minion to /etc/salt/minion: %d", p.config.TempConfigDir, err) + return fmt.Errorf("Unable to move %s/minion to /etc/salt/minion: %s", p.config.TempConfigDir, err) } return nil } From ffd570fe3c6fe4dab412a7384f18f94025734c52 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Fri, 30 Jan 2015 13:03:25 +0100 Subject: [PATCH 18/18] Makefile: add vet target --- Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f03b010f5..d0d67dab8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ TEST?=./... +VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \ + -nilfunc -printf -rangeloops -shift -structtags -unsafeptr default: test @@ -10,6 +12,7 @@ dev: test: go test $(TEST) $(TESTARGS) -timeout=10s + @$(MAKE) vet testrace: go test -race $(TEST) $(TESTARGS) @@ -17,4 +20,14 @@ testrace: updatedeps: go get -d -v -p 2 ./... -.PHONY: bin default test updatedeps +vet: + @go tool vet 2>/dev/null ; if [ $$? -eq 3 ]; then \ + go get golang.org/x/tools/cmd/vet; \ + fi + @go tool vet $(VETARGS) . ; if [ $$? -eq 1 ]; then \ + echo ""; \ + echo "Vet found suspicious constructs. Please check the reported constructs"; \ + echo "and fix them if necessary before submitting the code for reviewal."; \ + fi + +.PHONY: bin default test updatedeps vet