move the docker registry v1 client

hack/import-restrictions.json

@@ -42,11 +42,7 @@
     ],
     "ignoredSubTrees": [
       "github.com/openshift/origin/pkg/dockerregistry",
-      "github.com/openshift/origin/pkg/cmd/dockerregistry",
-      "github.com/openshift/origin/pkg/cmd/server/origin",
-      "github.com/openshift/origin/pkg/generate/app",
-      "github.com/openshift/origin/pkg/image/importer",
-      "github.com/openshift/origin/pkg/image/registry/imagestreamimport"
+      "github.com/openshift/origin/pkg/cmd/dockerregistry"
     ],
     "forbiddenImportPackageRoots": [
       "github.com/openshift/origin/pkg/dockerregistry"

pkg/cmd/server/bootstrappolicy/policy.go

@@ -127,8 +127,8 @@ func GetOpenshiftBootstrapClusterRoles() []rbac.ClusterRole {
 			},
 			Rules: []rbac.PolicyRule{
 				rbac.NewRule(rbac.VerbAll).Groups(rbac.APIGroupAll).Resources(rbac.ResourceAll).RuleOrDie(),
-				rbac.NewRule(rbac.VerbAll).URLs(rbac.NonResourceAll).RuleOrDie(),
-			},
+				rbac.NewRule(Die(),
+			},rbac.VerbAll).URLs(rbac.NonResourceAll).RuleOr
 		},
 		{
 			ObjectMeta: metav1.ObjectMeta{

pkg/cmd/server/origin/storage.go

@@ -12,10 +12,10 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 
 	authzapiv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapiv1 "github.com/openshift/origin/pkg/image/apis/image/v1"
 	"github.com/openshift/origin/pkg/image/importer"
 	imageimporter "github.com/openshift/origin/pkg/image/importer"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	"github.com/openshift/origin/pkg/image/registry/image"
 	imageetcd "github.com/openshift/origin/pkg/image/registry/image/etcd"
 	"github.com/openshift/origin/pkg/image/registry/imagesecret"

pkg/generate/app/cmd/newapp.go

@@ -30,13 +30,13 @@ import (
 	buildutil "github.com/openshift/origin/pkg/build/util"
 	"github.com/openshift/origin/pkg/client"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	"github.com/openshift/origin/pkg/generate"
 	"github.com/openshift/origin/pkg/generate/app"
 	"github.com/openshift/origin/pkg/generate/dockerfile"
 	"github.com/openshift/origin/pkg/generate/jenkinsfile"
 	"github.com/openshift/origin/pkg/generate/source"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	outil "github.com/openshift/origin/pkg/util"
 	dockerfileutil "github.com/openshift/origin/pkg/util/docker/dockerfile"
 )

pkg/generate/app/dockerimagelookup.go

@@ -13,8 +13,8 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 
 	"github.com/openshift/origin/pkg/client"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 )
 
 // DockerClient is the local interface for the docker client

pkg/image/importer/client.go

@@ -27,9 +27,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	"github.com/openshift/origin/pkg/image/apis/image/dockerpre012"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 )
 
 // ErrNotV2Registry is returned when the server does not report itself as a V2 Docker registry

pkg/image/importer/client_test.go

@@ -21,8 +21,8 @@ import (
 
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 )
 
 type mockRetriever struct {

pkg/dockerregistry/client.go → pkg/image/importer/dockerv1client/client.go

@@ -1,4 +1,4 @@
-package dockerregistry
+package dockerv1client
 
 import (
 	"crypto/tls"

pkg/dockerregistry/client_test.go → pkg/image/importer/dockerv1client/client_test.go

@@ -1,4 +1,4 @@
-package dockerregistry
+package dockerv1client
 
 import (
 	"fmt"
@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/openshift/origin/pkg/dockerregistry/testutil"
 )
 
 // tests of running registries are done in the integration client test
@@ -329,12 +327,12 @@ func TestImageManifest(t *testing.T) {
 			w.Write([]byte(`{}`))
 		case "/v2/test/image/manifests/latest", "/v2/test/image/manifests/" + manifestDigest:
 			if r.Method == "HEAD" {
-				w.Header().Set("Content-Length", fmt.Sprintf("%d", len(testutil.SampleImageManifestSchema1)))
+				w.Header().Set("Content-Length", fmt.Sprintf("%d", len(SampleImageManifestSchema1)))
 				w.Header().Set("Docker-Content-Digest", manifestDigest)
 				w.WriteHeader(http.StatusOK)
 				return
 			}
-			w.Write([]byte(testutil.SampleImageManifestSchema1))
+			w.Write([]byte(SampleImageManifestSchema1))
 		default:
 			t.Fatalf("unexpected request: %s %s", r.Method, r.URL.RequestURI())
 			return
@@ -353,10 +351,49 @@ func TestImageManifest(t *testing.T) {
 		t.Errorf("empty manifest")
 	}
 
-	if string(manifest) != testutil.SampleImageManifestSchema1 {
+	if string(manifest) != SampleImageManifestSchema1 {
 		t.Errorf("unexpected manifest: %#v", manifest)
 	}
 
 	<-called
 	<-called
 }
+
+const SampleImageManifestSchema1 = `{
+   "schemaVersion": 1,
+   "name": "nm/is",
+   "tag": "latest",
+   "architecture": "",
+   "fsLayers": [
+      {
+         "blobSum": "sha256:b2c5513bd934a7efb412c0dd965600b8cb00575b585eaff1cb980b69037fe6cd"
+      },
+      {
+         "blobSum": "sha256:2dde6f11a89463bf20dba3b47d8b3b6de7cdcc19e50634e95a18dd95c278768d"
+      }
+   ],
+   "history": [
+      {
+         "v1Compatibility": "{\"size\":18407936}"
+      },
+      {
+         "v1Compatibility": "{\"size\":19387392}"
+      }
+   ],
+   "signatures": [
+      {
+         "header": {
+            "jwk": {
+               "crv": "P-256",
+               "kid": "5HTY:A24B:L6PG:TQ3G:GMAK:QGKZ:ICD4:S7ZJ:P5JX:UTMP:XZLK:ZXVH",
+               "kty": "EC",
+               "x": "j5YnDSyrVIt3NquUKvcZIpbfeD8HLZ7BVBFL4WutRBM",
+               "y": "PBgFAZ3nNakYN3H9enhrdUrQ_HPYzb8oX5rtJxJo1Y8"
+            },
+            "alg": "ES256"
+         },
+         "signature": "1rXiEmWnf9eL7m7Wy3K4l25-Zv2XXl5GgqhM_yjT0ujPmTn0uwfHcCWlweHa9gput3sECj507eQyGpBOF5rD6Q",
+         "protected": "eyJmb3JtYXRMZW5ndGgiOjQ4NSwiZm9ybWF0VGFpbCI6IkNuMCIsInRpbWUiOiIyMDE2LTA3LTI2VDExOjQ2OjQ2WiJ9"
+      }
+   ]
+}`

pkg/image/importer/importer.go

@@ -22,8 +22,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/util/flowcontrol"
 
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	"github.com/openshift/origin/pkg/image/importer/dockerv1client"
 )
 
 // Add a dockerregistry.Client to the passed context with this key to support v1 Docker registry importing
@@ -577,7 +577,7 @@ func importRepositoryFromDockerV1(ctx gocontext.Context, repository *importRepos
 		applyErrorToRepository(repository, err)
 		return
 	}
-	client, ok := value.(dockerregistry.Client)
+	client, ok := value.(dockerv1client.Client)
 	if !ok {
 		err := kapierrors.NewForbidden(imageapi.Resource(""), "", fmt.Errorf("registry %q does not support the v2 Registry API", repository.Registry.Host))
 		err.ErrStatus.Reason = "NotV2Registry"

pkg/image/registry/imagestreamimport/rest.go

@@ -22,10 +22,10 @@ import (
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/client"
 	serverapi "github.com/openshift/origin/pkg/cmd/server/api"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageapiv1 "github.com/openshift/origin/pkg/image/apis/image/v1"
 	"github.com/openshift/origin/pkg/image/importer"
+	"github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	"github.com/openshift/origin/pkg/image/registry/imagestream"
 	quotautil "github.com/openshift/origin/pkg/quota/util"
 )
@@ -35,7 +35,7 @@ type ImporterFunc func(r importer.RepositoryRetriever) importer.Interface
 
 // ImporterDockerRegistryFunc returns an instance of a docker client that should be used per invocation of import,
 // may be nil if no legacy import capability is required.
-type ImporterDockerRegistryFunc func() dockerregistry.Client
+type ImporterDockerRegistryFunc func() dockerv1client.Client
 
 // REST implements the RESTStorage interface for ImageStreamImport
 type REST struct {

test/extended/registry/registry.go

@@ -11,8 +11,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	regclient "github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	regclient "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	imagesutil "github.com/openshift/origin/test/extended/images"
 	registryutil "github.com/openshift/origin/test/extended/registry/util"
 	exutil "github.com/openshift/origin/test/extended/util"

test/integration/dockerregistryclient_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/openshift/origin/pkg/dockerregistry"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 )
 
 const (

test/integration/imageimporter_test.go

@@ -22,9 +22,9 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 
 	"github.com/openshift/origin/pkg/client"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	"github.com/openshift/origin/pkg/image/importer"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	testutil "github.com/openshift/origin/test/util"
 	testserver "github.com/openshift/origin/test/util/server"
 

test/integration/newapp_test.go

@@ -33,7 +33,6 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	client "github.com/openshift/origin/pkg/client/testclient"
 	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	"github.com/openshift/origin/pkg/dockerregistry"
 	"github.com/openshift/origin/pkg/generate"
 	"github.com/openshift/origin/pkg/generate/app"
 	"github.com/openshift/origin/pkg/generate/app/cmd"
@@ -43,6 +42,7 @@ import (
 	"github.com/openshift/origin/pkg/generate/jenkinsfile"
 	"github.com/openshift/origin/pkg/generate/source"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	clicmd "github.com/openshift/origin/pkg/oc/cli/cmd"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"