Merge pull request #2850 from makelarisjr/issue-2849

dougm · web-flow · commit 28fe19b95518 · 2022-05-18T14:57:31.000-07:00
govc: Use unique searchFlagKey when calling NewSearchFlag
diff --git a/govc/flags/search.go b/govc/flags/search.go
@@ -54,9 +54,9 @@ type SearchFlag struct {
 	isset bool
 }
 
-var searchFlagKey = flagKey("search")
-
 func NewSearchFlag(ctx context.Context, t int) (*SearchFlag, context.Context) {
+	searchFlagKey := flagKey(fmt.Sprintf("search%d", t))
+
 	if v := ctx.Value(searchFlagKey); v != nil {
 		return v.(*SearchFlag), ctx
 	}

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ type SearchFlag struct {`
`54`	`54`	`isset bool`
`55`	`55`	`}`
`56`	`56`
`57`		`-var searchFlagKey = flagKey("search")`
`58`		`-`
`59`	`57`	`func NewSearchFlag(ctx context.Context, t int) (*SearchFlag, context.Context) {`
	`58`	`+ searchFlagKey := flagKey(fmt.Sprintf("search%d", t))`
	`59`	`+`
`60`	`60`	`if v := ctx.Value(searchFlagKey); v != nil {`
`61`	`61`	`return v.(*SearchFlag), ctx`
`62`	`62`	`}`