From 2bbc6d83724aaf179821fc8e2e760547ea47180d Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Wed, 9 Oct 2024 12:19:43 -0700 Subject: [PATCH] govc: support use of service version via GOVC_VIM_VERSION env var When the '-vim-version' flag is set to an empty value "", service version is used. Doing the same with a value of "-" allows service version to be used via the env var. --- govc/flags/client.go | 2 +- govc/test/cli.bats | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/govc/flags/client.go b/govc/flags/client.go index b36ebdf90..d4a6b19a8 100644 --- a/govc/flags/client.go +++ b/govc/flags/client.go @@ -381,7 +381,7 @@ func (flag *ClientFlag) Client() (*vim25.Client, error) { return nil, err } - if flag.vimVersion == "" { + if flag.vimVersion == "" || flag.vimVersion == "-" { err = c.UseServiceVersion() if err != nil { return nil, err diff --git a/govc/test/cli.bats b/govc/test/cli.bats index e91bdb846..1ded8c2b2 100755 --- a/govc/test/cli.bats +++ b/govc/test/cli.bats @@ -34,6 +34,9 @@ load test_helper version=$(govc about -json -c -vim-version "" | jq -r .client.version) assert_equal uE53DA "$version" # vcsim's service version + version=$(env GOVC_VIM_VERSION=- govc about -json -c | jq -r .client.version) + assert_equal uE53DA "$version" # vcsim's service version + version=$(govc about -json -c -vim-version 6.8.2 | jq -r .client.version) assert_equal 6.8.2 "$version" # client specified version