fix(cd): update cluster provider handling to use Distro and CurrentVersion (#662)

Author: floreks

cmd/command/cd/cd.go

@@ -4,14 +4,15 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/urfave/cli"
+	"helm.sh/helm/v3/pkg/action"
+
 	"github.com/pluralsh/plural-cli/pkg/cd"
 	"github.com/pluralsh/plural-cli/pkg/client"
 	"github.com/pluralsh/plural-cli/pkg/common"
 	"github.com/pluralsh/plural-cli/pkg/config"
 	"github.com/pluralsh/plural-cli/pkg/console"
 	"github.com/pluralsh/plural-cli/pkg/utils"
-	"github.com/urfave/cli"
-	"helm.sh/helm/v3/pkg/action"
 )
 
 func init() {
@@ -171,8 +172,8 @@ func confirmCluster(url, token string) (bool, error) {
 	if clusterFragment.Handle != nil {
 		handle = *clusterFragment.Handle
 	}
-	if clusterFragment.Provider != nil {
-		provider = clusterFragment.Provider.Name
+	if clusterFragment.Distro != nil {
+		provider = string(*clusterFragment.Distro)
 	}
 	return common.Confirm(fmt.Sprintf("Are you sure you want to install deploy operator for the cluster:\nName: %s\nHandle: %s\nProvider: %s\n", myCluster.MyCluster.Name, handle, provider), "PLURAL_INSTALL_AGENT_CONFIRM"), nil
 }

cmd/command/cd/cd_clusters.go

@@ -6,15 +6,16 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	gqlclient "github.com/pluralsh/console/go/client"
+	"github.com/pluralsh/polly/containers"
+	"github.com/samber/lo"
+	"github.com/urfave/cli"
+
 	"github.com/pluralsh/plural-cli/pkg/cd"
 	"github.com/pluralsh/plural-cli/pkg/common"
 	"github.com/pluralsh/plural-cli/pkg/console"
 	"github.com/pluralsh/plural-cli/pkg/console/errors"
 	"github.com/pluralsh/plural-cli/pkg/kubernetes/config"
 	"github.com/pluralsh/plural-cli/pkg/utils"
-	"github.com/pluralsh/polly/containers"
-	"github.com/samber/lo"
-	"github.com/urfave/cli"
 )
 
 var providerSurvey = []*survey.Question{
@@ -126,19 +127,19 @@ func (p *Plural) handleListClusters(_ *cli.Context) error {
 	}
 	headers := []string{"Id", "Name", "Handle", "Version", "Provider"}
 	return utils.PrintTable(clusters, headers, func(cl *gqlclient.ClusterEdgeFragment) ([]string, error) {
-		provider := ""
-		if cl.Node.Provider != nil {
-			provider = cl.Node.Provider.Name
+		var distro gqlclient.ClusterDistro
+		if cl.Node.Distro != nil {
+			distro = *cl.Node.Distro
 		}
 		handle := ""
 		if cl.Node.Handle != nil {
 			handle = *cl.Node.Handle
 		}
 		version := ""
 		if cl.Node.Version != nil {
-			version = *cl.Node.Version
+			version = *cl.Node.CurrentVersion
 		}
-		return []string{cl.Node.ID, cl.Node.Name, handle, version, provider}, nil
+		return []string{cl.Node.ID, cl.Node.Name, handle, version, string(distro)}, nil
 	})
 }
 
@@ -233,8 +234,8 @@ func (p *Plural) handleUpdateCluster(c *cli.Context) error {
 	headers := []string{"Id", "Name", "Handle", "Version", "Provider"}
 	return utils.PrintTable([]gqlclient.ClusterFragment{*result.UpdateCluster}, headers, func(cl gqlclient.ClusterFragment) ([]string, error) {
 		provider := ""
-		if cl.Provider != nil {
-			provider = cl.Provider.Name
+		if cl.Distro != nil {
+			provider = string(*cl.Distro)
 		}
 		handle := ""
 		if cl.Handle != nil {

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
-	github.com/pluralsh/console/go/client v1.37.0
+	github.com/pluralsh/console/go/client v1.49.0
 	github.com/pluralsh/console/go/controller v0.0.0-20250430123026-a75a764f035b
 	github.com/pluralsh/gqlclient v1.12.2
 	github.com/pluralsh/plural-operator v0.5.5

go.sum

@@ -567,8 +567,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pluralsh/console/go/client v1.37.0 h1:lO+WCfmw/p9aYn9zUDirkbRpmWLdT72k7z713XR74CY=
-github.com/pluralsh/console/go/client v1.37.0/go.mod h1:rPx6hufc/s17Wzy+7C4ZnA1nmn1JR0m4JeoxAQYj8+4=
+github.com/pluralsh/console/go/client v1.49.0 h1:XoGxQ5kUScuZWxLh+rGcPluOEFHVHzXaRQbxl+00uUw=
+github.com/pluralsh/console/go/client v1.49.0/go.mod h1:2rzO4sns8H+0QtvRqKrFfCnzrvmTcPpsEXmQAgSRFrE=
 github.com/pluralsh/console/go/controller v0.0.0-20250430123026-a75a764f035b h1:XtEoflAGAT+tPAEw5MNoyu+8ziaZuXVwjpTZbP1o050=
 github.com/pluralsh/console/go/controller v0.0.0-20250430123026-a75a764f035b/go.mod h1:TQ/AdKBjZqB9f9s0SHpOVRON7bktahs8Ieh00Rylxp8=
 github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACSv/GmLEtRftNQj/Y4ddHEo=

pkg/console/describe.go

@@ -42,40 +42,17 @@ func DescribeCluster(cluster *consoleclient.ClusterFragment) (string, error) {
 		if cluster.Handle != nil {
 			w.Write(Level0, "Handle:\t@%s\n", *cluster.Handle)
 		}
-		if cluster.Version != nil {
-			w.Write(Level0, "Version:\t%s\n", *cluster.Version)
-		}
 		if cluster.CurrentVersion != nil {
-			w.Write(Level0, "Current Version:\t%s\n", *cluster.CurrentVersion)
+			w.Write(Level0, "Version:\t%s\n", *cluster.CurrentVersion)
 		}
 		if cluster.PingedAt != nil {
 			w.Write(Level0, "Pinged At:\t%s\n", *cluster.PingedAt)
 		}
 		if cluster.Self != nil {
 			w.Write(Level0, "Self:\t%v\n", *cluster.Self)
 		}
-
-		if cluster.Provider != nil {
-			w.Write(Level0, "Provider:\n")
-			w.Write(Level1, "Id:\t%s\n", cluster.Provider.ID)
-			w.Write(Level1, "Name:\t%s\n", cluster.Provider.Name)
-			w.Write(Level1, "Namespace:\t%s\n", cluster.Provider.Namespace)
-			w.Write(Level1, "Editable:\t%v\n", *cluster.Provider.Editable)
-			w.Write(Level1, "Cloud:\t%v\n", cluster.Provider.Cloud)
-			if cluster.Provider.Repository != nil {
-				w.Write(Level1, "Git:\n")
-				w.Write(Level2, "Id:\t%s\n", cluster.Provider.Repository.ID)
-				w.Write(Level2, "Url:\t%s\n", cluster.Provider.Repository.URL)
-				if cluster.Provider.Repository.AuthMethod != nil {
-					w.Write(Level2, "Auth Method:\t%v\n", *cluster.Provider.Repository.AuthMethod)
-				}
-				if cluster.Provider.Repository.Health != nil {
-					w.Write(Level2, "Health:\t%v\n", *cluster.Provider.Repository.Health)
-				}
-				if cluster.Provider.Repository.Error != nil {
-					w.Write(Level2, "Error:\t%s\n", *cluster.Provider.Repository.Error)
-				}
-			}
+		if cluster.Distro != nil {
+			w.Write(Level0, "Distro:\t%s\n", *cluster.Distro)
 		}
 
 		return nil