WIP: added required client go files

Signed-off-by: WYGIN <[email protected]>

cmd/cmd.go

@@ -80,6 +80,7 @@ func NewPackCommand(logger ConfigurableLogger) (*cobra.Command, error) {
 	rootCmd.AddCommand(commands.NewBuildpackCommand(logger, cfg, packClient, buildpackage.NewConfigReader()))
 	rootCmd.AddCommand(commands.NewExtensionCommand(logger, cfg, packClient, buildpackage.NewConfigReader()))
 	rootCmd.AddCommand(commands.NewConfigCommand(logger, cfg, cfgPath, packClient))
+	rootCmd.AddCommand(commands.NewManifestCommand(logger, packClient))
 	rootCmd.AddCommand(commands.InspectImage(logger, imagewriter.NewFactory(), cfg, packClient))
 	rootCmd.AddCommand(commands.NewStackCommand(logger))
 	rootCmd.AddCommand(commands.Rebase(logger, cfg, packClient))

internal/commands/commands.go

@@ -22,6 +22,13 @@ type PackClient interface {
 	InspectImage(string, bool) (*client.ImageInfo, error)
 	Rebase(context.Context, client.RebaseOptions) error
 	CreateBuilder(context.Context, client.CreateBuilderOptions) error
+	CreateManifest(context.Context, string, []string) (imageID string, err error)
+	AnnotateManifest() error
+	AddManifest() error
+	DeleteManifest() error
+	RemoveManifest() error
+	PushManifest() error
+	InspectManifest() error
 	NewBuildpack(context.Context, client.NewBuildpackOptions) error
 	PackageBuildpack(ctx context.Context, opts client.PackageBuildpackOptions) error
 	PackageExtension(ctx context.Context, opts client.PackageBuildpackOptions) error

internal/commands/manifest.go

@@ -0,0 +1,26 @@
+package commands
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
+)
+
+func NewManifestCommand(logger logging.Logger, client PackClient) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "manifest",
+		Short: "Interact with image index or manifest list",
+		RunE:  nil,
+	}
+
+	cmd.AddCommand(ManifestCreate(logger, client))
+	cmd.AddCommand(ManifestAdd(logger, client))
+	cmd.AddCommand(ManifestAnnotate(logger, client))
+	cmd.AddCommand(ManifestDelete(logger, client))
+	cmd.AddCommand(ManifestInspect(logger, client))
+	cmd.AddCommand(ManifestPush(logger, client))
+	cmd.AddCommand(ManifestRemove(logger, client))
+
+	AddHelpFlag(cmd, "builder")
+	return cmd
+}

internal/commands/manifest_add.go

@@ -1,8 +1,9 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestAddFlags define flags provided to the ManifestAdd
@@ -16,8 +17,8 @@ func ManifestAdd(logger logging.Logger, pack PackClient) *cobra.Command {
 	var flags ManifestAddFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest add [OPTIONS] <manifest-list> <manifest> [flags]",
-		Args: cobra.MatchAll(cobra.ExactArgs(2), cobra.OnlyValidArgs),
+		Use:   "pack manifest add [OPTIONS] <manifest-list> <manifest> [flags]",
+		Args:  cobra.MatchAll(cobra.ExactArgs(2), cobra.OnlyValidArgs),
 		Short: "manifest add modifies a manifest list (Image index) and add a new image to the list of manifests.",
 		Example: `pack manifest add cnbs/sample-package:hello-multiarch-universe \
 		cnbs/sample-package:hello-universe-riscv-linux`,
@@ -36,4 +37,4 @@ func ManifestAdd(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "add")
 	return cmd
-}
+}

internal/commands/manifest_add_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_annotate.go

@@ -1,8 +1,9 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestAnnotateFlags define flags provided to the ManifestAnnotate
@@ -15,8 +16,8 @@ func ManifestAnnotate(logger logging.Logger, pack PackClient) *cobra.Command {
 	var flags ManifestAnnotateFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest annotate [OPTIONS] <manifest-list> <manifest> [flags]",
-		Args: cobra.MatchAll(cobra.ExactArgs(2), cobra.OnlyValidArgs),
+		Use:   "pack manifest annotate [OPTIONS] <manifest-list> <manifest> [flags]",
+		Args:  cobra.MatchAll(cobra.ExactArgs(2), cobra.OnlyValidArgs),
 		Short: "manifest annotate modifies a manifest list (Image index) and update the platform information for an image included in the manifest list.",
 		Example: `pack manifest annotate cnbs/sample-package:hello-universe-multiarch \ 
 		cnbs/sample-package:hello-universe --arch amd64`,
@@ -34,4 +35,4 @@ func ManifestAnnotate(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "annotate")
 	return cmd
-}
+}

internal/commands/manifest_annotate_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_create.go

@@ -1,13 +1,14 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestCreateFlags define flags provided to the ManifestCreate
 type ManifestCreateFlags struct {
-	format, registry string
+	format, registry  string
 	insecure, publish bool
 }
 
@@ -16,8 +17,8 @@ func ManifestCreate(logger logging.Logger, pack PackClient) *cobra.Command {
 	var flags ManifestCreateFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest create <manifest-list> <manifest> [<manifest> ... ] [flags]",
-		Args: cobra.MatchAll(cobra.MinimumNArgs(2), cobra.OnlyValidArgs),
+		Use:   "pack manifest create <manifest-list> <manifest> [<manifest> ... ] [flags]",
+		Args:  cobra.MatchAll(cobra.MinimumNArgs(2), cobra.OnlyValidArgs),
 		Short: "manifest create generates a manifest list for a multi-arch image",
 		Example: `pack manifest create cnbs/sample-package:hello-multiarch-universe \
 		cnbs/sample-package:hello-universe \
@@ -27,6 +28,19 @@ func ManifestCreate(logger logging.Logger, pack PackClient) *cobra.Command {
 		If the <manifest-list> already exists in the registry: pack will save a local copy of the remote manifest list,
 		If the <manifest-list> doestn't exist in a registry: pack will create a local representation of the manifest list that will only save on the remote registry if the user publish it`,
 		RunE: logError(logger, func(cmd *cobra.Command, args []string) error {
+			// manifestList := args[0]
+			// manifests := args[1:]
+
+			// if cmd.Flags().Changed("insecure") {
+			// 	flags.insecure = !flags.insecure
+			// }
+
+			// if cmd.Flags().Changed("publish") {
+			// 	flags.publish = !flags.publish
+			// }
+
+			// id, err := pack.CreateManifest()
+
 			return nil
 		}),
 	}
@@ -38,4 +52,4 @@ func ManifestCreate(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "create")
 	return cmd
-}
+}

internal/commands/manifest_create_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_inspect.go

@@ -1,8 +1,9 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestInspectFlags define flags provided to the ManifestInspect
@@ -14,9 +15,9 @@ func ManifestInspect(logger logging.Logger, pack PackClient) *cobra.Command {
 	// var flags ManifestInspectFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest inspect <manifest-list> [flags]",
-		Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
-		Short: "manifest inspect shows the manifest information stored in local storage",
+		Use:     "pack manifest inspect <manifest-list> [flags]",
+		Args:    cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+		Short:   "manifest inspect shows the manifest information stored in local storage",
 		Example: `pack manifest inspect cnbs/sample-builder:multiarch`,
 		Long: `manifest inspect shows the manifest information stored in local storage.
 
@@ -28,4 +29,4 @@ func ManifestInspect(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "inspect")
 	return cmd
-}
+}

internal/commands/manifest_inspect_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_push.go

@@ -1,13 +1,14 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestPushFlags define flags provided to the ManifestPush
 type ManifestPushFlags struct {
-	format string
+	format          string
 	insecure, purge bool
 }
 
@@ -16,9 +17,9 @@ func ManifestPush(logger logging.Logger, pack PackClient) *cobra.Command {
 	var flags ManifestPushFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest push [OPTIONS] <manifest-list> [flags]",
-		Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
-		Short: "manifest push pushes a manifest list (Image index) to a registry.",
+		Use:     "pack manifest push [OPTIONS] <manifest-list> [flags]",
+		Args:    cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+		Short:   "manifest push pushes a manifest list (Image index) to a registry.",
 		Example: `pack manifest push cnbs/sample-package:hello-multiarch-universe`,
 		Long: `manifest push pushes a manifest list (Image index) to a registry.
 
@@ -34,4 +35,4 @@ func ManifestPush(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "push")
 	return cmd
-}
+}

internal/commands/manifest_push_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_remove.go

@@ -1,8 +1,9 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestDeleteFlags define flags provided to the ManifestDelete
@@ -14,9 +15,9 @@ func ManifestDelete(logger logging.Logger, pack PackClient) *cobra.Command {
 	// var flags ManifestDeleteFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest remove [manifest-list] [manifest-list...] [flags]",
-		Args: cobra.MatchAll(cobra.MinimumNArgs(1), cobra.OnlyValidArgs),
-		Short: "Delete one or more manifest lists from local storage",
+		Use:     "pack manifest remove [manifest-list] [manifest-list...] [flags]",
+		Args:    cobra.MatchAll(cobra.MinimumNArgs(1), cobra.OnlyValidArgs),
+		Short:   "Delete one or more manifest lists from local storage",
 		Example: `pack manifest remove cnbs/sample-package:hello-multiarch-universe`,
 		Long: `Delete one or more manifest lists from local storage.
 
@@ -28,4 +29,4 @@ func ManifestDelete(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "remove")
 	return cmd
-}
+}

internal/commands/manifest_remove_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test

internal/commands/manifest_rm.go

@@ -1,8 +1,9 @@
 package commands
 
 import (
-	"github.com/buildpacks/pack/pkg/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 // ManifestRemoveFlags define flags provided to the ManifestRemove
@@ -14,8 +15,8 @@ func ManifestRemove(logger logging.Logger, pack PackClient) *cobra.Command {
 	// var flags ManifestRemoveFlags
 
 	cmd := &cobra.Command{
-		Use: "pack manifest rm [manifest-list] [manifest] [manifest...] [flags]",
-		Args: cobra.MatchAll(cobra.MinimumNArgs(2), cobra.OnlyValidArgs),
+		Use:   "pack manifest rm [manifest-list] [manifest] [manifest...] [flags]",
+		Args:  cobra.MatchAll(cobra.MinimumNArgs(2), cobra.OnlyValidArgs),
 		Short: "manifest rm will remove the specified image manifest if it is already referenced in the index",
 		Example: `pack manifest rm cnbs/sample-package:hello-multiarch-universe \
 		cnbs/sample-package:hello-universe-windows`,
@@ -29,4 +30,4 @@ func ManifestRemove(logger logging.Logger, pack PackClient) *cobra.Command {
 
 	AddHelpFlag(cmd, "rm")
 	return cmd
-}
+}

internal/commands/manifest_rm_test.go

@@ -1 +1 @@
-package commands_test
+package commands_test