WIP: Push pull to image registry

cmd/duffle/bundle.go

@@ -22,6 +22,8 @@ func newBundleCmd(w io.Writer) *cobra.Command {
 		newBundleSignCmd(w),
 		newBundleVerifyCmd(w),
 		newBundleRemoveCmd(w),
+		newBundlePushCmd(w),
+		newBundlePullCmd(w),
 	)
 	return cmd
 }

cmd/duffle/bundle_list.go

@@ -79,7 +79,7 @@ func newBundleListCmd(w io.Writer) *cobra.Command {
 			}
 
 			for _, ref := range references {
-				fmt.Println(ref.Name())
+				fmt.Println(ref)
 			}
 
 			return nil

cmd/duffle/bundle_pull.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/flags"
+	"github.com/spf13/cobra"
+
+	"github.com/deis/duffle/pkg/crypto/digest"
+	"github.com/deis/duffle/pkg/duffle/home"
+	"github.com/deis/duffle/pkg/image"
+)
+
+func newBundlePullCmd(w io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "pull BUNDLE",
+		Short: "pull a bundle from an image registry",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cli := command.NewDockerCli(os.Stdin, os.Stdout, os.Stderr, false)
+			if err := cli.Initialize(flags.NewClientOptions()); err != nil {
+				return err
+			}
+			signedBundle, err := image.PullBundle(context.TODO(), cli, args[0])
+			if err != nil {
+				return err
+			}
+			sha, err := digest.OfBuffer(signedBundle)
+			if err != nil {
+				return fmt.Errorf("cannot compute digest from bundle: %v", err)
+			}
+
+			h := home.Home(homePath())
+			fpath := filepath.Join(h.Bundles(), sha)
+			if err := ioutil.WriteFile(fpath, signedBundle, 0644); err != nil {
+				return err
+			}
+
+			parts := strings.Split(args[0], ":")
+			if len(parts) != 2 {
+				return fmt.Errorf("%s is of a wrong format, must be repo:tag", args[0])
+			}
+			name, version := parts[0], parts[1]
+			return recordBundleReference(h, name, version, sha)
+		},
+	}
+	return cmd
+}

cmd/duffle/bundle_push.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/flags"
+	"github.com/spf13/cobra"
+
+	"github.com/deis/duffle/pkg/duffle/home"
+	"github.com/deis/duffle/pkg/image"
+	"github.com/deis/duffle/pkg/repo"
+)
+
+func newBundlePushCmd(w io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "push BUNDLE",
+		Short: "push a bundle to an image registry",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			parts := strings.Split(args[0], ":")
+			if len(parts) != 2 {
+				return fmt.Errorf("%s is of a wrong format, must be repo:tag", args[0])
+			}
+			name, version := parts[0], parts[1]
+			h := home.Home(homePath())
+			index, err := repo.LoadIndex(h.Repositories())
+			if err != nil {
+				return err
+			}
+			sha, err := index.Get(name, version)
+			if err != nil {
+				return err
+			}
+			fpath := filepath.Join(h.Bundles(), sha)
+			data, err := ioutil.ReadFile(fpath)
+			if err != nil {
+				return err
+			}
+			cli := command.NewDockerCli(os.Stdin, os.Stdout, os.Stderr, false)
+			if err := cli.Initialize(flags.NewClientOptions()); err != nil {
+				return err
+			}
+			digest, err := image.PushBundle(context.TODO(), cli, data, args[0])
+			if err != nil {
+				return err
+			}
+			fmt.Println("Digest of manifest is", digest)
+			return nil
+		},
+	}
+	return cmd
+}

cmd/duffle/bundle_remove.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/deis/duffle/pkg/duffle/home"
 	"github.com/deis/duffle/pkg/repo"
@@ -32,6 +34,13 @@ func newBundleRemoveCmd(w io.Writer) *cobra.Command {
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			bname := args[0]
+			var specificVersion string
+			if parts := strings.Split(bname, ":"); len(parts) == 2 {
+				if versions != "" {
+					return errors.New("cannot set --version flag when bundle name has a tag")
+				}
+				bname, specificVersion = parts[0], parts[1]
+			}
 
 			h := home.Home(homePath())
 			index, err := repo.LoadIndex(h.Repositories())
@@ -79,6 +88,22 @@ func newBundleRemoveCmd(w io.Writer) *cobra.Command {
 				deleteBundleVersions(deletions, index, h, w)
 				return nil
 			}
+			if specificVersion != "" {
+				sha, ok := vers[specificVersion]
+				if !ok {
+					return fmt.Errorf("version %q not found", specificVersion)
+				}
+				index.DeleteVersion(bname, specificVersion)
+				if err := index.WriteFile(h.Repositories(), 0644); err != nil {
+					return err
+				}
+				if !isShaReferenced(index, sha) {
+					fpath := filepath.Join(h.Bundles(), sha)
+					if err := os.Remove(fpath); err != nil {
+						fmt.Fprintf(w, "WARNING: could not delete stake record %q", fpath)
+					}
+				}
+			}
 
 			// If no version was specified, delete entire record
 			if !index.Delete(bname) {
@@ -98,14 +123,27 @@ func newBundleRemoveCmd(w io.Writer) *cobra.Command {
 	return cmd
 }
 
+func isShaReferenced(index repo.Index, sha string) bool {
+	for _, vs := range index {
+		for _, otherSha := range vs {
+			if otherSha == sha {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 // deleteBundleVersions removes the given SHAs from bundle storage
 //
 // It warns, but does not fail, if a given SHA is not found.
 func deleteBundleVersions(vers map[string]string, index repo.Index, h home.Home, w io.Writer) {
 	for _, sha := range vers {
-		fpath := filepath.Join(h.Bundles(), sha)
-		if err := os.Remove(fpath); err != nil {
-			fmt.Fprintf(w, "WARNING: could not delete stake record %q", fpath)
+		if !isShaReferenced(index, sha) {
+			fpath := filepath.Join(h.Bundles(), sha)
+			if err := os.Remove(fpath); err != nil {
+				fmt.Fprintf(w, "WARNING: could not delete stake record %q", fpath)
+			}
 		}
 	}
 }

cmd/duffle/bundle_sign.go

@@ -13,6 +13,7 @@ import (
 	"github.com/deis/duffle/pkg/bundle"
 	"github.com/deis/duffle/pkg/crypto/digest"
 	"github.com/deis/duffle/pkg/duffle/home"
+	"github.com/deis/duffle/pkg/image"
 	"github.com/deis/duffle/pkg/signature"
 )
 
@@ -25,12 +26,13 @@ If no key name is supplied, this uses the first signing key in the secret keyrin
 `
 
 type bundleSignCmd struct {
-	out            io.Writer
-	home           home.Home
-	identity       string
-	bundleFile     string
-	outfile        string
-	skipValidation bool
+	out             io.Writer
+	home            home.Home
+	identity        string
+	bundleFile      string
+	outfile         string
+	skipValidation  bool
+	pushLocalImages bool
 }
 
 func newBundleSignCmd(w io.Writer) *cobra.Command {
@@ -48,13 +50,18 @@ func newBundleSignCmd(w io.Writer) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			return sign.signBundle(bundle, secring)
+			resolver, err := image.NewResolver(sign.pushLocalImages)
+			if err != nil {
+				return err
+			}
+			return sign.signBundle(bundle, secring, resolver)
 		},
 	}
 	cmd.Flags().StringVarP(&sign.identity, "user", "u", "", "the user ID of the key to use. Format is either email address or 'NAME (COMMENT) <EMAIL>'")
 	cmd.Flags().StringVarP(&sign.bundleFile, "file", "f", "", "path to bundle file to sign")
 	cmd.Flags().StringVarP(&sign.outfile, "output-file", "o", "", "the name of the output file")
 	cmd.Flags().BoolVar(&sign.skipValidation, "skip-validate", false, "do not validate the JSON before marshaling it.")
+	cmd.Flags().BoolVar(&sign.pushLocalImages, "push-local-images", false, "push docker local-only images to the registry.")
 
 	return cmd
 }
@@ -71,8 +78,7 @@ func bundleFileOrArg1(args []string, bundle string) (string, error) {
 	}
 	return bundle, nil
 }
-func (bs *bundleSignCmd) signBundle(bundleFile, keyring string) error {
-	def := home.DefaultRepository()
+func (bs *bundleSignCmd) signBundle(bundleFile, keyring string, containerImageResolver bundle.ContainerImageResolver) error {
 	// Verify that file exists
 	if fi, err := os.Stat(bundleFile); err != nil {
 		return fmt.Errorf("cannot find bundle file to sign: %v", err)
@@ -89,6 +95,13 @@ func (bs *bundleSignCmd) signBundle(bundleFile, keyring string) error {
 		return err
 	}
 
+	if err := b.FixupContainerImages(containerImageResolver); err != nil {
+		if ok, image := image.IsErrImageLocalOnly(err); ok {
+			fmt.Fprintf(os.Stderr, "Image %q is only available locally. Please push it to the registry\n", image)
+		}
+		return err
+	}
+
 	if !bs.skipValidation {
 		if err := b.Validate(); err != nil {
 			return err
@@ -140,7 +153,7 @@ func (bs *bundleSignCmd) signBundle(bundleFile, keyring string) error {
 	}
 
 	// TODO - write pkg method in bundle that writes file and records the reference
-	if err := recordBundleReference(bs.home, fmt.Sprintf("%s/%s", def, b.Name), b.Version, digest); err != nil {
+	if err := recordBundleReference(bs.home, b.Name, b.Version, digest); err != nil {
 		return err
 	}