mirror of
https://github.com/containers/skopeo.git
synced 2025-09-08 18:19:37 +00:00
Update github.com/containerd/containerd to v1.5.7
... to include a fix for https://github.com/advisories/GHSA-c2h3-6mxw-7mvq . (Note that Skopeo doesn't depend on the vulnerable code, so this is primarily to avoid dependency checker warnings.) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
10
vendor/google.golang.org/grpc/resolver_conn_wrapper.go
generated
vendored
10
vendor/google.golang.org/grpc/resolver_conn_wrapper.go
generated
vendored
@@ -39,6 +39,8 @@ type ccResolverWrapper struct {
|
||||
resolver resolver.Resolver
|
||||
done *grpcsync.Event
|
||||
curState resolver.State
|
||||
|
||||
incomingMu sync.Mutex // Synchronizes all the incoming calls.
|
||||
}
|
||||
|
||||
// newCCResolverWrapper uses the resolver.Builder to build a Resolver and
|
||||
@@ -90,6 +92,8 @@ func (ccr *ccResolverWrapper) close() {
|
||||
}
|
||||
|
||||
func (ccr *ccResolverWrapper) UpdateState(s resolver.State) error {
|
||||
ccr.incomingMu.Lock()
|
||||
defer ccr.incomingMu.Unlock()
|
||||
if ccr.done.HasFired() {
|
||||
return nil
|
||||
}
|
||||
@@ -105,6 +109,8 @@ func (ccr *ccResolverWrapper) UpdateState(s resolver.State) error {
|
||||
}
|
||||
|
||||
func (ccr *ccResolverWrapper) ReportError(err error) {
|
||||
ccr.incomingMu.Lock()
|
||||
defer ccr.incomingMu.Unlock()
|
||||
if ccr.done.HasFired() {
|
||||
return
|
||||
}
|
||||
@@ -114,6 +120,8 @@ func (ccr *ccResolverWrapper) ReportError(err error) {
|
||||
|
||||
// NewAddress is called by the resolver implementation to send addresses to gRPC.
|
||||
func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
|
||||
ccr.incomingMu.Lock()
|
||||
defer ccr.incomingMu.Unlock()
|
||||
if ccr.done.HasFired() {
|
||||
return
|
||||
}
|
||||
@@ -128,6 +136,8 @@ func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
|
||||
// NewServiceConfig is called by the resolver implementation to send service
|
||||
// configs to gRPC.
|
||||
func (ccr *ccResolverWrapper) NewServiceConfig(sc string) {
|
||||
ccr.incomingMu.Lock()
|
||||
defer ccr.incomingMu.Unlock()
|
||||
if ccr.done.HasFired() {
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user