Fall back to puller if reusing pusher fails (#1676)

jonjohnsonjr · web-flow · commit b7c6e9dc3944 · 2023-04-25T10:23:51.000-07:00
diff --git a/pkg/v1/remote/puller.go b/pkg/v1/remote/puller.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"sync"
 
+	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/partial"
@@ -78,10 +79,10 @@ func (p *Puller) fetcher(ctx context.Context, target resource) (*fetcher, error)
 	if p.o.pusher != nil {
 		if repo, ok := target.(name.Repository); ok {
 			w, err := p.o.pusher.writer(ctx, repo, p.o)
-			if err != nil {
-				return nil, err
+			if err == nil {
+				return fetcherFromWriter(w.w), nil
 			}
-			return fetcherFromWriter(w.w), nil
+			logs.Debug.Printf("reusing Pusher failed: %v", err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"context"`
`19`	`19`	`"sync"`
`20`	`20`
	`21`	`+ "github.com/google/go-containerregistry/pkg/logs"`
`21`	`22`	`"github.com/google/go-containerregistry/pkg/name"`
`22`	`23`	`v1 "github.com/google/go-containerregistry/pkg/v1"`
`23`	`24`	`"github.com/google/go-containerregistry/pkg/v1/partial"`
`@@ -78,10 +79,10 @@ func (p Puller) fetcher(ctx context.Context, target resource) (fetcher, error)`
`78`	`79`	`if p.o.pusher != nil {`
`79`	`80`	`if repo, ok := target.(name.Repository); ok {`
`80`	`81`	`w, err := p.o.pusher.writer(ctx, repo, p.o)`
`81`		`- if err != nil {`
`82`		`- return nil, err`
	`82`	`+ if err == nil {`
	`83`	`+ return fetcherFromWriter(w.w), nil`
`83`	`84`	`}`
`84`		`- return fetcherFromWriter(w.w), nil`
	`85`	`+ logs.Debug.Printf("reusing Pusher failed: %v", err)`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`