Improve acorn copy and move all code to CLI (#2116)

Signed-off-by: Grant Linville <grant@acorn.io>

Author: g-linville

docs/docs/100-reference/01-command-line/acorn_copy.md

@@ -8,21 +8,19 @@ Copy Acorn images between registries
 ```
 acorn copy [flags] SOURCE DESTINATION
 
-  This command can copy local images to remote registries, and can copy images between remote registries.
-  It cannot copy images from remote registries to the local registry (use acorn pull instead).
-
-  The --all-tags option only works with remote registries.
+  This command copies Acorn images between remote image registries.
+  It does not interact with images stored in the Acorn internal registry, or with the Acorn API in any way.
 ```
 
 ### Examples
 
 ```
-  # Copy the local image tagged "myimage:v1" to Docker Hub:
-    acorn copy myimage:v1 docker.io/<username>/myimage:v1
-
   # Copy an image from Docker Hub to GHCR:
     acorn copy docker.io/<username>/myimage:v1 ghcr.io/<username>/myimage:v1
 
+  # Copy the 'main' tag on an image to the 'prod' tag on the same image, and overwrite if it already exists:
+    acorn copy docker.io/<username>/myimage:main prod --force
+
   # Copy all tags on a particular image repo in Docker Hub to GHCR:
     acorn copy --all-tags docker.io/<username>/myimage ghcr.io/<username>/myimage
 ```

docs/docs/100-reference/01-command-line/acorn_image_copy.md

@@ -8,21 +8,19 @@ Copy Acorn images between registries
 ```
 acorn image copy [flags] SOURCE DESTINATION
 
-  This command can copy local images to remote registries, and can copy images between remote registries.
-  It cannot copy images from remote registries to the local registry (use acorn pull instead).
-
-  The --all-tags option only works with remote registries.
+  This command copies Acorn images between remote image registries.
+  It does not interact with images stored in the Acorn internal registry, or with the Acorn API in any way.
 ```
 
 ### Examples
 
 ```
-  # Copy the local image tagged "myimage:v1" to Docker Hub:
-    acorn copy myimage:v1 docker.io/<username>/myimage:v1
-
   # Copy an image from Docker Hub to GHCR:
     acorn copy docker.io/<username>/myimage:v1 ghcr.io/<username>/myimage:v1
 
+  # Copy the 'main' tag on an image to the 'prod' tag on the same image, and overwrite if it already exists:
+    acorn copy docker.io/<username>/myimage:main prod --force
+
   # Copy all tags on a particular image repo in Docker Hub to GHCR:
     acorn copy --all-tags docker.io/<username>/myimage ghcr.io/<username>/myimage
 ```

integration/client/images/images_test.go

@@ -9,8 +9,6 @@ import (
 	"github.com/acorn-io/runtime/integration/helper"
 	"github.com/acorn-io/runtime/pkg/client"
 	kclient "github.com/acorn-io/runtime/pkg/k8sclient"
-	"github.com/google/go-containerregistry/pkg/name"
-	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/stretchr/testify/assert"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
@@ -418,110 +416,3 @@ func TestImageBadTag(t *testing.T) {
 	err = c.ImageTag(ctx, image.Name, "foo@@:badtag")
 	assert.Equal(t, "could not parse reference: foo@@:badtag", err.Error())
 }
-
-func TestImageCopy(t *testing.T) {
-	helper.StartController(t)
-	helper.StartAPI(t)
-	registry, closeRegistry := helper.StartRegistry(t)
-	t.Cleanup(closeRegistry)
-
-	ctx := helper.GetCTX(t)
-	c, _ := helper.ClientAndProject(t)
-
-	// Step 1: build an image and copy it to the registry
-	image, err := c.AcornImageBuild(ctx, "../testdata/nginx/Acornfile", &client.AcornImageBuildOptions{
-		Cwd: "../testdata/nginx",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	remoteTagName := registry + "/test:ci"
-
-	progress, err := c.ImageCopy(ctx, image.ID, remoteTagName, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for update := range progress {
-		if update.Error != "" {
-			t.Fatal(update.Error)
-		}
-	}
-
-	// Step 2: build a second image and attempt to copy it to the registry - should fail because "force" is not set
-	image2, err := c.AcornImageBuild(ctx, "../testdata/sidecar/Acornfile", &client.AcornImageBuildOptions{
-		Cwd: "../testdata/sidecar",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	progress, err = c.ImageCopy(ctx, image2.ID, remoteTagName, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var errorFound bool
-	for update := range progress {
-		if update.Error != "" {
-			errorFound = true
-			assert.Contains(t, update.Error, "not copying image")
-			assert.Contains(t, update.Error, "since it already exists")
-		}
-	}
-	assert.True(t, errorFound)
-
-	// Now that it failed, force copy it to make sure that works
-	progress, err = c.ImageCopy(ctx, image2.ID, remoteTagName, &client.ImageCopyOptions{Force: true})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for update := range progress {
-		if update.Error != "" {
-			t.Fatal(update.Error)
-		}
-	}
-
-	// Step 4: copy the first image again, this time under a different tag
-	progress, err = c.ImageCopy(ctx, image.ID, remoteTagName+"-2", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for update := range progress {
-		if update.Error != "" {
-			t.Fatal(update.Error)
-		}
-	}
-
-	// Step 5: copy all tags from the first image in the registry to a new image in the registry
-	oldRemoteRepo := registry + "/test"
-	newRemoteRepo := registry + "/test2"
-	progress, err = c.ImageCopy(ctx, oldRemoteRepo, newRemoteRepo, &client.ImageCopyOptions{AllTags: true})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for update := range progress {
-		if update.Error != "" {
-			t.Fatal(update.Error)
-		}
-	}
-
-	// Step 6: verify that both tags exist in the registry
-	repo, err := name.NewRepository(newRemoteRepo)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tags, err := remote.List(repo, remote.WithContext(ctx))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Len(t, tags, 2)
-	assert.Contains(t, tags, "ci")
-	assert.Contains(t, tags, "ci-2")
-}

pkg/apis/api.acorn.io/v1/scheme.go

@@ -38,7 +38,6 @@ func AddToSchemeWithGV(scheme *runtime.Scheme, schemeGroupVersion schema.GroupVe
 		&ImageTag{},
 		&ImagePush{},
 		&ImagePull{},
-		&ImageCopy{},
 		&ImageSignature{},
 		&Info{},
 		&InfoList{},

pkg/apis/api.acorn.io/v1/types.go

@@ -185,18 +185,6 @@ type ImagePull struct {
 	Auth            *RegistryAuth `json:"auth,omitempty"`
 }
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type ImageCopy struct {
-	metav1.TypeMeta `json:",inline"`
-	Source          string        `json:"source,omitempty"`
-	Dest            string        `json:"dest,omitempty"`
-	SourceAuth      *RegistryAuth `json:"sourceAuth,omitempty"`
-	DestAuth        *RegistryAuth `json:"destAuth,omitempty"`
-	AllTags         bool          `json:"allTags,omitempty"`
-	Force           bool          `json:"force,omitempty"`
-}
-
 type LogMessage struct {
 	Line          string      `json:"line,omitempty"`
 	AppName       string      `json:"appName,omitempty"`