Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: error msgs #494

Merged
merged 1 commit into from
Jan 27, 2025
Merged

chore: error msgs #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions builder/vsphere/driver/datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,29 +45,29 @@ func (d *VCenterDriver) FindDatastore(name string, host string) (Datastore, erro
if name == "" {
h, err := d.FindHost(host)
if err != nil {
return nil, fmt.Errorf("Error finding host for to get datastore: %s", err)
return nil, fmt.Errorf("error finding host to return datastore: %s", err)
}

i, err := h.Info("datastore")
if err != nil {
return nil, fmt.Errorf("Error getting datastore info from host: %s", err)
return nil, fmt.Errorf("error returning datastore info from host: %s", err)
}

if len(i.Datastore) > 1 {
return nil, fmt.Errorf("Host has multiple datastores. Specify it explicitly")
return nil, fmt.Errorf("host has multiple datastores; specify the datastore name")
}

ds := d.NewDatastore(&i.Datastore[0])
inf, err := ds.Info("name")
if err != nil {
return nil, fmt.Errorf("Error getting datastore name: %s", err)
return nil, fmt.Errorf("error returning datastore name: %s", err)
}
name = inf.Name
}

ds, err := d.finder.Datastore(d.ctx, name)
if err != nil {
return nil, fmt.Errorf("Error finding datastore with name %s: %s", name, err)
return nil, fmt.Errorf("error finding datastore with name %s: %s", name, err)
}

return &DatastoreDriver{
Expand Down
2 changes: 1 addition & 1 deletion builder/vsphere/driver/datastore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func TestVCenterDriver_MultipleDatastoreError(t *testing.T) {
if err == nil {
t.Fatal("unexpected success: expected failure")
}
if err.Error() != "Host has multiple datastores. Specify it explicitly" {
if err.Error() != "host has multiple datastores; specify the datastore name" {
t.Fatalf("unexpected error: '%s'", err)
}
}
27 changes: 14 additions & 13 deletions builder/vsphere/driver/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,21 +337,21 @@ func (vm *VirtualMachineDriver) CdromDevices() (object.VirtualDeviceList, error)
func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) (VirtualMachine, error) {
folder, err := vm.driver.FindFolder(config.Folder)
if err != nil {
return nil, fmt.Errorf("Error finding folder: %s", err)
return nil, fmt.Errorf("error finding folder: %s", err)
}

var relocateSpec types.VirtualMachineRelocateSpec

pool, err := vm.driver.FindResourcePool(config.Cluster, config.Host, config.ResourcePool)
if err != nil {
return nil, fmt.Errorf("Error finding resource pool: %s", err)
return nil, fmt.Errorf("error finding resource pool: %s", err)
}
poolRef := pool.pool.Reference()
relocateSpec.Pool = &poolRef

datastore, err := vm.driver.FindDatastore(config.Datastore, config.Host)
if err != nil {
return nil, fmt.Errorf("Error finding datastore: %s", err)
return nil, fmt.Errorf("error finding datastore: %s", err)
}
datastoreRef := datastore.Reference()
relocateSpec.Datastore = &datastoreRef
Expand All @@ -374,7 +374,7 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)

tpl, err := vm.Info("snapshot")
if err != nil {
return nil, fmt.Errorf("Error getting snapshot info for vm: %s", err)
return nil, fmt.Errorf("error getting snapshot info for virtual machine: %s", err)
}
if tpl.Snapshot == nil {
err = errors.New("`linked_clone=true`, but template has no snapshots")
Expand Down Expand Up @@ -420,21 +420,21 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
if config.Network != "" {
net, err := vm.driver.FindNetwork(config.Network)
if err != nil {
return nil, fmt.Errorf("Error finding network: %s", err)
return nil, fmt.Errorf("error finding network: %s", err)
}
backing, err := net.network.EthernetCardBackingInfo(ctx)
if err != nil {
return nil, fmt.Errorf("Error finding ethernet card backing info: %s", err)
return nil, fmt.Errorf("error finding ethernet card backing info: %s", err)
}

devices, err := vm.vm.Device(ctx)
if err != nil {
return nil, fmt.Errorf("Error finding vm devices: %s", err)
return nil, fmt.Errorf("error finding virtual machine devices: %s", err)
}

adapter, err := findNetworkAdapter(devices)
if err != nil {
return nil, fmt.Errorf("Error finding network adapter: %s", err)
return nil, fmt.Errorf("error finding network adapter: %s", err)
}

current := adapter.GetVirtualEthernetCard()
Expand All @@ -455,13 +455,13 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)

vAppConfig, err := vm.updateVAppConfig(ctx, config.VAppProperties)
if err != nil {
return nil, fmt.Errorf("Error updating VAppConfig: %s", err)
return nil, fmt.Errorf("error updating VAppConfig: %s", err)
}
configSpec.VAppConfig = vAppConfig

task, err := vm.vm.Clone(vm.driver.ctx, folder.folder, config.Name, cloneSpec)
if err != nil {
return nil, fmt.Errorf("Error calling vm.vm.Clone task: %s", err)
return nil, fmt.Errorf("error calling vm.vm.Clone task: %s", err)
}

info, err := task.WaitForResult(ctx, nil)
Expand All @@ -471,12 +471,13 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
return nil, err
}

return nil, fmt.Errorf("Error waiting for vm Clone to complete: %s", err)
return nil, fmt.Errorf("error waiting for virtual machine clone to complete: %s", err)
}

vmRef, ok := info.Result.(types.ManagedObjectReference)
if !ok {
return nil, fmt.Errorf("something went wrong when cloning the VM")
log.Printf("[ERROR] unexpected result during cloning operation: %s", info.Result)
return nil, fmt.Errorf("error occured while cloning the virtual machine")
}

created := vm.driver.NewVM(&vmRef)
Expand All @@ -490,7 +491,7 @@ func (vm *VirtualMachineDriver) updateVAppConfig(ctx context.Context, newProps m

vProps, _ := vm.Properties(ctx)
if vProps.Config.VAppConfig == nil {
return nil, fmt.Errorf("this VM lacks a vApp configuration and cannot have vApp properties set on it")
return nil, fmt.Errorf("no vApp configuration found; cannot set vApp propertie")
}

allProperties := vProps.Config.VAppConfig.GetVmConfigInfo().Property
Expand Down
Loading
Loading