fix: Fix import image-bundle command (#88)

.golangci.yml

@@ -59,6 +59,7 @@ linters-settings:
     sections:
       - Standard
       - Default
+      - Prefix(github.com/mesosphere)
       - Prefix(github.com/mesosphere/mindthegap)
   gocritic:
     enabled-tags:

.tool-versions

@@ -1,5 +1,5 @@
 golangci-lint 1.44.2
 goreleaser 1.6.3
-golang 1.17.8
+golang 1.17.8 # FREEZE until golangci-lint fully supports go 1.18
 pre-commit 2.17.0
 upx 3.96

cmd/create/create.go

@@ -4,9 +4,10 @@
 package create
 
 import (
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cmd/create/imagebundle"
 )
 

cmd/create/imagebundle/image_bundle.go

@@ -11,9 +11,10 @@ import (
 	"path/filepath"
 
 	"github.com/distribution/distribution/v3/manifest/manifestlist"
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/archive"
 	"github.com/mesosphere/mindthegap/cleanup"
 	"github.com/mesosphere/mindthegap/config"
@@ -226,6 +227,7 @@ func NewCommand(out output.Output) *cobra.Command {
 									skopeo.OS(p.os),
 									skopeo.Arch(p.arch),
 									skopeo.Variant(p.variant),
+									skopeo.PreserveDigests(),
 								)...,
 							)
 							if err != nil {

cmd/importcmd/imagebundle/image_bundle.go

@@ -9,14 +9,16 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/mholt/archiver/v3"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cleanup"
 	"github.com/mesosphere/mindthegap/config"
 	"github.com/mesosphere/mindthegap/containerd"
 	"github.com/mesosphere/mindthegap/docker/registry"
+	"github.com/mesosphere/mindthegap/skopeo"
 )
 
 func NewCommand(out output.Output) *cobra.Command {
@@ -74,21 +76,52 @@ func NewCommand(out output.Output) *cobra.Command {
 			}()
 			out.EndOperation(true)
 
+			skopeoRunner, skopeoCleanup := skopeo.NewRunner()
+			cleaner.AddCleanupFn(func() { _ = skopeoCleanup() })
+
+			ociExportsTempDir, err := os.MkdirTemp("", ".oci-exports-*")
+			if err != nil {
+				return fmt.Errorf("failed to create temporary directory for OCI exports: %w", err)
+			}
+			cleaner.AddCleanupFn(func() { _ = os.RemoveAll(ociExportsTempDir) })
+
 			for registryName, registryConfig := range cfg {
 				for imageName, imageTags := range registryConfig.Images {
 					for _, imageTag := range imageTags {
 						srcImageName := fmt.Sprintf("%s/%s:%s", reg.Address(), imageName, imageTag)
 						destImageName := fmt.Sprintf("%s/%s:%s", registryName, imageName, imageTag)
+
 						out.StartOperation(fmt.Sprintf("Importing %s", destImageName))
-						ctrOutput, err := containerd.ImportImage(
-							context.TODO(), srcImageName, destImageName, containerdNamespace,
+
+						exportTarball := filepath.Join(ociExportsTempDir, "oci-export.tar")
+
+						skopeoStdout, skopeoStderr, err := skopeoRunner.Copy(context.TODO(),
+							fmt.Sprintf("docker://%s", srcImageName),
+							fmt.Sprintf("oci-archive:%s:%s", exportTarball, destImageName),
+							skopeo.All(),
+							skopeo.DisableSrcTLSVerify(),
+						)
+						if err != nil {
+							out.EndOperation(false)
+							out.Infof("---skopeo stdout---:\n%s", skopeoStdout)
+							out.Infof("---skopeo stderr---:\n%s", skopeoStderr)
+							return err
+						}
+						out.V(4).Infof("---skopeo stdout---:\n%s", skopeoStdout)
+						out.V(4).Infof("---skopeo stderr---:\n%s", skopeoStderr)
+
+						ctrOutput, err := containerd.ImportImageArchive(
+							context.TODO(), exportTarball, containerdNamespace,
 						)
 						if err != nil {
 							out.Info(string(ctrOutput))
 							out.EndOperation(false)
 							return err
 						}
 						out.V(4).Info(string(ctrOutput))
+
+						_ = os.Remove(exportTarball)
+
 						out.EndOperation(true)
 					}
 				}

cmd/importcmd/import.go

@@ -4,9 +4,10 @@
 package importcmd
 
 import (
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cmd/importcmd/imagebundle"
 )
 

cmd/push/imagebundle/image_bundle.go

@@ -9,10 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/mholt/archiver/v3"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cleanup"
 	"github.com/mesosphere/mindthegap/config"
 	"github.com/mesosphere/mindthegap/docker/ecr"
@@ -82,7 +83,9 @@ func NewCommand(out output.Output) *cobra.Command {
 			skopeoRunner, skopeoCleanup := skopeo.NewRunner()
 			cleaner.AddCleanupFn(func() { _ = skopeoCleanup() })
 
-			var skopeoOpts []skopeo.SkopeoOption
+			skopeoOpts := []skopeo.SkopeoOption{
+				skopeo.PreserveDigests(),
+			}
 			if destRegistryUsername != "" && destRegistryPassword != "" {
 				skopeoOpts = append(
 					skopeoOpts,

cmd/push/push.go

@@ -4,9 +4,10 @@
 package push
 
 import (
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cmd/push/imagebundle"
 )
 

cmd/root.go

@@ -7,9 +7,10 @@ import (
 	"io"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/mesosphere/dkp-cli-runtime/core/cmd/root"
 	"github.com/mesosphere/dkp-cli-runtime/core/output"
-	"github.com/spf13/cobra"
 
 	"github.com/mesosphere/mindthegap/cmd/create"
 	"github.com/mesosphere/mindthegap/cmd/importcmd"

cmd/serve/imagebundle/image_bundle.go

@@ -7,10 +7,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/mholt/archiver/v3"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cleanup"
 	"github.com/mesosphere/mindthegap/docker/registry"
 )

cmd/serve/serve.go

@@ -4,9 +4,10 @@
 package serve
 
 import (
-	"github.com/mesosphere/dkp-cli-runtime/core/output"
 	"github.com/spf13/cobra"
 
+	"github.com/mesosphere/dkp-cli-runtime/core/output"
+
 	"github.com/mesosphere/mindthegap/cmd/serve/imagebundle"
 )
 

containerd/ctr.go

@@ -11,37 +11,19 @@ import (
 
 type CtrOption func() string
 
-func ImportImage(ctx context.Context, src, tag, containerdNamespace string) ([]byte, error) {
+func ImportImageArchive(
+	ctx context.Context,
+	archivePath, containerdNamespace string,
+) ([]byte, error) {
 	baseArgs := []string{"-n", containerdNamespace}
 	//nolint:gosec // Args are fine.
 	cmd := exec.CommandContext(
 		ctx,
 		"ctr",
-		append(baseArgs, []string{"images", "pull", "--plain-http", src}...)...)
+		append(baseArgs, []string{"images", "import", "--no-unpack", archivePath}...)...)
 	cmdOutput, err := cmd.CombinedOutput()
 	if err != nil {
-		return cmdOutput, fmt.Errorf("failed to pull image from temporary docker registry: %w", err)
-	}
-
-	if tag != "" {
-		//nolint:gosec // Args are fine.
-		cmd = exec.CommandContext(
-			ctx,
-			"ctr",
-			append(baseArgs, []string{"images", "tag", "--force", src, tag}...)...)
-		tagOutput, err := cmd.CombinedOutput()
-		cmdOutput = append(cmdOutput, tagOutput...)
-		if err != nil {
-			return cmdOutput, fmt.Errorf("failed to tag image: %w", err)
-		}
-
-		//nolint:gosec // Args are fine.
-		cmd = exec.CommandContext(ctx, "ctr", append(baseArgs, []string{"images", "rm", src}...)...)
-		rmOutput, err := cmd.CombinedOutput()
-		cmdOutput = append(cmdOutput, rmOutput...)
-		if err != nil {
-			return cmdOutput, fmt.Errorf("failed to tag image: %w", err)
-		}
+		return cmdOutput, fmt.Errorf("failed to import image(s) from image archive: %w", err)
 	}
 
 	return cmdOutput, nil

skopeo/skopeo.go

@@ -77,6 +77,12 @@ func All() SkopeoOption {
 	}
 }
 
+func IndexOnly() SkopeoOption {
+	return func() string {
+		return "--multi-arch=index-only"
+	}
+}
+
 func SrcCredentials(username, password string) SkopeoOption {
 	return func() string {
 		return fmt.Sprintf("--src-creds=%s:%s", username, password)
@@ -89,6 +95,12 @@ func DestCredentials(username, password string) SkopeoOption {
 	}
 }
 
+func PreserveDigests() SkopeoOption {
+	return func() string {
+		return "--preserve-digests"
+	}
+}
+
 type Runner struct {
 	unpacked                 sync.Once
 	unpackedSkopeoPath       string
@@ -138,7 +150,6 @@ func (r *Runner) Copy(
 	copyArgs := []string{
 		"copy",
 		"--policy", r.unpackedSkopeoPolicyPath,
-		"--preserve-digests",
 		src,
 		dest,
 	}
@@ -241,7 +252,8 @@ func (r *Runner) CopyManifest(
 		ctx,
 		"dir:"+td,
 		dest,
-		append(opts, func() string { return "--multi-arch=index-only" })...)
+		append(opts, PreserveDigests(), IndexOnly())...,
+	)
 }
 
 func (r *Runner) run(