Merge pull request #3587 from dougm/vim-version

govc: support use of service version via GOVC_VIM_VERSION env var
vmware · Oct 9, 2024 · 892dbcf · 892dbcf
2 parents a11d573 + 2bbc6d8
commit 892dbcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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