🍒 Fixed channels display for module catalog command (#2814) (#2825)

Author: musztardem

internal/modules/compability.go

@@ -17,10 +17,10 @@ func listOldModulesCatalog(moduleTemplates *kyma.ModuleTemplateList) ModulesList
 		version := ModuleVersion{
 			Version:    componentInfo.Version,
 			Repository: moduleTemplate.Spec.Info.Repository,
-			Channel:    moduleTemplate.Spec.Channel,
+			Channels:   []string{moduleTemplate.Spec.Channel},
 		}
 
-		if version.Version == "" || version.Channel == "" {
+		if version.Version == "" || version.Channels[0] == "" {
 			// ignore corrupted ModuleTemplates (without version or channel)
 			continue
 		}

internal/modules/enable.go

@@ -3,6 +3,7 @@ package modules
 import (
 	"context"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/kyma-project/cli.v3/internal/clierror"
@@ -98,7 +99,7 @@ func validateModuleAvailability(ctx context.Context, client kube.Client, repo re
 	}
 
 	for _, v := range availableCoreVersions {
-		if v.Channel == channel || channel == "" {
+		if slices.Contains(v.Channels, channel) {
 			return nil
 		}
 	}

internal/modules/list.go

@@ -50,7 +50,7 @@ type ModuleInstallDetails struct {
 type ModuleVersion struct {
 	Repository string
 	Version    string
-	Channel    string
+	Channels   []string
 }
 
 type ModulesList []Module
@@ -285,7 +285,7 @@ func listCoreModulesCatalog(ctx context.Context, client kube.Client) (ModulesLis
 		version := ModuleVersion{
 			Version:    moduleTemplate.Spec.Version,
 			Repository: moduleTemplate.Spec.Info.Repository,
-			Channel: getAssignedChannel(
+			Channels: getAssignedChannels(
 				*moduleReleaseMetas,
 				moduleName,
 				moduleTemplate.Spec.Version,
@@ -875,23 +875,25 @@ func getStateFromConditions(conditions []interface{}) string {
 }
 
 // look for channel assigned to version with specified moduleName
-func getAssignedChannel(releaseMetas kyma.ModuleReleaseMetaList, moduleName, version string) string {
+func getAssignedChannels(releaseMetas kyma.ModuleReleaseMetaList, moduleName, version string) []string {
 	for _, releaseMeta := range releaseMetas.Items {
 		if releaseMeta.Spec.ModuleName == moduleName {
-			return getChannelFromAssignments(releaseMeta.Spec.Channels, version)
+			return getChannelsFromAssignments(releaseMeta.Spec.Channels, version)
 		}
 	}
-	return ""
+	return []string{}
 }
 
-func getChannelFromAssignments(assignments []kyma.ChannelVersionAssignment, version string) string {
+func getChannelsFromAssignments(assignments []kyma.ChannelVersionAssignment, version string) []string {
+	channels := []string{}
+
 	for _, assignment := range assignments {
 		if assignment.Version == version {
-			return assignment.Channel
+			channels = append(channels, assignment.Channel)
 		}
 	}
 
-	return ""
+	return channels
 }
 
 // return index of module with given name. if not exists return -1

internal/modules/list_test.go

@@ -268,11 +268,11 @@ var (
 				{
 					Repository: "url-3",
 					Version:    "0.1",
-					Channel:    "regular",
+					Channels:   []string{"regular"},
 				},
 				{
-					Version: "0.2",
-					Channel: "fast",
+					Version:  "0.2",
+					Channels: []string{"fast"},
 				},
 			},
 			CommunityModule: false,
@@ -284,11 +284,12 @@ var (
 				{
 					Repository: "url-1",
 					Version:    "0.0.1",
-					Channel:    "fast",
+					Channels:   []string{"fast"},
 				},
 				{
 					Repository: "url-2",
 					Version:    "0.0.2",
+					Channels:   []string{},
 				},
 			},
 			CommunityModule: false,

internal/modules/manage.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 
 	"github.com/kyma-project/cli.v3/internal/kube"
 	"github.com/kyma-project/cli.v3/internal/kube/kyma"
@@ -52,18 +53,18 @@ func ManageModuleMissingInKyma(ctx context.Context, client kube.Client, repo rep
 		return fmt.Errorf("failed to get module release metas: %v", err)
 	}
 
-	channelAssignedToModuleVersion := getAssignedChannel(*moduleReleaseMetas, moduleName, installedModuleTemplate.Spec.Version)
+	channelsAssignedToModuleVersion := getAssignedChannels(*moduleReleaseMetas, moduleName, installedModuleTemplate.Spec.Version)
 	kymaCR, err := client.Kyma().GetDefaultKyma(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get kyma cr")
 	}
 	expectedChannel := kymaCR.Spec.Channel
 
-	if channelAssignedToModuleVersion != expectedChannel {
+	if !slices.Contains(channelsAssignedToModuleVersion, expectedChannel) {
 		return ErrModuleInstalledVersionNotInKymaChannel
 	}
 
-	clierr := Enable(ctx, client, repo, moduleName, channelAssignedToModuleVersion, enableDefaultCr(policy), []unstructured.Unstructured{}...)
+	clierr := Enable(ctx, client, repo, moduleName, expectedChannel, enableDefaultCr(policy), []unstructured.Unstructured{}...)
 	if clierr != nil {
 		return fmt.Errorf("failed to manage module: %v", clierr)
 	}
@@ -132,10 +133,10 @@ func GetAvailableChannelsAndVersions(ctx context.Context, client kube.Client, re
 			continue
 		}
 
-		assignedChannel := getAssignedChannel(*moduleReleaseMetas, moduleName, coreModuleTemplate.Spec.Version)
+		assignedChannels := getAssignedChannels(*moduleReleaseMetas, moduleName, coreModuleTemplate.Spec.Version)
 
-		if assignedChannel != "" {
-			channelsAndVersions[assignedChannel] = coreModuleTemplate.Spec.Version
+		for _, channel := range assignedChannels {
+			channelsAndVersions[channel] = coreModuleTemplate.Spec.Version
 		}
 	}
 

internal/modules/render.go

@@ -145,14 +145,18 @@ func convertInstall(details ModuleInstallDetails) string {
 // convert versions to string containing values separated with '\n'
 // and in format 'VERSION (CHANNEL)' or 'VERSION' if channel is empty
 func convertVersions(versions []ModuleVersion) string {
-	values := make([]string, len(versions))
-	for i, version := range versions {
-		value := version.Version
-		if version.Channel != "" {
-			value += fmt.Sprintf("(%s)", version.Channel)
-		}
+	values := make([]string, 0, len(versions))
+	for _, version := range versions {
+		if len(version.Channels) == 0 {
+			values = append(values, version.Version)
+		} else {
+			versionsWithChannels := []string{}
+			for _, channel := range version.Channels {
+				versionsWithChannels = append(versionsWithChannels, fmt.Sprintf("%s(%s)", version.Version, channel))
+			}
 
-		values[i] = value
+			values = append(values, strings.Join(versionsWithChannels, ", "))
+		}
 	}
 
 	return strings.Join(values, ", ")

internal/modules/render_test.go

@@ -16,11 +16,11 @@ var testModules = []Module{
 			{
 				Repository: "url-3",
 				Version:    "0.1",
-				Channel:    "regular",
+				Channels:   []string{"regular"},
 			},
 			{
-				Version: "0.2",
-				Channel: "fast",
+				Version:  "0.2",
+				Channels: []string{"fast"},
 			},
 		},
 		CommunityModule: false,
@@ -32,7 +32,7 @@ var testModules = []Module{
 			{
 				Repository: "url-1",
 				Version:    "0.0.1",
-				Channel:    "fast",
+				Channels:   []string{"fast"},
 			},
 			{
 				Repository: "url-2",
@@ -48,7 +48,7 @@ var testModules = []Module{
 			{
 				Repository: "url-1",
 				Version:    "0.1.1",
-				Channel:    "",
+				Channels:   []string{},
 			},
 			{
 				Repository: "url-2",