Merge pull request #3653 from alingse/fix-nilness-err

fix: check `cerr != nil` but return a nil value error `err`
vmware · Dec 17, 2024 · 04ddb84 · 04ddb84
2 parents 3def2df + 3793a5b
commit 04ddb84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cli/fields/info.go b/cli/fields/info.go
@@ -134,7 +134,7 @@ func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
 	if cmd.name != "" {
 		fkey, cerr := m.FindKey(ctx, cmd.name)
 		if cerr != nil {
-			return err
+			return cerr
 		}
 		matches = func(key int32) bool {
 			return key == fkey

diff --git a/govc/test/fields.bats b/govc/test/fields.bats
@@ -35,7 +35,10 @@ load test_helper
   run govc fields.info vm/$vm_id
   assert_success
 
-  run govc fields.info -n $val vm/$vm_id
+  run govc fields.info -n "invalid" vm/$vm_id
+  assert_failure
+
+  run govc fields.info -n $field vm/$vm_id
   assert_success
 
   info=$(govc vm.info -json $vm_id | jq .virtualMachines[0].customValue[0])