Browse Source

Merge pull request #46924 from thaJeztah/vendor_singleflight

vendor: resenje.org/singleflight v0.4.1
Sebastiaan van Stijn 1 year ago
parent
commit
92884c25b3
4 changed files with 6 additions and 5 deletions
  1. 1 1
      vendor.mod
  2. 2 2
      vendor.sum
  3. 1 1
      vendor/modules.txt
  4. 2 1
      vendor/resenje.org/singleflight/singleflight.go

+ 1 - 1
vendor.mod

@@ -108,7 +108,7 @@ require (
 	google.golang.org/grpc v1.58.3
 	google.golang.org/protobuf v1.31.0
 	gotest.tools/v3 v3.5.1
-	resenje.org/singleflight v0.4.0
+	resenje.org/singleflight v0.4.1
 	tags.cncf.io/container-device-interface v0.6.2
 )
 

+ 2 - 2
vendor.sum

@@ -1944,8 +1944,8 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jC
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
 mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc=
 pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
-resenje.org/singleflight v0.4.0 h1:NdOEhCxEikK2S2WxGjZV9EGSsItolQKslOOi6pE1tJc=
-resenje.org/singleflight v0.4.0/go.mod h1:lAgQK7VfjG6/pgredbQfmV0RvG/uVhKo6vSuZ0vCWfk=
+resenje.org/singleflight v0.4.1 h1:ryGHRaOBwhnZLyf34LMDf4AsTSHrs4hdGPdG/I4Hmac=
+resenje.org/singleflight v0.4.1/go.mod h1:lAgQK7VfjG6/pgredbQfmV0RvG/uVhKo6vSuZ0vCWfk=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

+ 1 - 1
vendor/modules.txt

@@ -1508,7 +1508,7 @@ k8s.io/klog/v2/internal/clock
 k8s.io/klog/v2/internal/dbg
 k8s.io/klog/v2/internal/serialize
 k8s.io/klog/v2/internal/severity
-# resenje.org/singleflight v0.4.0
+# resenje.org/singleflight v0.4.1
 ## explicit; go 1.18
 resenje.org/singleflight
 # sigs.k8s.io/yaml v1.3.0

+ 2 - 1
vendor/resenje.org/singleflight/singleflight.go

@@ -82,8 +82,9 @@ func (g *Group[K, V]) wait(ctx context.Context, key K, c *call[V]) (v V, shared
 		c.cancel()
 		delete(g.calls, key)
 	}
+	shared = c.shared
 	g.mu.Unlock()
-	return v, c.shared, err
+	return v, shared, err
 }
 
 // Forget tells the singleflight to forget about a key. Future calls