Refactor manifest list operations

* Update method/function signatures use the manifest list name and
  images associated with the operation explicitly, in general

  func f(ctx context.Context, manifestListName string,
         ImageNames []string, options *fOptions)

* Leverage gorilla/mux Subrouters to support API v3.x and v4.x for
  manifests
* Make manifest API endpoints more RESTful
* Add PUT /manifest/{id} to update existing manifests
* Add manifests.Annotate to go bindings, uncommented unit test
* Add DELETE /manifest/{Id} to remove existing manifest list, use
  PUT /manifest/{id} to remove images from a list
* Deprecated POST /manifest/{id}/add and /manifest/{id}/remove, use
  PUT /manifest/{id} instead
* Corrected swagger godoc and updated to cover API changes
* Update podman manifest commands to use registry.Context()
* Expose utils.GetVar() to obtain query parameters by name
* Unexpose server.registerSwaggerHandlers, not sure why this was ever
  exposed.
* Refactored code to use http.Header instead of map[string]string when
  operating on HTTP headers.
* Add API-Version header support in bindings to allow calling explicate
  versions of the API. Header is _NOT_ forwarded to the API service.

Signed-off-by: Jhon Honce <jhonce@redhat.com>

1 files changed, 72 insertions, 52 deletions

diff --git a/pkg/bindings/test/manifests_test.go b/pkg/bindings/test/manifests_test.go
index e65632057..280006d15 100644
--- a/pkg/bindings/test/manifests_test.go
+++ b/pkg/bindings/test/manifests_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/onsi/gomega/gexec"
 )
 
-var _ = Describe("Podman containers ", func() {
+var _ = Describe("podman manifest", func() {
 	var (
 		bt *bindingTest
 		s  *gexec.Session
@@ -24,7 +24,8 @@ var _ = Describe("Podman containers ", func() {
 		s = bt.startAPIService()
 		time.Sleep(1 * time.Second)
 		err := bt.NewConnection()
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 	})
 
 	AfterEach(func() {
@@ -32,17 +33,19 @@ var _ = Describe("Podman containers ", func() {
 		bt.cleanup()
 	})
 
-	It("create manifest", func() {
+	It("create", func() {
 		// create manifest list without images
-		id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
-		Expect(err).To(BeNil())
+		id, err := manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", []string{}, nil)
+		Expect(err).ToNot(HaveOccurred(), err)
 		list, err := manifests.Inspect(bt.conn, id, nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 		Expect(len(list.Manifests)).To(BeZero())
 
 		// creating a duplicate should fail as a 500
-		_, err = manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
-		Expect(err).ToNot(BeNil())
+		_, err = manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", nil, nil)
+		Expect(err).To(HaveOccurred())
+
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
 
@@ -50,96 +53,113 @@ var _ = Describe("Podman containers ", func() {
 		Expect(len(errs)).To(BeZero())
 
 		// create manifest list with images
-		id, err = manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{alpine.name}, nil)
-		Expect(err).To(BeNil())
+		id, err = manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", []string{alpine.name}, nil)
+		Expect(err).ToNot(HaveOccurred())
+
 		list, err = manifests.Inspect(bt.conn, id, nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 		Expect(len(list.Manifests)).To(BeNumerically("==", 1))
 	})
 
-	It("inspect bogus manifest", func() {
+	It("inspect", func() {
 		_, err := manifests.Inspect(bt.conn, "larry", nil)
-		Expect(err).ToNot(BeNil())
+		Expect(err).To(HaveOccurred())
+
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 	})
 
-	It("add manifest", func() {
+	It("add", func() {
 		// add to bogus should 404
 		_, err := manifests.Add(bt.conn, "foobar", nil)
-		Expect(err).ToNot(BeNil())
+		Expect(err).To(HaveOccurred())
+
 		code, _ := bindings.CheckResponseCode(err)
-		Expect(code).To(BeNumerically("==", http.StatusNotFound))
+		Expect(code).To(BeNumerically("==", http.StatusNotFound), err.Error())
+
+		id, err := manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", []string{}, nil)
+		Expect(err).ToNot(HaveOccurred())
 
-		id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
-		Expect(err).To(BeNil())
 		options := new(manifests.AddOptions).WithImages([]string{alpine.name})
 		_, err = manifests.Add(bt.conn, id, options)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 		list, err := manifests.Inspect(bt.conn, id, nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 		Expect(len(list.Manifests)).To(BeNumerically("==", 1))
 
 		// add bogus name to existing list should fail
 		options.WithImages([]string{"larry"})
 		_, err = manifests.Add(bt.conn, id, options)
-		Expect(err).ToNot(BeNil())
+		Expect(err).To(HaveOccurred())
+
 		code, _ = bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
 	})
 
-	It("remove manifest", func() {
+	It("remove digest", func() {
 		// removal on bogus manifest list should be 404
 		_, err := manifests.Remove(bt.conn, "larry", "1234", nil)
-		Expect(err).ToNot(BeNil())
+		Expect(err).To(HaveOccurred())
+
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
-		id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{alpine.name}, nil)
-		Expect(err).To(BeNil())
+		id, err := manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", []string{alpine.name}, nil)
+		Expect(err).ToNot(HaveOccurred())
+
 		data, err := manifests.Inspect(bt.conn, id, nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
+
 		Expect(len(data.Manifests)).To(BeNumerically("==", 1))
 
 		// removal on a good manifest list with a bad digest should be 400
 		_, err = manifests.Remove(bt.conn, id, "!234", nil)
-		Expect(err).ToNot(BeNil())
+		Expect(err).To(HaveOccurred())
+
 		code, _ = bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusBadRequest))
 
 		digest := data.Manifests[0].Digest.String()
 		_, err = manifests.Remove(bt.conn, id, digest, nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 
 		// removal on good manifest with good digest should work
 		data, err = manifests.Inspect(bt.conn, id, nil)
-		Expect(err).To(BeNil())
-		Expect(len(data.Manifests)).To(BeZero())
+		Expect(err).ToNot(HaveOccurred())
+
+		Expect(data.Manifests).Should(BeEmpty())
 	})
 
-	// There is NO annotate endpoint, this could never work.:w
-
-	//It("annotate manifest", func() {
-	//	id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
-	//	Expect(err).To(BeNil())
-	//	opts := image.ManifestAddOpts{Images: []string{"docker.io/library/alpine:latest"}}
-	//
-	//	_, err = manifests.Add(bt.conn, id, opts)
-	//	Expect(err).To(BeNil())
-	//	data, err := manifests.Inspect(bt.conn, id)
-	//	Expect(err).To(BeNil())
-	//	Expect(len(data.Manifests)).To(BeNumerically("==", 1))
-	//	digest := data.Manifests[0].Digest.String()
-	//	annoOpts := image.ManifestAnnotateOpts{OS: "foo"}
-	//	_, err = manifests.Annotate(bt.conn, id, digest, annoOpts)
-	//	Expect(err).To(BeNil())
-	//	list, err := manifests.Inspect(bt.conn, id)
-	//	Expect(err).To(BeNil())
-	//	Expect(len(list.Manifests)).To(BeNumerically("==", 1))
-	//	Expect(list.Manifests[0].Platform.OS).To(Equal("foo"))
-	//})
+	It("annotate", func() {
+		id, err := manifests.Create(bt.conn, "quay.io/libpod/foobar:latest", []string{}, nil)
+		Expect(err).ToNot(HaveOccurred())
+
+		opts := manifests.AddOptions{Images: []string{"quay.io/libpod/alpine:latest"}}
+
+		_, err = manifests.Add(bt.conn, id, &opts)
+		Expect(err).ToNot(HaveOccurred())
+
+		data, err := manifests.Inspect(bt.conn, id, nil)
+		Expect(err).ToNot(HaveOccurred())
+
+		Expect(len(data.Manifests)).To(BeNumerically("==", 1))
+
+		digest := data.Manifests[0].Digest.String()
+		annoOpts := new(manifests.ModifyOptions).WithOS("foo")
+		_, err = manifests.Annotate(bt.conn, id, []string{digest}, annoOpts)
+		Expect(err).ToNot(HaveOccurred())
+
+		list, err := manifests.Inspect(bt.conn, id, nil)
+		Expect(err).ToNot(HaveOccurred())
+
+		Expect(len(list.Manifests)).To(BeNumerically("==", 1))
+		Expect(list.Manifests[0].Platform.OS).To(Equal("foo"))
+	})
 
 	It("push manifest", func() {
-		Skip("TODO")
+		Skip("TODO: implement test for manifest push to registry")
 	})
 })