govc: support use of service version via GOVC_VIM_VERSION env var

dougm · dougm · commit 2bbc6d83724a · 2024-10-09T12:19:43.000-07:00
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.
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
 

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ func (flag ClientFlag) Client() (vim25.Client, error) {`
`381`	`381`	`return nil, err`
`382`	`382`	`}`
`383`	`383`
`384`		`- if flag.vimVersion == "" {`
	`384`	`+ if flag.vimVersion == "" \|\| flag.vimVersion == "-" {`
`385`	`385`	`err = c.UseServiceVersion()`
`386`	`386`	`if err != nil {`
`387`	`387`	`return nil, err`