fix: govc fix field.info name (-n flag) validation

alingse · dougm · commit 3793a5b29110 · 2024-12-17T14:20:31.000-08:00
linter: check `cerr != nil` but return a nil value error `err`

Signed-off-by: alingse &lt;alingse@foxmail.com&gt;

uddate test case
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])

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (cmd info) Run(ctx context.Context, f flag.FlagSet) error {`
`134`	`134`	`if cmd.name != "" {`
`135`	`135`	`fkey, cerr := m.FindKey(ctx, cmd.name)`
`136`	`136`	`if cerr != nil {`
`137`		`- return err`
	`137`	`+ return cerr`
`138`	`138`	`}`
`139`	`139`	`matches = func(key int32) bool {`
`140`	`140`	`return key == fkey`