github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Add error check and ignore unused variable (SA4006)

Browse Source
This commit is contained in:
Jiatong Wang 2018-07-17 10:41:06 -07:00
parent a74df596ab
commit 4d578d1389
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vmdm.go
View File

@ -127,6 +127,10 @@ func (vmdisk vmDiskManager) Create(ctx context.Context, datastore *vclib.Datasto
virtualMachineConfigSpec.DeviceChange = append(virtualMachineConfigSpec.DeviceChange, deviceConfigSpec) virtualMachineConfigSpec.DeviceChange = append(virtualMachineConfigSpec.DeviceChange, deviceConfigSpec)
fileAlreadyExist := false fileAlreadyExist := false
task, err := dummyVM.Reconfigure(ctx, virtualMachineConfigSpec) task, err := dummyVM.Reconfigure(ctx, virtualMachineConfigSpec)
if err != nil {
glog.Errorf("Failed to reconfig. err: %v", err)
return "", err
}
err = task.Wait(ctx) err = task.Wait(ctx)
if err != nil { if err != nil {
fileAlreadyExist = isAlreadyExists(vmdisk.diskPath, err) fileAlreadyExist = isAlreadyExists(vmdisk.diskPath, err)

2
pkg/cloudprovider/providers/vsphere/vsphere_test.go
View File

@ -357,7 +357,7 @@ func TestInstances(t *testing.T) {
} }
t.Logf("Found InstanceID(%s) = %s\n", nodeName, instanceID) t.Logf("Found InstanceID(%s) = %s\n", nodeName, instanceID)
instanceID, err = i.InstanceID(context.TODO(), nonExistingVM) _, err = i.InstanceID(context.TODO(), nonExistingVM)
if err == cloudprovider.InstanceNotFound { if err == cloudprovider.InstanceNotFound {
t.Logf("VM %s was not found as expected\n", nonExistingVM) t.Logf("VM %s was not found as expected\n", nonExistingVM)
} else if err == nil { } else if err == nil {