Updated flags definition in alpha module catalog (#2829)

Author: musztardem

docs/user/gen-docs/kyma_alpha_module_catalog.md

@@ -14,34 +14,35 @@ kyma alpha module catalog [flags]
 
 ```bash
   # List all modules available in the cluster (core and community)
-  kyma module catalog
+  kyma alpha module catalog
 
   # List available community modules from the official repository
-  kyma module catalog --remote
+  kyma alpha module catalog --remote
 
   # List available community modules from a specific remote URL
-  kyma module catalog --remote=https://example.com/modules.json
+  kyma alpha module catalog --remote-url=https://example.com/modules.json
 
   # List available community modules from multiple remote URLs
-  kyma module catalog --remote=https://example.com/modules1.json,https://example.com/modules2.json
+  kyma alpha module catalog --remote=https://example.com/modules1.json,https://example.com/modules2.json
 
   # Output catalog as JSON
-  kyma module catalog -o json
+  kyma alpha module catalog -o json
 
   # List remote community modules in YAML format
-  kyma module catalog --remote -o yaml
+  kyma alpha module catalog --remote -o yaml
 ```
 
 ## Flags
 
 ```text
-  -o, --output string             Output format (Possible values: table, json, yaml)
-      --remote bool or []string   Fetch modules from the official repository or specify custom URL(s) (default "false")
-      --context string            The name of the kubeconfig context to use
-  -h, --help                      Help for the command
-      --kubeconfig string         Path to the Kyma kubeconfig file
-      --show-extensions-error     Prints a possible error when fetching extensions fails
-      --skip-extensions           Skips fetching extensions from the target Kyma environment
+  -o, --output string            Output format (Possible values: table, json, yaml)
+      --remote                   Fetch modules from the official repository
+      --remote-url stringSlice   List of URLs to custom community module repositories (default "[]")
+      --context string           The name of the kubeconfig context to use
+  -h, --help                     Help for the command
+      --kubeconfig string        Path to the Kyma kubeconfig file
+      --show-extensions-error    Prints a possible error when fetching extensions fails
+      --skip-extensions          Skips fetching extensions from the target Kyma environment
 ```
 
 ## See also

internal/cmd/alpha/module/catalog.go

@@ -1,12 +1,9 @@
 package module
 
 import (
-	"strings"
-
 	"github.com/kyma-project/cli.v3/internal/clierror"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
-	"github.com/kyma-project/cli.v3/internal/flags"
 	"github.com/kyma-project/cli.v3/internal/modulesv2"
 	"github.com/kyma-project/cli.v3/internal/modulesv2/dtos"
 	"github.com/spf13/cobra"
@@ -15,7 +12,8 @@ import (
 type catalogConfig struct {
 	*cmdcommon.KymaConfig
 
-	remote       flags.BoolOrStrings
+	remote       bool
+	remoteUrl    []string
 	outputFormat types.Format
 }
 
@@ -29,42 +27,30 @@ func NewCatalogV2CMD(kymaConfig *cmdcommon.KymaConfig) *cobra.Command {
 		Short: "Lists modules catalog",
 		Long:  `Use this command to list all available Kyma modules.`,
 		Example: `  # List all modules available in the cluster (core and community)
-  kyma module catalog
+  kyma alpha module catalog
 
   # List available community modules from the official repository
-  kyma module catalog --remote
+  kyma alpha module catalog --remote
 
   # List available community modules from a specific remote URL
-  kyma module catalog --remote=https://example.com/modules.json
+  kyma alpha module catalog --remote-url=https://example.com/modules.json
 
   # List available community modules from multiple remote URLs
-  kyma module catalog --remote=https://example.com/modules1.json,https://example.com/modules2.json
+  kyma alpha module catalog --remote=https://example.com/modules1.json,https://example.com/modules2.json
 
   # Output catalog as JSON
-  kyma module catalog -o json
+  kyma alpha module catalog -o json
 
   # List remote community modules in YAML format
-  kyma module catalog --remote -o yaml`,
+  kyma alpha module catalog --remote -o yaml`,
 		Run: func(_ *cobra.Command, args []string) {
-			if cfg.remote.Enabled && len(args) > 0 {
-				for _, a := range args {
-					parts := strings.SplitSeq(a, ",")
-					for p := range parts {
-						v := strings.TrimSpace(p)
-						if v != "" {
-							cfg.remote.Values = append(cfg.remote.Values, v)
-						}
-					}
-				}
-			}
 			clierror.Check(catalogModules(&cfg))
 		},
 	}
 
 	cmd.Flags().VarP(&cfg.outputFormat, "output", "o", "Output format (Possible values: table, json, yaml)")
-
-	remoteFlag := cmd.Flags().VarPF(&cfg.remote, "remote", "", "Fetch modules from the official repository or specify custom URL(s)")
-	remoteFlag.NoOptDefVal = "true"
+	cmd.Flags().BoolVar(&cfg.remote, "remote", false, "Fetch modules from the official repository")
+	cmd.Flags().StringSliceVar(&cfg.remoteUrl, "remote-url", []string{}, "List of URLs to custom community module repositories")
 
 	return cmd
 }
@@ -76,8 +62,7 @@ func catalogModules(cfg *catalogConfig) clierror.Error {
 	if err != nil {
 		return clierror.Wrap(err, clierror.New("failed to execute the catalog command"))
 	}
-
-	catalogResult, err := catalogOperation.Run(cfg.Ctx, dtos.NewCatalogConfigFromRemote(cfg.remote))
+	catalogResult, err := catalogOperation.Run(cfg.Ctx, dtos.NewCatalogConfigFromRemote(cfg.remote, cfg.remoteUrl))
 	if err != nil {
 		return clierror.Wrap(err, clierror.New("failed to list available modules from the target Kyma environment"))
 	}

internal/flags/boolorstrings.go

@@ -1,9 +1,5 @@
 package dtos
 
-import (
-	"github.com/kyma-project/cli.v3/internal/flags"
-)
-
 const KYMA_COMMUNITY_MODULES_REPOSITORY_URL = "https://kyma-project.github.io/community-modules/all-modules.json"
 
 type CatalogConfig struct {
@@ -12,13 +8,19 @@ type CatalogConfig struct {
 	ExternalUrls []string
 }
 
-func NewCatalogConfigFromRemote(remote flags.BoolOrStrings) *CatalogConfig {
-	if remote.Enabled && len(remote.Values) == 0 {
-		return &CatalogConfig{ExternalUrls: []string{KYMA_COMMUNITY_MODULES_REPOSITORY_URL}}
+func NewCatalogConfigFromRemote(remote bool, remoteUrls []string) *CatalogConfig {
+	externalUrls := []string{}
+
+	if remote {
+		externalUrls = append(externalUrls, KYMA_COMMUNITY_MODULES_REPOSITORY_URL)
+	}
+
+	if len(remoteUrls) > 0 {
+		externalUrls = append(externalUrls, remoteUrls...)
 	}
 
-	if remote.Enabled && len(remote.Values) > 0 {
-		return &CatalogConfig{ExternalUrls: uniqueValues(remote.Values)}
+	if len(externalUrls) > 0 {
+		return &CatalogConfig{ExternalUrls: uniqueValues(externalUrls)}
 	}
 
 	return &CatalogConfig{ListKyma: true, ListCluster: true}

internal/modulesv2/dtos/catalogconfig.go

@@ -3,44 +3,55 @@ package dtos_test
 import (
 	"testing"
 
-	"github.com/kyma-project/cli.v3/internal/flags"
 	"github.com/kyma-project/cli.v3/internal/modulesv2/dtos"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_NewCatalogConfigFromRemote(t *testing.T) {
 	tests := []struct {
-		remote         flags.BoolOrStrings
+		remote         bool
+		remoteUrl      []string
 		expectedConfig dtos.CatalogConfig
 	}{
 		{
-			remote:         flags.BoolOrStrings{Enabled: false, Values: nil},
+			remote:         false,
+			remoteUrl:      nil,
 			expectedConfig: dtos.CatalogConfig{ListKyma: true, ListCluster: true},
 		},
 		{
-			remote:         flags.BoolOrStrings{Enabled: false, Values: []string{}},
+			remote:         false,
+			remoteUrl:      []string{},
 			expectedConfig: dtos.CatalogConfig{ListKyma: true, ListCluster: true},
 		},
 		{
-			remote:         flags.BoolOrStrings{Enabled: true, Values: nil},
+			remote:         true,
+			remoteUrl:      nil,
 			expectedConfig: dtos.CatalogConfig{ExternalUrls: []string{dtos.KYMA_COMMUNITY_MODULES_REPOSITORY_URL}},
 		},
 		{
-			remote:         flags.BoolOrStrings{Enabled: true, Values: []string{}},
+			remote:         true,
+			remoteUrl:      []string{},
 			expectedConfig: dtos.CatalogConfig{ExternalUrls: []string{dtos.KYMA_COMMUNITY_MODULES_REPOSITORY_URL}},
 		},
 		{
-			remote:         flags.BoolOrStrings{Enabled: true, Values: []string{"https://external-repo.co.uk", "https://example.com"}},
+			remote:         false,
+			remoteUrl:      []string{"https://external-repo.co.uk", "https://example.com"},
 			expectedConfig: dtos.CatalogConfig{ExternalUrls: []string{"https://external-repo.co.uk", "https://example.com"}},
 		},
 		{
-			remote:         flags.BoolOrStrings{Enabled: true, Values: []string{"https://external-repo.co.uk", "https://example.com", "https://external-repo.co.uk", "https://external-repo.co.uk"}},
+			remote:         true,
+			remoteUrl:      []string{"https://external-repo.co.uk", "https://example.com"},
+			expectedConfig: dtos.CatalogConfig{ExternalUrls: []string{dtos.KYMA_COMMUNITY_MODULES_REPOSITORY_URL, "https://external-repo.co.uk", "https://example.com"}},
+		},
+		{
+			remote:         false,
+			remoteUrl:      []string{"https://external-repo.co.uk", "https://example.com", "https://external-repo.co.uk", "https://external-repo.co.uk"},
 			expectedConfig: dtos.CatalogConfig{ExternalUrls: []string{"https://external-repo.co.uk", "https://example.com"}},
 		},
 	}
 
 	for _, test := range tests {
-		result := dtos.NewCatalogConfigFromRemote(test.remote)
+		result := dtos.NewCatalogConfigFromRemote(test.remote, test.remoteUrl)
 
 		require.Equal(t, test.expectedConfig.ListKyma, result.ListKyma)
 		require.Equal(t, test.expectedConfig.ListCluster, result.ListCluster)