Add support for layers in fake client testing and unit tests

Author: smarterclayton

pkg/dockerregistry/server/repository_test.go

@@ -99,6 +99,7 @@ func TestRepositoryBlobStat(t *testing.T) {
 		stat               string
 		images             []imageapiv1.Image
 		imageStreams       []imageapiv1.ImageStream
+		imageStreamLayers  []imageapiv1.ImageStreamLayers
 		skipAuth           bool
 		deferredErrors     deferredErrors
 		expectedDescriptor distribution.Descriptor
@@ -141,7 +142,7 @@ func TestRepositoryBlobStat(t *testing.T) {
 		},
 
 		{
-			name:   "blob referenced only by unmanaged image with pullthrough on",
+			name:   "blob referenced only by unmanaged image with pullthrough on and server doesn't support layers subresource",
 			stat:   "nm/unmanaged@" + testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].Name,
 			images: []imageapiv1.Image{*testImages["nm/unmanaged:missing-layer-links"][0]},
 			imageStreams: []imageapiv1.ImageStream{
@@ -168,6 +169,87 @@ func TestRepositoryBlobStat(t *testing.T) {
 			expectedActions:    []clientAction{{"get", "imagestreams/layers"}, {"get", "imagestreams"}, {"get", "images"}},
 		},
 
+		{
+			name: "blob not referenced and server supports layers subresource",
+			stat: "nm/unmanaged@" + testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].Name,
+			imageStreams: []imageapiv1.ImageStream{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "nm",
+						Name:      "unmanaged",
+					},
+					Status: imageapiv1.ImageStreamStatus{
+						Tags: []imageapiv1.NamedTagEventList{
+							{
+								Tag: "latest",
+								Items: []imageapiv1.TagEvent{
+									{
+										Image: testImages["nm/unmanaged:missing-layer-links"][0].Name,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			imageStreamLayers: []imageapiv1.ImageStreamLayers{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "nm",
+						Name:      "unmanaged",
+					},
+					Blobs: map[string]imageapiv1.ImageLayerData{
+						testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].Name: {
+							LayerSize: &testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].LayerSize,
+							MediaType: testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].MediaType,
+						},
+					},
+					Images: map[string]imageapiv1.ImageBlobReferences{
+						testImages["nm/unmanaged:missing-layer-links"][0].Name: {
+							Layers: []string{
+								testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].Name,
+							},
+						},
+					},
+				},
+			},
+			expectedError:   distribution.ErrBlobUnknown,
+			expectedActions: []clientAction{{"get", "imagestreams/layers"}, {"get", "imagestreams"}, {"get", "imagestreams/secrets"}},
+		},
+
+		{
+			name: "blob referenced only by unmanaged image with pullthrough on and server supports layers subresource",
+			stat: "nm/unmanaged@" + testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].Name,
+			imageStreamLayers: []imageapiv1.ImageStreamLayers{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "nm",
+						Name:      "unmanaged",
+					},
+					Blobs: map[string]imageapiv1.ImageLayerData{
+						testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].Name: {
+							LayerSize: &testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].LayerSize,
+							MediaType: testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].MediaType,
+						},
+						testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].Name: {
+							LayerSize: &testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].LayerSize,
+							MediaType: testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].MediaType,
+						},
+					},
+					Images: map[string]imageapiv1.ImageBlobReferences{
+						testImages["nm/unmanaged:missing-layer-links"][0].Name: {
+							Layers: []string{
+								testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[0].Name,
+								testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1].Name,
+							},
+						},
+					},
+				},
+			},
+			expectedDescriptor: testNewDescriptorForLayer(testImages["nm/unmanaged:missing-layer-links"][0].DockerImageLayers[1]),
+			expectedActions:    []clientAction{{"get", "imagestreams/layers"}},
+		},
+
 		{
 			// TODO: this should err out because of missing image stream.
 			// Unfortunately, it's not the case. Until we start storing layer links in etcd, we depend on
@@ -312,6 +394,13 @@ func TestRepositoryBlobStat(t *testing.T) {
 				}
 			}
 
+			for _, image := range tc.imageStreamLayers {
+				_, err = fos.CreateImageStreamLayers(image.Namespace, &image)
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+
 			reg, err := newTestRegistry(ctx, registryclient.NewFakeRegistryAPIClient(nil, imageClient), driver, cfg.Cache.BlobRepositoryTTL, true)
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)

pkg/testutil/fakeopenshift.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/docker/distribution/context"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -23,17 +24,19 @@ type FakeOpenShift struct {
 	logger context.Logger
 	mu     sync.Mutex
 
-	images       map[string]imageapiv1.Image
-	imageStreams map[string]imageapiv1.ImageStream
+	images            map[string]imageapiv1.Image
+	imageStreams      map[string]imageapiv1.ImageStream
+	imageStreamLayers map[string]imageapiv1.ImageStreamLayers
 }
 
 // NewFakeOpenShift constructs the fake OpenShift reactors.
 func NewFakeOpenShift(ctx context.Context) *FakeOpenShift {
 	return &FakeOpenShift{
 		logger: context.GetLogger(ctx),
 
-		images:       make(map[string]imageapiv1.Image),
-		imageStreams: make(map[string]imageapiv1.ImageStream),
+		images:            make(map[string]imageapiv1.Image),
+		imageStreams:      make(map[string]imageapiv1.ImageStream),
+		imageStreamLayers: make(map[string]imageapiv1.ImageStreamLayers),
 	}
 }
 
@@ -319,6 +322,39 @@ func (fos *FakeOpenShift) GetImageStreamImage(namespace string, id string) (*ima
 	return &isi, nil
 }
 
+func (fos *FakeOpenShift) CreateImageStreamLayers(namespace string, is *imageapiv1.ImageStreamLayers) (*imageapiv1.ImageStreamLayers, error) {
+	fos.mu.Lock()
+	defer fos.mu.Unlock()
+
+	ref := fmt.Sprintf("%s/%s", namespace, is.Name)
+
+	_, ok := fos.imageStreamLayers[ref]
+	if ok {
+		return nil, errors.NewAlreadyExists(imageapiv1.Resource("imagestreams/layers"), is.Name)
+	}
+
+	is.Namespace = namespace
+	is.CreationTimestamp = metav1.Now()
+
+	fos.imageStreamLayers[ref] = *is
+	fos.logger.Debugf("(*FakeOpenShift).imageStreamLayers[%q] created", ref)
+
+	return is, nil
+}
+
+func (fos *FakeOpenShift) GetImageStreamLayers(namespace, repo string) (*imageapiv1.ImageStreamLayers, error) {
+	fos.mu.Lock()
+	defer fos.mu.Unlock()
+
+	ref := fmt.Sprintf("%s/%s", namespace, repo)
+
+	is, ok := fos.imageStreamLayers[ref]
+	if !ok {
+		return nil, errors.NewNotFound(imageapiv1.Resource("imagestreams/layers"), repo)
+	}
+	return &is, nil
+}
+
 func (fos *FakeOpenShift) getName(action clientgotesting.Action) string {
 	if getnamer, ok := action.(interface {
 		GetName() string
@@ -375,8 +411,27 @@ func (fos *FakeOpenShift) imageStreamsHandler(action clientgotesting.Action) (bo
 		fmt.Sprintf("(*FakeOpenShift).imageStreamsHandler: %s %s/%s",
 			action.GetVerb(), action.GetNamespace(), fos.getName(action)),
 		func() (bool, runtime.Object, error) {
-			if len(action.GetSubresource()) > 0 {
-				// ATM neither secrets nor any other subresource is handled here
+			switch action.GetSubresource() {
+			case "":
+			case "layers":
+				switch action := action.(type) {
+				case clientgotesting.GetActionImpl:
+					is, err := fos.GetImageStreamLayers(
+						action.GetNamespace(),
+						action.GetName(),
+					)
+					return true, is, err
+				default:
+					return fos.todo(action)
+				}
+			case "secrets":
+				switch action := action.(type) {
+				case clientgotesting.GetActionImpl:
+					return true, &corev1.SecretList{}, nil
+				default:
+					return fos.todo(action)
+				}
+			default:
 				return fos.todo(action)
 			}