Remove platform flag for push

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

Gopkg.lock

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/docker/cnab-to-oci/converter"
-	"github.com/docker/distribution/manifest/manifestlist"
 	"github.com/opencontainers/go-digest"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/assert"
@@ -26,97 +25,6 @@ type dindSwarmAndRegistryInfo struct {
 	registryLogs    func() string
 }
 
-func TestPushArchs(t *testing.T) {
-	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
-		testCases := []struct {
-			name              string
-			args              []string
-			expectedPlatforms []manifestlist.PlatformSpec
-		}{
-			{
-				name: "default",
-				args: []string{},
-				expectedPlatforms: []manifestlist.PlatformSpec{
-					{
-						OS:           "linux",
-						Architecture: "amd64",
-					},
-				},
-			},
-			{
-				name: "all-platforms",
-				args: []string{"--all-platforms"},
-				expectedPlatforms: []manifestlist.PlatformSpec{
-					{
-						OS:           "linux",
-						Architecture: "amd64",
-					},
-					{
-						OS:           "linux",
-						Architecture: "386",
-					},
-					{
-						OS:           "linux",
-						Architecture: "ppc64le",
-					},
-					{
-						OS:           "linux",
-						Architecture: "s390x",
-					},
-					{
-						OS:           "linux",
-						Architecture: "arm",
-						Variant:      "v5",
-					},
-					{
-						OS:           "linux",
-						Architecture: "arm",
-						Variant:      "v6",
-					},
-					{
-						OS:           "linux",
-						Architecture: "arm",
-						Variant:      "v7",
-					},
-					{
-						OS:           "linux",
-						Architecture: "arm64",
-						Variant:      "v8",
-					},
-				},
-			},
-		}
-
-		for _, testCase := range testCases {
-			t.Run(testCase.name, func(t *testing.T) {
-				cmd := info.configuredCmd
-				ref := info.registryAddress + "/test/push-pull:1"
-				args := []string{"app", "push", "--tag", ref}
-				args = append(args, testCase.args...)
-				args = append(args, filepath.Join("testdata", "push-pull", "push-pull.dockerapp"))
-				cmd.Command = dockerCli.Command(args...)
-				icmd.RunCmd(cmd).Assert(t, icmd.Success)
-
-				var index v1.Index
-				headers := map[string]string{
-					"Accept": "application/vnd.docker.distribution.manifest.list.v2+json",
-				}
-				err := httpGet("http://"+info.registryAddress+"/v2/test/push-pull/manifests/1", headers, &index)
-				assert.NilError(t, err, info.registryLogs())
-				digest, err := getManifestListDigest(index)
-				assert.NilError(t, err, info.registryLogs())
-				var manifestList manifestlist.ManifestList
-				err = httpGet("http://"+info.registryAddress+"/v2/test/push-pull/manifests/"+digest.String(), headers, &manifestList)
-				assert.NilError(t, err)
-				assert.Equal(t, len(manifestList.Manifests), len(testCase.expectedPlatforms), "Unexpected number of platforms")
-				for _, m := range manifestList.Manifests {
-					assert.Assert(t, cmp.Contains(testCase.expectedPlatforms, m.Platform), "Platform expected but not found: %s", m.Platform)
-				}
-			})
-		}
-	})
-}
-
 func TestPushInsecureRegistry(t *testing.T) {
 	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
 		ref := info.registryAddress + "/test/push-insecure"

e2e/pushpull_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 const ( // Docker specific annotations and values
@@ -40,8 +39,6 @@ const ( // Docker specific annotations and values
 
 type pushOptions struct {
 	tag          string
-	platforms    []string
-	allPlatforms bool
 }
 
 func pushCmd(dockerCli command.Cli) *cobra.Command {
@@ -51,17 +48,12 @@ func pushCmd(dockerCli command.Cli) *cobra.Command {
 		Short:   "Push an App image to a registry",
 		Example: `$ docker app push myapp --tag myrepo/myapp:mytag`,
 		Args:    cli.RequiresMaxArgs(1),
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			return checkFlags(cmd.Flags(), opts)
-		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runPush(dockerCli, firstOrEmpty(args), opts)
 		},
 	}
 	flags := cmd.Flags()
 	flags.StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default: <name>:<version> from metadata)")
-	flags.StringSliceVar(&opts.platforms, "platform", []string{"linux/amd64"}, "For multi-arch service images, push the specified platforms")
-	flags.BoolVar(&opts.allPlatforms, "all-platforms", false, "If present, push all platforms")
 	return cmd
 }
 
@@ -80,7 +72,7 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 	cnabRef = reference.TagNameOnly(cnabRef)
 
 	// Push the bundle
-	return pushBundle(dockerCli, opts, bndl, cnabRef)
+	return pushBundle(dockerCli, bndl, cnabRef)
 }
 
 func resolveReferenceAndBundle(dockerCli command.Cli, name string) (*bundle.Bundle, string, error) {
@@ -99,7 +91,7 @@ func resolveReferenceAndBundle(dockerCli command.Cli, name string) (*bundle.Bund
 	return bndl, ref, err
 }
 
-func pushBundle(dockerCli command.Cli, opts pushOptions, bndl *bundle.Bundle, cnabRef reference.Named) error {
+func pushBundle(dockerCli command.Cli, bndl *bundle.Bundle, cnabRef reference.Named) error {
 	insecureRegistries, err := internal.InsecureRegistriesFromEngine(dockerCli)
 	if err != nil {
 		return errors.Wrap(err, "could not retrieve insecure registries")
@@ -114,9 +106,6 @@ func pushBundle(dockerCli command.Cli, opts pushOptions, bndl *bundle.Bundle, cn
 		remotes.WithAutoBundleUpdate(),
 		remotes.WithPushImages(dockerCli.Client(), dockerCli.Out()),
 	}
-	if platforms := platformFilter(opts); len(platforms) > 0 {
-		fixupOptions = append(fixupOptions, remotes.WithComponentImagePlatforms(platforms))
-	}
 	// bundle fixup
 	relocationMap, err := remotes.FixupBundle(context.Background(), bndl, cnabRef, resolver, fixupOptions...)
 	if err != nil {
@@ -141,13 +130,6 @@ func withAppAnnotations(index *ocischemav1.Index) error {
 	return nil
 }
 
-func platformFilter(opts pushOptions) []string {
-	if opts.allPlatforms {
-		return nil
-	}
-	return opts.platforms
-}
-
 type fixupDisplay interface {
 	onEvent(remotes.FixupEvent)
 }
@@ -276,10 +258,3 @@ func (r *plainDisplay) onEvent(ev remotes.FixupEvent) {
 		}
 	}
 }
-
-func checkFlags(flags *pflag.FlagSet, opts pushOptions) error {
-	if opts.allPlatforms && flags.Changed("all-platforms") && flags.Changed("platform") {
-		return fmt.Errorf("--all-plaforms and --plaform flags cannot be used at the same time")
-	}
-	return nil
-}