add a new response object for proVCluster list

sort imports

Author: ApsTomar

pkg/cli/list_helm.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	`github.com/loft-sh/vcluster/pkg/platform`
 	"strings"
 	"time"
 
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/log/table"
 	"github.com/loft-sh/vcluster/pkg/cli/find"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	"github.com/loft-sh/vcluster/pkg/platform"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/clientcmd"
@@ -28,7 +28,11 @@ type ListVCluster struct {
 	Connected  bool
 }
 
-type vClusterProjectMap map[string]string
+// ListProVCluster holds information about a vCluster along with the associated project name
+type ListProVCluster struct {
+	ListVCluster
+	Project string
+}
 
 type ListOptions struct {
 	Driver string

pkg/cli/list_platform.go

@@ -38,18 +38,16 @@ func ListPlatform(ctx context.Context, options *ListOptions, globalFlags *flags.
 		return err
 	}
 
-	vClusters, vClusterProjectMapping := proToVClusters(proVClusters, currentContext)
-	err = printProVClusters(ctx, options, vClusters, vClusterProjectMapping, globalFlags, logger)
+	err = printProVClusters(ctx, options, proToVClusters(proVClusters, currentContext), globalFlags, logger)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func proToVClusters(vClusters []*platform.VirtualClusterInstanceProject, currentContext string) ([]ListVCluster, vClusterProjectMap) {
-	var output []ListVCluster
-	vClusterProjectMapping := make(vClusterProjectMap)
+func proToVClusters(vClusters []*platform.VirtualClusterInstanceProject, currentContext string) []ListProVCluster {
+	var output []ListProVCluster
 	for _, vCluster := range vClusters {
 		status := string(vCluster.VirtualCluster.Status.Phase)
 		if vCluster.VirtualCluster.DeletionTimestamp != nil {
@@ -71,24 +69,24 @@ func proToVClusters(vClusters []*platform.VirtualClusterInstanceProject, current
 		}
 
 		connected := strings.HasPrefix(currentContext, "vcluster-platform_"+vCluster.VirtualCluster.Name+"_"+vCluster.Project.Name)
-		vClusterOutput := ListVCluster{
-			Name:       name,
-			Namespace:  vCluster.VirtualCluster.Spec.ClusterRef.Namespace,
-			Connected:  connected,
-			Created:    vCluster.VirtualCluster.CreationTimestamp.Time,
-			AgeSeconds: int(time.Since(vCluster.VirtualCluster.CreationTimestamp.Time).Round(time.Second).Seconds()),
-			Status:     status,
-			Version:    version,
+		vClusterOutput := ListProVCluster{
+			ListVCluster{
+				Name:       name,
+				Namespace:  vCluster.VirtualCluster.Spec.ClusterRef.Namespace,
+				Connected:  connected,
+				Created:    vCluster.VirtualCluster.CreationTimestamp.Time,
+				AgeSeconds: int(time.Since(vCluster.VirtualCluster.CreationTimestamp.Time).Round(time.Second).Seconds()),
+				Status:     status,
+				Version:    version,
+			},
+			vCluster.Project.Name,
 		}
-		uniqueVClusterIdentifier := vClusterOutput.Name + "_" + vClusterOutput.Namespace
-		vClusterProjectMapping[uniqueVClusterIdentifier] = vCluster.Project.Name
 		output = append(output, vClusterOutput)
 	}
-	return output, vClusterProjectMapping
+	return output
 }
 
-func printProVClusters(ctx context.Context, options *ListOptions, output []ListVCluster,
-	vClusterProjectMapping vClusterProjectMap, globalFlags *flags.GlobalFlags, logger log.Logger) error {
+func printProVClusters(ctx context.Context, options *ListOptions, output []ListProVCluster, globalFlags *flags.GlobalFlags, logger log.Logger) error {
 	if options.Output == "json" {
 		bytes, err := json.MarshalIndent(output, "", "    ")
 		if err != nil {
@@ -98,7 +96,7 @@ func printProVClusters(ctx context.Context, options *ListOptions, output []ListV
 		logger.WriteString(logrus.InfoLevel, string(bytes)+"\n")
 	} else {
 		header := []string{"NAME", "NAMESPACE", "PROJECT", "STATUS", "VERSION", "CONNECTED", "AGE"}
-		values := toTableValues(output, vClusterProjectMapping)
+		values := toTableValues(output)
 		table.PrintTable(logger, header, values)
 
 		ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
@@ -118,19 +116,18 @@ func printProVClusters(ctx context.Context, options *ListOptions, output []ListV
 	return nil
 }
 
-func toTableValues(vClusters []ListVCluster, vClusterProjectMapping vClusterProjectMap) [][]string {
+func toTableValues(vClusters []ListProVCluster) [][]string {
 	var values [][]string
 	for _, vCluster := range vClusters {
 		isConnected := ""
 		if vCluster.Connected {
 			isConnected = "True"
 		}
 
-		uniqueVClusterIdentifier := vCluster.Name + "_" + vCluster.Namespace
 		values = append(values, []string{
 			vCluster.Name,
 			vCluster.Namespace,
-			vClusterProjectMapping[uniqueVClusterIdentifier],
+			vCluster.Project,
 			vCluster.Status,
 			vCluster.Version,
 			isConnected,