Make registry extended tests dockerless

Author: Oleg Bulatov

test/extended/imageapis/limitrange_admission.go

@@ -5,27 +5,69 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/docker/distribution/registry/api/errcode"
+
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
+	"github.com/onsi/gomega/types"
 
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	quotautil "github.com/openshift/origin/pkg/quota/util"
 	imagesutil "github.com/openshift/origin/test/extended/images"
 	exutil "github.com/openshift/origin/test/extended/util"
-	testutil "github.com/openshift/origin/test/util"
 )
 
+type dockerErrorCodeMatcher struct {
+	expected errcode.ErrorCode
+}
+
+func BeDockerError(code errcode.ErrorCode) types.GomegaMatcher {
+	return &dockerErrorCodeMatcher{
+		expected: code,
+	}
+}
+
+func (matcher *dockerErrorCodeMatcher) Match(actual interface{}) (success bool, err error) {
+	switch e := actual.(type) {
+	case errcode.Errors:
+		for _, item := range e {
+			match, err := matcher.Match(item)
+			if err != nil {
+				return match, err
+			}
+			if match {
+				return true, nil
+			}
+		}
+		return false, nil
+	case errcode.Error:
+		return e.ErrorCode() == matcher.expected, nil
+	case errcode.ErrorCode:
+		return e == matcher.expected, nil
+	}
+	return false, fmt.Errorf("dockerErrorCodeMatcher got an expected error: %#+v", err)
+}
+
+func (matcher *dockerErrorCodeMatcher) FailureMessage(actual interface{}) (message string) {
+	return fmt.Sprintf("Expected\n\t%s (%#v)\nto be the error %s (%#v)", actual, actual, matcher.expected.String(), matcher.expected)
+}
+
+func (matcher *dockerErrorCodeMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+	return fmt.Sprintf("Expected\n\t%s (%#v)\nnot to be the error %s (%#v)", actual, actual, matcher.expected.String(), matcher.expected)
+}
+
 const limitRangeName = "limits"
 
-var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial][local] Image limit range", func() {
+var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial] Image limit range", func() {
 	defer g.GinkgoRecover()
+
 	var oc = exutil.NewCLI("limitrange-admission", exutil.KubeConfigPath())
 
-	g.JustBeforeEach(func() {
+	g.BeforeEach(func() {
 		g.By("waiting for default service account")
 		err := exutil.WaitForServiceAccount(oc.KubeClient().Core().ServiceAccounts(oc.Namespace()), "default")
 		o.Expect(err).NotTo(o.HaveOccurred())
@@ -34,102 +76,77 @@ var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/regis
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 
-	// needs to be run at the of of each It; cannot be run in AfterEach which is run after the project
-	// is destroyed
-	tearDown := func(oc *exutil.CLI) {
-		g.By(fmt.Sprintf("Deleting limit range %s", limitRangeName))
-		oc.AdminKubeClient().Core().LimitRanges(oc.Namespace()).Delete(limitRangeName, nil)
-
-		deleteTestImagesAndStreams(oc)
-	}
-
-	g.It(fmt.Sprintf("[Skipped] should deny a push of built image exceeding %s limit", imageapi.LimitTypeImage), func() {
-		g.Skip("FIXME: fill image metadata for schema1 in the registry")
-
-		defer tearDown(oc)
-
-		dClient, err := testutil.NewDockerClient()
-		o.Expect(err).NotTo(o.HaveOccurred())
-
-		_, err = createLimitRangeOfType(oc, imageapi.LimitTypeImage, kapi.ResourceList{
+	g.It(fmt.Sprintf("should deny a push of built image exceeding %s limit", imageapi.LimitTypeImage), func() {
+		_, err := createLimitRangeOfType(oc, imageapi.LimitTypeImage, kapi.ResourceList{
 			kapi.ResourceStorage: resource.MustParse("10Ki"),
 		})
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push an image exceeding size limit with just 1 layer"))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "middle", 16000, 1, false)
-		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "middle", 16000, 1)
+		o.Expect(err).To(BeDockerError(errcode.ErrorCodeDenied))
 
 		g.By(fmt.Sprintf("trying to push an image exceeding size limit in total"))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "middle", 16000, 5, false)
-		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "middle", 16000, 5)
+		o.Expect(err).To(BeDockerError(errcode.ErrorCodeDenied))
 
 		g.By(fmt.Sprintf("trying to push an image with one big layer below size limit"))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "small", 8000, 1, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "small", 8000, 1)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push an image below size limit"))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "small", 8000, 2, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "small", 8000, 2)
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 
 	g.It(fmt.Sprintf("should deny a push of built image exceeding limit on %s resource", imageapi.ResourceImageStreamImages), func() {
-
-		defer tearDown(oc)
-
 		limits := kapi.ResourceList{
 			imageapi.ResourceImageStreamTags:   resource.MustParse("0"),
 			imageapi.ResourceImageStreamImages: resource.MustParse("0"),
 		}
 		_, err := createLimitRangeOfType(oc, imageapi.LimitTypeImageStream, limits)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
-		dClient, err := testutil.NewDockerClient()
-		o.Expect(err).NotTo(o.HaveOccurred())
-
 		g.By(fmt.Sprintf("trying to push image exceeding limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "refused", imageSize, 1, false)
-		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "refused", imageSize, 1)
+		o.Expect(err).To(BeDockerError(errcode.ErrorCodeDenied))
 
 		limits, err = bumpLimit(oc, imageapi.ResourceImageStreamImages, "1")
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push image below limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "first", imageSize, 2, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "first", imageSize, 2)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push image exceeding limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "sized", "second", imageSize, 2, false)
-		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/sized", "second", imageSize, 2)
+		o.Expect(err).To(BeDockerError(errcode.ErrorCodeDenied))
 
 		g.By(fmt.Sprintf("trying to push image below limits %v to another image stream", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "another", "second", imageSize, 1, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/another", "second", imageSize, 1)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		limits, err = bumpLimit(oc, imageapi.ResourceImageStreamImages, "2")
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push image below limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "another", "third", imageSize, 1, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/another", "third", imageSize, 1)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push image exceeding limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "another", "fourth", imageSize, 1, false)
-		o.Expect(err).NotTo(o.HaveOccurred())
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/another", "fourth", imageSize, 1)
+		o.Expect(err).To(BeDockerError(errcode.ErrorCodeDenied))
 
 		g.By(`removing tag "second" from "another" image stream`)
 		err = oc.ImageClient().Image().ImageStreamTags(oc.Namespace()).Delete("another:second", nil)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By(fmt.Sprintf("trying to push image below limits %v", limits))
-		err = imagesutil.BuildAndPushImageOfSizeWithBuilder(oc, dClient, oc.Namespace(), "another", "replenish", imageSize, 1, true)
+		_, err = imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/another", "replenish", imageSize, 1)
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 
 	g.It(fmt.Sprintf("should deny a docker image reference exceeding limit on %s resource", imageapi.ResourceImageStreamTags), func() {
-
-		defer tearDown(oc)
-
 		tag2Image, err := buildAndPushTestImagesTo(oc, "src", "tag", 2)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
@@ -187,15 +204,12 @@ var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/regis
 	})
 
 	g.It(fmt.Sprintf("should deny an import of a repository exceeding limit on %s resource", imageapi.ResourceImageStreamTags), func() {
-
 		maxBulkImport, err := getMaxImagesBulkImportedPerRepository()
 		if err != nil {
 			g.Skip(err.Error())
 			return
 		}
 
-		defer tearDown(oc)
-
 		s1tag2Image, err := buildAndPushTestImagesTo(oc, "src1st", "tag", maxBulkImport+1)
 		s2tag2Image, err := buildAndPushTestImagesTo(oc, "src2nd", "t", 2)
 		o.Expect(err).NotTo(o.HaveOccurred())
@@ -234,23 +248,19 @@ var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/regis
 // buildAndPushTestImagesTo builds a given number of test images. The images are pushed to a new image stream
 // of given name under <tagPrefix><X> where X is a number of image starting from 1.
 func buildAndPushTestImagesTo(oc *exutil.CLI, isName string, tagPrefix string, numberOfImages int) (tag2Image map[string]imageapi.Image, err error) {
-	dClient, err := testutil.NewDockerClient()
-	if err != nil {
-		return
-	}
 	tag2Image = make(map[string]imageapi.Image)
 
 	for i := 1; i <= numberOfImages; i++ {
 		tag := fmt.Sprintf("%s%d", tagPrefix, i)
-		dgst, _, err := imagesutil.BuildAndPushImageOfSizeWithDocker(oc, dClient, isName, tag, imageSize, 2, g.GinkgoWriter, true, true)
+		dgst, err := imagesutil.BuildAndPushMockImage(oc, oc.Namespace()+"/"+isName, tag, imageSize, 2)
 		if err != nil {
 			return nil, err
 		}
 		ist, err := oc.ImageClient().Image().ImageStreamTags(oc.Namespace()).Get(isName+":"+tag, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
-		if dgst != ist.Image.Name {
+		if dgst.String() != ist.Image.Name {
 			return nil, fmt.Errorf("digest of built image does not match stored: %s != %s", dgst, ist.Image.Name)
 		}
 		tag2Image[tag] = ist.Image
@@ -316,7 +326,7 @@ func bumpLimit(oc *exutil.CLI, resourceName kapi.ResourceName, limit string) (ka
 func getMaxImagesBulkImportedPerRepository() (int, error) {
 	max := os.Getenv("MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY")
 	if len(max) == 0 {
-		return 0, fmt.Errorf("MAX_IMAGES_BULK_IMAGES_IMPORTED_PER_REPOSITORY is not set")
+		return 0, fmt.Errorf("MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY is not set")
 	}
 	return strconv.Atoi(max)
 }