From 97464a8392a1cf9edc5f45ced0bcb1d508d262c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:04:02 -0500 Subject: [PATCH] chore(deps): Bump github.com/vmware/govmomi from 0.33.1 to 0.37.0 (#15160) --- go.mod | 2 +- go.sum | 4 ++-- plugins/inputs/vsphere/finder.go | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ce3d69017..22a7b9f03 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( github.com/urfave/cli/v2 v2.27.1 github.com/vapourismo/knx-go v0.0.0-20240217175130-922a0d50c241 github.com/vjeantet/grok v1.0.1 - github.com/vmware/govmomi v0.33.1 + github.com/vmware/govmomi v0.37.0 github.com/wavefronthq/wavefront-sdk-go v0.15.0 github.com/x448/float16 v0.8.4 github.com/xdg/scram v1.0.5 diff --git a/go.sum b/go.sum index adb1ee8ee..ee3819670 100644 --- a/go.sum +++ b/go.sum @@ -2261,8 +2261,8 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vjeantet/grok v1.0.1 h1:2rhIR7J4gThTgcZ1m2JY4TrJZNgjn985U28kT2wQrJ4= github.com/vjeantet/grok v1.0.1/go.mod h1:ax1aAchzC6/QMXMcyzHQGZWaW1l195+uMYIkCWPCNIo= -github.com/vmware/govmomi v0.33.1 h1:qS2VpEBd/WLbzLO5McI6h5o5zaKsrezUxRY5r9jkW8A= -github.com/vmware/govmomi v0.33.1/go.mod h1:QuzWGiEMA/FYlu5JXKjytiORQoxv2hTHdS2lWnIqKMM= +github.com/vmware/govmomi v0.37.0 h1:xX5AnIrVn4yfH0fYSjyjMg/Kq6q7cNxA+vyfV5YcF70= +github.com/vmware/govmomi v0.37.0/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wavefronthq/wavefront-sdk-go v0.15.0 h1:po9E3vh/0y7kOx8D9EtFp7kbSLLLKbmu/w/s1xGJAQU= diff --git a/plugins/inputs/vsphere/finder.go b/plugins/inputs/vsphere/finder.go index 8928f74bd..9b9254205 100644 --- a/plugins/inputs/vsphere/finder.go +++ b/plugins/inputs/vsphere/finder.go @@ -65,9 +65,9 @@ func (f *Finder) Find(ctx context.Context, resType, path string, dst interface{} func (f *Finder) findResources(ctx context.Context, resType, path string, objs map[string]types.ObjectContent) error { p := strings.Split(path, "/") - flt := make([]property.Filter, len(p)-1) + flt := make([]property.Match, len(p)-1) for i := 1; i < len(p); i++ { - flt[i-1] = property.Filter{"name": p[i]} + flt[i-1] = property.Match{"name": p[i]} } err := f.descend(ctx, f.client.Client.ServiceContent.RootFolder, resType, flt, 0, objs) if err != nil { @@ -78,7 +78,7 @@ func (f *Finder) findResources(ctx context.Context, resType, path string, objs m } func (f *Finder) descend(ctx context.Context, root types.ManagedObjectReference, resType string, - tokens []property.Filter, pos int, objs map[string]types.ObjectContent) error { + tokens []property.Match, pos int, objs map[string]types.ObjectContent) error { isLeaf := pos == len(tokens)-1 // No more tokens to match? @@ -228,10 +228,10 @@ func (r *ResourceFilter) FindAll(ctx context.Context, dst interface{}) error { return r.finder.FindAll(ctx, r.resType, r.paths, r.excludePaths, dst) } -func matchName(f property.Filter, props []types.DynamicProperty) bool { +func matchName(f property.Match, props []types.DynamicProperty) bool { for _, prop := range props { if prop.Name == "name" { - return f.MatchProperty(prop) + return f.Property(prop) } } return false