Skip to content

internal/registryclient: minor cleanups #6744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thaJeztah wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −16
Open

internal/registryclient: minor cleanups #6744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d61519f
internal/registryclient: allEndpoints: pass through context
thaJeztah Jan 14, 2026
816f455
internal/registryclient: simplify notFoundError
thaJeztah Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions internal/registryclient/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func continueOnError(err error) bool {
}

func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named, each func(context.Context, distribution.Repository, reference.Named) (bool, error)) error {
endpoints, err := allEndpoints(namedRef, c.insecureRegistry)
endpoints, err := allEndpoints(ctx, namedRef, c.insecureRegistry)
if err != nil {
return err
}
Expand Down Expand Up @@ -271,11 +271,11 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
return nil
}
}
return newNotFoundError(namedRef.String())
return notFoundError{errors.New("no such manifest: " + namedRef.String())}
}

// allEndpoints returns a list of endpoints ordered by priority (v2, http).
func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
func allEndpoints(ctx context.Context, namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
var serviceOpts registry.ServiceOptions
if insecure {
logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef))
Expand All @@ -285,22 +285,11 @@ func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoi
if err != nil {
return nil, err
}
endpoints, err := registryService.Endpoints(context.TODO(), reference.Domain(namedRef))
endpoints, err := registryService.Endpoints(ctx, reference.Domain(namedRef))
logrus.Debugf("endpoints for %s: %v", namedRef, endpoints)
return endpoints, err
}

func newNotFoundError(ref string) *notFoundError {
return &notFoundError{err: errors.New("no such manifest: " + ref)}
}

type notFoundError struct {
err error
}

func (n *notFoundError) Error() string {
return n.err.Error()
}
type notFoundError struct{ error }

// NotFound satisfies interface github.com/docker/docker/errdefs.ErrNotFound
func (notFoundError) NotFound() {}
Loading