ocm command and some ctf cmd extension

Author: mandelsoft

cmd/component-cli/main.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gardener/component-cli/cmd/component-cli/app"
+	"github.com/gardener/component-cli/cmd/ocm/app"
 )
 
 func main() {

cmd/component-cli/app/app.go renamed to cmd/ocm/app/app.go

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2020 SAP SE or an SAP affiliate company and Gardener contributors.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/gardener/component-cli/cmd/ocm/app"
+)
+
+func main() {
+	ctx := context.Background()
+	defer ctx.Done()
+	cmd := app.NewComponentsCliCommand(ctx)
+
+	if err := cmd.Execute(); err != nil {
+		fmt.Print(err)
+		os.Exit(1)
+	}
+}

cmd/ocm/main.go

@@ -3,7 +3,7 @@
 Adds component archives to a ctf
 
 ```
-component-cli ctf add CTF_PATH [-f component-archive]... [flags]
+component-cli ctf add <CTF_PATH> <component-archive> ... [flags]
 ```
 
 ### Options

docs/reference/component-cli_ctf_add.md

@@ -13,7 +13,7 @@ Note: Currently only component archives are supoprted. Generic OCI Artifacts wil
 
 
 ```
-component-cli ctf push CTF_PATH [flags]
+component-cli ctf push <CTF_PATH> ... [flags]
 ```
 
 ### Options

docs/reference/component-cli_ctf_push.md

@@ -11,14 +11,14 @@ import (
 
 	"github.com/spf13/cobra/doc"
 
-	"github.com/gardener/component-cli/cmd/component-cli/app"
+	"github.com/gardener/component-cli/cmd/ocm/app"
 )
 
 func main() {
 	fmt.Println("> Generate Docs for ComponentCli")
 
 	if len(os.Args) != 2 { // expect 2 as the first one is the programm name
-		fmt.Printf("Expected exactly one argument, but got %d", len(os.Args) - 1)
+		fmt.Printf("Expected exactly one argument, but got %d", len(os.Args)-1)
 		os.Exit(1)
 	}
 	outputDir := os.Args[1]

hack/generate-docs/main.go

@@ -36,8 +36,8 @@ type AddOptions struct {
 func NewAddCommand(ctx context.Context) *cobra.Command {
 	opts := &AddOptions{}
 	cmd := &cobra.Command{
-		Use:   "add CTF_PATH [-f component-archive]...",
-		Args:  cobra.RangeArgs(1, 4),
+		Use:   "add <CTF_PATH> <component-archive> ...",
+		Args:  cobra.MinimumNArgs(1),
 		Short: "Adds component archives to a ctf",
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := opts.Complete(args); err != nil {
@@ -117,6 +117,7 @@ It is expected that the given path points to a CTF Archive`, o.CTFPath)
 func (o *AddOptions) Complete(args []string) error {
 	o.CTFPath = args[0]
 
+	o.ComponentArchives = append(o.ComponentArchives, args[1:]...)
 	if err := o.Validate(); err != nil {
 		return err
 	}

ociclient/mock/client_mock.go

@@ -27,8 +27,8 @@ import (
 )
 
 type PushOptions struct {
-	// CTFPath is the path to the directory containing the ctf archive.
-	CTFPath string
+	// CTFPaths is the path to the directory containing the ctf archive.
+	CTFPaths []string
 	// BaseUrl is the repository context base url for all included component descriptors.
 	BaseUrl string
 	// AdditionalTags defines additional tags that the oci artifact should be tagged with.
@@ -42,8 +42,8 @@ type PushOptions struct {
 func NewPushCommand(ctx context.Context) *cobra.Command {
 	opts := &PushOptions{}
 	cmd := &cobra.Command{
-		Use:   "push CTF_PATH",
-		Args:  cobra.ExactArgs(1),
+		Use:   "push <CTF_PATH> ...",
+		Args:  cobra.MinimumNArgs(1),
 		Short: "Pushes all archives of a ctf to a remote repository",
 		Long: `
 Push pushes all component archives and oci artifacts to the defined oci repository.
@@ -73,69 +73,74 @@ Note: Currently only component archives are supoprted. Generic OCI Artifacts wil
 }
 
 func (o *PushOptions) Run(ctx context.Context, log logr.Logger, fs vfs.FileSystem) error {
-	info, err := fs.Stat(o.CTFPath)
-	if err != nil {
-		return fmt.Errorf("unable to get info for %s: %w", o.CTFPath, err)
-	}
-	if info.IsDir() {
-		return fmt.Errorf(`%q is a directory. 
-It is expected that the given path points to a CTF Archive`, o.CTFPath)
-	}
-
-	ociClient, cache, err := o.OciOptions.Build(log, fs)
-	if err != nil {
-		return fmt.Errorf("unable to build oci client: %s", err.Error())
-	}
-
-	ctfArchive, err := ctf.NewCTF(fs, o.CTFPath)
-	if err != nil {
-		return fmt.Errorf("unable to open ctf at %q: %s", o.CTFPath, err.Error())
-	}
-
-	err = ctfArchive.Walk(func(ca *ctf.ComponentArchive) error {
-		// update repository context
-		if len(o.BaseUrl) != 0 {
-			if err := cdv2.InjectRepositoryContext(ca.ComponentDescriptor, cdv2.NewOCIRegistryRepository(o.BaseUrl, "")); err != nil {
-				return fmt.Errorf("unable to add repository context: %w", err)
-			}
+	for _, path := range o.CTFPaths {
+		info, err := fs.Stat(path)
+		if err != nil {
+			return fmt.Errorf("unable to get info for %s: %w", path, err)
+		}
+		if info.IsDir() {
+			return fmt.Errorf(`%q is a directory. 
+It is expected that the given path points to a CTF Archive`, path)
 		}
 
-		manifest, err := cdoci.NewManifestBuilder(cache, ca).Build(ctx)
+		ociClient, cache, err := o.OciOptions.Build(log, fs)
 		if err != nil {
-			return fmt.Errorf("unable to build oci artifact for component acrchive: %w", err)
+			return fmt.Errorf("unable to build oci client: %s", err.Error())
 		}
 
-		ref, err := components.OCIRef(ca.ComponentDescriptor.GetEffectiveRepositoryContext(), ca.ComponentDescriptor.GetName(), ca.ComponentDescriptor.GetVersion())
+		ctfArchive, err := ctf.NewCTF(fs, path)
 		if err != nil {
-			return fmt.Errorf("unable to calculate oci ref for %q: %s", ca.ComponentDescriptor.GetName(), err.Error())
-		}
-		if err := ociClient.PushManifest(ctx, ref, manifest); err != nil {
-			return fmt.Errorf("unable to upload component archive to %q: %s", ref, err.Error())
+			return fmt.Errorf("unable to open ctf at %q: %s", o.CTFPaths, err.Error())
 		}
-		log.Info(fmt.Sprintf("Successfully uploaded component archive to %q", ref))
 
-		for _, tag := range o.AdditionalTags {
-			ref, err := components.OCIRef(ca.ComponentDescriptor.GetEffectiveRepositoryContext(), ca.ComponentDescriptor.GetName(), tag)
+		err = ctfArchive.Walk(func(ca *ctf.ComponentArchive) error {
+			// update repository context
+			if len(o.BaseUrl) != 0 {
+				if err := cdv2.InjectRepositoryContext(ca.ComponentDescriptor, cdv2.NewOCIRegistryRepository(o.BaseUrl, "")); err != nil {
+					return fmt.Errorf("unable to add repository context: %w", err)
+				}
+			}
+
+			manifest, err := cdoci.NewManifestBuilder(cache, ca).Build(ctx)
+			if err != nil {
+				return fmt.Errorf("unable to build oci artifact for component acrchive: %w", err)
+			}
+
+			ref, err := components.OCIRef(ca.ComponentDescriptor.GetEffectiveRepositoryContext(), ca.ComponentDescriptor.GetName(), ca.ComponentDescriptor.GetVersion())
 			if err != nil {
 				return fmt.Errorf("unable to calculate oci ref for %q: %s", ca.ComponentDescriptor.GetName(), err.Error())
 			}
 			if err := ociClient.PushManifest(ctx, ref, manifest); err != nil {
 				return fmt.Errorf("unable to upload component archive to %q: %s", ref, err.Error())
 			}
-			log.Info(fmt.Sprintf("Successfully tagged component archive with %q", ref))
-		}
+			log.Info(fmt.Sprintf("Successfully uploaded component archive to %q", ref))
+
+			for _, tag := range o.AdditionalTags {
+				ref, err := components.OCIRef(ca.ComponentDescriptor.GetEffectiveRepositoryContext(), ca.ComponentDescriptor.GetName(), tag)
+				if err != nil {
+					return fmt.Errorf("unable to calculate oci ref for %q: %s", ca.ComponentDescriptor.GetName(), err.Error())
+				}
+				if err := ociClient.PushManifest(ctx, ref, manifest); err != nil {
+					return fmt.Errorf("unable to upload component archive to %q: %s", ref, err.Error())
+				}
+				log.Info(fmt.Sprintf("Successfully tagged component archive with %q", ref))
+			}
 
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("error while reading component archives in ctf: %w", err)
+			return nil
+		})
+		if err != nil {
+			return fmt.Errorf("error while reading component archives in ctf: %w", err)
+		}
+		err = ctfArchive.Close()
+		if err != nil {
+			return fmt.Errorf("error while closing component archives in ctf: %w", err)
+		}
 	}
-
-	return ctfArchive.Close()
+	return nil
 }
 
 func (o *PushOptions) Complete(args []string) error {
-	o.CTFPath = args[0]
+	o.CTFPaths = args
 
 	var err error
 	o.OciOptions.CacheDir, err = utils.CacheDir()
@@ -152,7 +157,7 @@ func (o *PushOptions) Complete(args []string) error {
 
 // Validate validates push options
 func (o *PushOptions) Validate() error {
-	if len(o.CTFPath) == 0 {
+	if len(o.CTFPaths) == 0 {
 		return errors.New("a path to the component descriptor must be defined")
 	}
 	return nil

pkg/commands/ctf/add.go

@@ -58,8 +58,8 @@ var _ = Describe("Add", func() {
 		Expect(vfs.WriteFile(testdataFs, "/auth.json", cf, os.ModePerm))
 
 		opts := cmd.PushOptions{
-			CTFPath: "/component.ctf",
-			BaseUrl: testenv.Addr + "/test",
+			CTFPaths: []string{"/component.ctf"},
+			BaseUrl:  testenv.Addr + "/test",
 			OciOptions: options.Options{
 				AllowPlainHttp:     false,
 				RegistryConfigPath: "/auth.json",
@@ -117,8 +117,8 @@ var _ = Describe("Add", func() {
 		Expect(vfs.WriteFile(testdataFs, "/auth.json", cf, os.ModePerm))
 
 		opts := cmd.PushOptions{
-			CTFPath: "/component.ctf",
-			BaseUrl: testenv.Addr + "/test",
+			CTFPaths: []string{"/component.ctf"},
+			BaseUrl:  testenv.Addr + "/test",
 			OciOptions: options.Options{
 				AllowPlainHttp:     false,
 				RegistryConfigPath: "/auth.json",