From 94a036038bd569a987d3b52acfd9faf383e07f71 Mon Sep 17 00:00:00 2001 From: Vladislav Rassokhin Date: Mon, 8 Jul 2019 17:48:37 +0300 Subject: [PATCH] Fix inspections --- clone/builder.go | 2 +- clone/step_clone.go | 6 +++--- cmd/clone/main.go | 5 ++++- cmd/iso/main.go | 5 ++++- driver/datastore.go | 3 +++ driver/driver.go | 6 +++--- driver/vm.go | 30 ++++++++++-------------------- iso/step_add_floppy.go | 4 ++-- iso/step_create.go | 6 +++--- iso/step_remote_upload.go | 18 +++++++++--------- 10 files changed, 42 insertions(+), 43 deletions(-) diff --git a/clone/builder.go b/clone/builder.go index 6bee86dd0..ac446733b 100644 --- a/clone/builder.go +++ b/clone/builder.go @@ -57,7 +57,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack SetOrder: false, }, &common.StepWaitForIp{ - &b.config.WaitIpConfig, + Config: &b.config.WaitIpConfig, }, &communicator.StepConnect{ Config: &b.config.Comm, diff --git a/clone/step_clone.go b/clone/step_clone.go index 294368b95..ab6abf4b2 100644 --- a/clone/step_clone.go +++ b/clone/step_clone.go @@ -41,14 +41,14 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist ui := state.Get("ui").(packer.Ui) d := state.Get("driver").(*driver.Driver) - find_vm, err := d.FindVM(s.Location.VMName) + vm, err := d.FindVM(s.Location.VMName) if s.Force == false && err == nil { state.Put("error", fmt.Errorf("%s already exists, you can use -force flag to destroy it: %v", s.Location.VMName, err)) return multistep.ActionHalt } else if s.Force == true && err == nil { ui.Say(fmt.Sprintf("the vm/template %s already exists, but deleting it due to -force flag", s.Location.VMName)) - err := find_vm.Destroy() + err := vm.Destroy() if err != nil { state.Put("error", fmt.Errorf("error destroying %s: %v", s.Location.VMName, err)) } @@ -61,7 +61,7 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist return multistep.ActionHalt } - vm, err := template.Clone(ctx, &driver.CloneConfig{ + vm, err = template.Clone(ctx, &driver.CloneConfig{ Name: s.Location.VMName, Folder: s.Location.Folder, Cluster: s.Location.Cluster, diff --git a/cmd/clone/main.go b/cmd/clone/main.go index 0ac47b4a6..2e60eff06 100644 --- a/cmd/clone/main.go +++ b/cmd/clone/main.go @@ -8,6 +8,9 @@ func main() { if err != nil { panic(err) } - server.RegisterBuilder(new(clone.Builder)) + err = server.RegisterBuilder(new(clone.Builder)) + if err != nil { + panic(err) + } server.Serve() } diff --git a/cmd/iso/main.go b/cmd/iso/main.go index f64cc1720..f28508154 100644 --- a/cmd/iso/main.go +++ b/cmd/iso/main.go @@ -8,6 +8,9 @@ func main() { if err != nil { panic(err) } - server.RegisterBuilder(new(iso.Builder)) + err = server.RegisterBuilder(new(iso.Builder)) + if err != nil { + panic(err) + } server.Serve() } diff --git a/driver/datastore.go b/driver/datastore.go index eed3d4f28..e553e9c3c 100644 --- a/driver/datastore.go +++ b/driver/datastore.go @@ -39,6 +39,9 @@ func (d *Driver) FindDatastore(name string, host string) (*Datastore, error) { ds := d.NewDatastore(&i.Datastore[0]) inf, err := ds.Info("name") + if err != nil { + return nil, err + } name = inf.Name } diff --git a/driver/driver.go b/driver/driver.go index 68e3029ad..e93fbe47b 100644 --- a/driver/driver.go +++ b/driver/driver.go @@ -31,14 +31,14 @@ type ConnectConfig struct { func NewDriver(config *ConnectConfig) (*Driver, error) { ctx := context.TODO() - vcenter_url, err := url.Parse(fmt.Sprintf("https://%v/sdk", config.VCenterServer)) + vcenterUrl, err := url.Parse(fmt.Sprintf("https://%v/sdk", config.VCenterServer)) if err != nil { return nil, err } credentials := url.UserPassword(config.Username, config.Password) - vcenter_url.User = credentials + vcenterUrl.User = credentials - soapClient := soap.NewClient(vcenter_url, config.InsecureConnection) + soapClient := soap.NewClient(vcenterUrl, config.InsecureConnection) vimClient, err := vim25.NewClient(ctx, soapClient) if err != nil { return nil, err diff --git a/driver/vm.go b/driver/vm.go index 8ef1fd580..35ab3ffc0 100644 --- a/driver/vm.go +++ b/driver/vm.go @@ -183,22 +183,22 @@ func (vm *VirtualMachine) Devices() (object.VirtualDeviceList, error) { return vmInfo.Config.Hardware.Device, nil } -func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) (*VirtualMachine, error) { - folder, err := template.driver.FindFolder(config.Folder) +func (vm *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) (*VirtualMachine, error) { + folder, err := vm.driver.FindFolder(config.Folder) if err != nil { return nil, err } var relocateSpec types.VirtualMachineRelocateSpec - pool, err := template.driver.FindResourcePool(config.Cluster, config.Host, config.ResourcePool) + pool, err := vm.driver.FindResourcePool(config.Cluster, config.Host, config.ResourcePool) if err != nil { return nil, err } poolRef := pool.pool.Reference() relocateSpec.Pool = &poolRef - datastore, err := template.driver.FindDatastore(config.Datastore, config.Host) + datastore, err := vm.driver.FindDatastore(config.Datastore, config.Host) if err != nil { return nil, err } @@ -212,7 +212,7 @@ func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) if config.LinkedClone == true { cloneSpec.Location.DiskMoveType = "createNewChildDiskBacking" - tpl, err := template.Info("snapshot") + tpl, err := vm.Info("snapshot") if err != nil { return nil, err } @@ -231,7 +231,7 @@ func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) } if config.Network != "" { - net, err := template.driver.FindNetwork(config.Network) + net, err := vm.driver.FindNetwork(config.Network) if err != nil { return nil, err } @@ -240,7 +240,7 @@ func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) return nil, err } - devices, err := template.vm.Device(ctx) + devices, err := vm.vm.Device(ctx) if err != nil { return nil, err } @@ -260,7 +260,7 @@ func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) configSpec.DeviceChange = append(configSpec.DeviceChange, config) } - task, err := template.vm.Clone(template.driver.ctx, folder.folder, config.Name, cloneSpec) + task, err := vm.vm.Clone(vm.driver.ctx, folder.folder, config.Name, cloneSpec) if err != nil { return nil, err } @@ -276,8 +276,8 @@ func (template *VirtualMachine) Clone(ctx context.Context, config *CloneConfig) } vmRef := info.Result.(types.ManagedObjectReference) - vm := template.driver.NewVM(&vmRef) - return vm, nil + created := vm.driver.NewVM(&vmRef) + return created, nil } func (vm *VirtualMachine) Destroy() error { @@ -545,16 +545,6 @@ func addNetwork(d *Driver, devices object.VirtualDeviceList, config *CreateConfi return append(devices, device), nil } -func addIDE(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) { - ideDevice, err := devices.CreateIDEController() - if err != nil { - return nil, err - } - devices = append(devices, ideDevice) - - return devices, nil -} - func (vm *VirtualMachine) AddCdrom(controllerType string, isoPath string) error { devices, err := vm.vm.Device(vm.driver.ctx) if err != nil { diff --git a/iso/step_add_floppy.go b/iso/step_add_floppy.go index fd9f9ac27..deca0e6b0 100644 --- a/iso/step_add_floppy.go +++ b/iso/step_add_floppy.go @@ -86,8 +86,8 @@ func (s *StepAddFloppy) Cleanup(state multistep.StateBag) { return } - err_del := ds.Delete(UploadedFloppyPath.(string)) - if err_del != nil { + err = ds.Delete(UploadedFloppyPath.(string)) + if err != nil { state.Put("error", err) return } diff --git a/iso/step_create.go b/iso/step_create.go index 122e542e8..627f24d45 100644 --- a/iso/step_create.go +++ b/iso/step_create.go @@ -53,21 +53,21 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste ui := state.Get("ui").(packer.Ui) d := state.Get("driver").(*driver.Driver) - find_vm, err := d.FindVM(s.Location.VMName) + vm, err := d.FindVM(s.Location.VMName) if s.Force == false && err == nil { state.Put("error", fmt.Errorf("%s already exists, you can use -force flag to destroy it: %v", s.Location.VMName, err)) return multistep.ActionHalt } else if s.Force == true && err == nil { ui.Say(fmt.Sprintf("the vm/template %s already exists, but deleting it due to -force flag", s.Location.VMName)) - err := find_vm.Destroy() + err := vm.Destroy() if err != nil { state.Put("error", fmt.Errorf("error destroying %s: %v", s.Location.VMName, err)) } } ui.Say("Creating VM...") - vm, err := d.CreateVM(&driver.CreateConfig{ + vm, err = d.CreateVM(&driver.CreateConfig{ DiskThinProvisioned: s.Config.DiskThinProvisioned, DiskControllerType: s.Config.DiskControllerType, DiskSize: s.Config.DiskSize, diff --git a/iso/step_remote_upload.go b/iso/step_remote_upload.go index 53a7317af..ea57d4b8b 100644 --- a/iso/step_remote_upload.go +++ b/iso/step_remote_upload.go @@ -27,28 +27,28 @@ func (s *StepRemoteUpload) Run(_ context.Context, state multistep.StateBag) mult return multistep.ActionHalt } - remotepath := fmt.Sprintf("packer_cache/%s", filename) - remotedirectory := fmt.Sprintf("[%s] packer_cache/", ds.Name()) - final_remotepath := fmt.Sprintf("%s/%s", remotedirectory, filename) + remotePath := fmt.Sprintf("packer_cache/%s", filename) + remoteDirectory := fmt.Sprintf("[%s] packer_cache/", ds.Name()) + fullRemotePath := fmt.Sprintf("%s/%s", remoteDirectory, filename) - ui.Say(fmt.Sprintf("Uploading %s to %s", filename, remotepath)) + ui.Say(fmt.Sprintf("Uploading %s to %s", filename, remotePath)) - if exists := ds.FileExists(remotepath); exists == true { + if exists := ds.FileExists(remotePath); exists == true { ui.Say("File already upload") - state.Put("iso_remote_path", final_remotepath) + state.Put("iso_remote_path", fullRemotePath) return multistep.ActionContinue } - if err := ds.MakeDirectory(remotedirectory); err != nil { + if err := ds.MakeDirectory(remoteDirectory); err != nil { state.Put("error", err) return multistep.ActionHalt } - if err := ds.UploadFile(path.(string), remotepath, s.Host); err != nil { + if err := ds.UploadFile(path.(string), remotePath, s.Host); err != nil { state.Put("error", err) return multistep.ActionHalt } - state.Put("iso_remote_path", final_remotepath) + state.Put("iso_remote_path", fullRemotePath) } return multistep.ActionContinue