From 3793a5b29110cfc491f7d00251c520e3e79120fb Mon Sep 17 00:00:00 2001 From: alingse Date: Sun, 15 Dec 2024 19:41:26 +0800 Subject: [PATCH] fix: govc fix field.info name (-n flag) validation linter: check `cerr != nil` but return a nil value error `err` Signed-off-by: alingse uddate test case --- cli/fields/info.go | 2 +- govc/test/fields.bats | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/fields/info.go b/cli/fields/info.go index 52ec28eab..7745aca18 100644 --- 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 index cb97d628e..51df71915 100755 --- 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])