Fix tag pagination

registry/docker/json.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/http"
 	"regexp"
+	"strings"
 )
 
 var ErrNoMorePages = errors.New("no more pages")
@@ -29,11 +30,11 @@ func getNextLink(resp *http.Response) (string, error) {
 	return "", ErrNoMorePages
 }
 
-// getPaginatedJSON accepts a string and a pointer, and returns the
+// getPaginatedJson accepts a string and a pointer, and returns the
 // next page URL while updating pointed-to variable with a parsed JSON
 // value. When there are no more pages it returns `ErrNoMorePages`.
-func (registry *Registry) getPaginatedJSON(url string, response interface{}) (string, error) {
-	resp, err := registry.Client.Get(registry.url(url))
+func (r *Registry) getPaginatedJSON(url string, response interface{}) (string, error) {
+	resp, err := r.Client.Get(url)
 	if err != nil {
 		return "", err
 	}
@@ -44,5 +45,14 @@ func (registry *Registry) getPaginatedJSON(url string, response interface{}) (st
 	if err != nil {
 		return "", err
 	}
-	return getNextLink(resp)
+	next, err := getNextLink(resp)
+	if err != nil {
+		return "", err
+	}
+
+	if !strings.HasPrefix(next, r.URL) {
+		next = r.URL + next
+	}
+
+	return next, nil
 }

registry/docker/manifest.go

@@ -11,22 +11,22 @@ import (
 )
 
 // ManifestDigest - get manifest digest
-func (registry *Registry) ManifestDigest(repository, reference string) (digest.Digest, error) {
-	url := registry.url("/v2/%s/manifests/%s", repository, reference)
-	registry.Logf("registry.manifest.head url=%s repository=%s reference=%s", url, repository, reference)
+func (r *Registry) ManifestDigest(repository, reference string) (digest.Digest, error) {
+	url := r.url("/v2/%s/manifests/%s", repository, reference)
+	r.Logf("registry.manifest.head url=%s repository=%s reference=%s", url, repository, reference)
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return "", err
 	}
 
 	req.Header.Set("Accept", manifestv2.MediaTypeManifest)
-	resp, err := registry.Client.Do(req)
+	resp, err := r.Client.Do(req)
 	if err != nil {
 		// Try OCI headers if error relates to OCI
 		if strings.Contains(err.Error(), "OCI index found, but accept header does not support OCI indexes") {
 			req.Header.Set("Accept", oci.MediaTypeImageIndex)
-			resp, err = registry.Client.Do(req)
+			resp, err = r.Client.Do(req)
 		}
 		if err != nil {
 			return "", err

registry/docker/registry.go

@@ -105,10 +105,6 @@ type tagsResponse struct {
 
 func (r *Registry) url(pathTemplate string, args ...interface{}) string {
 	pathSuffix := fmt.Sprintf(pathTemplate, args...)
-	if strings.HasPrefix(pathSuffix, r.URL) {
-		return pathSuffix
-	}
-
 	url := fmt.Sprintf("%s%s", r.URL, pathSuffix)
 
 	return url

registry/docker/tags.go

@@ -1,12 +1,12 @@
 package docker
 
-func (registry *Registry) Tags(repository string) (tags []string, err error) {
-	url := registry.url("/v2/%s/tags/list", repository)
+func (r *Registry) Tags(repository string) (tags []string, err error) {
+	url := r.url("/v2/%s/tags/list", repository)
 
 	var response tagsResponse
 	for {
-		registry.Logf("registry.tags url=%s repository=%s", url, repository)
-		url, err = registry.getPaginatedJSON(url, &response)
+		r.Logf("registry.tags url=%s repository=%s", url, repository)
+		url, err = r.getPaginatedJSON(url, &response)
 		switch err {
 		case ErrNoMorePages:
 			tags = append(tags, response.Tags...)