Merge pull request #15694 from dmage/docker-distribution-2.6.2

Automatic merge from submit-queue

rebase to Docker Distribution v2.6.2

pkg/dockerregistry/testutil/manifests.go

@@ -17,6 +17,7 @@ import (
 	"github.com/docker/distribution/reference"
 	distclient "github.com/docker/distribution/registry/client"
 	"github.com/docker/distribution/registry/client/auth"
+	"github.com/docker/distribution/registry/client/auth/challenge"
 	"github.com/docker/distribution/registry/client/transport"
 	"github.com/docker/libtrust"
 
@@ -227,7 +228,7 @@ func CreateAndUploadTestManifest(
 
 	var rt http.RoundTripper
 	if creds != nil {
-		challengeManager := auth.NewSimpleChallengeManager()
+		challengeManager := challenge.NewSimpleManager()
 		_, err := ping(challengeManager, serverURL.String()+"/v2/", "")
 		if err != nil {
 			return "", "", "", nil, err

pkg/dockerregistry/testutil/util.go

@@ -17,6 +17,7 @@ import (
 	"github.com/docker/distribution/reference"
 	distclient "github.com/docker/distribution/registry/client"
 	"github.com/docker/distribution/registry/client/auth"
+	"github.com/docker/distribution/registry/client/auth/challenge"
 	"github.com/docker/distribution/registry/client/transport"
 	imageapiv1 "github.com/openshift/origin/pkg/image/apis/image/v1"
 )
@@ -39,7 +40,7 @@ func UploadBlob(
 
 	var rt http.RoundTripper
 	if creds != nil {
-		challengeManager := auth.NewSimpleChallengeManager()
+		challengeManager := challenge.NewSimpleManager()
 		_, err := ping(challengeManager, serverURL.String()+"/v2/", "")
 		if err != nil {
 			return distribution.Descriptor{}, err
@@ -232,7 +233,7 @@ func (tcs *testCredentialStore) SetRefreshToken(u *url.URL, service string, toke
 
 // ping pings the provided endpoint to determine its required authorization challenges.
 // If a version header is provided, the versions will be returned.
-func ping(manager auth.ChallengeManager, endpoint, versionHeader string) ([]auth.APIVersion, error) {
+func ping(manager challenge.Manager, endpoint, versionHeader string) ([]auth.APIVersion, error) {
 	resp, err := http.Get(endpoint)
 	if err != nil {
 		return nil, err

pkg/image/importer/client.go

@@ -21,6 +21,7 @@ import (
 	"github.com/docker/distribution/registry/api/errcode"
 	registryclient "github.com/docker/distribution/registry/client"
 	"github.com/docker/distribution/registry/client/auth"
+	"github.com/docker/distribution/registry/client/auth/challenge"
 	"github.com/docker/distribution/registry/client/transport"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,14 +46,14 @@ func NewContext(transport, insecureTransport http.RoundTripper) Context {
 	return Context{
 		Transport:         transport,
 		InsecureTransport: insecureTransport,
-		Challenges:        auth.NewSimpleChallengeManager(),
+		Challenges:        challenge.NewSimpleManager(),
 	}
 }
 
 type Context struct {
 	Transport         http.RoundTripper
 	InsecureTransport http.RoundTripper
-	Challenges        auth.ChallengeManager
+	Challenges        challenge.Manager
 }
 
 func (c Context) WithCredentials(credentials auth.CredentialStore) RepositoryRetriever {