Inconsistent channel info 63010 (#230)

* checkpoint: de-couple client.GetClient() from v1 api

* Move install commands from client to cli

The commands are presentation-layer strings, derived from the app
and channel.

* fix channel test to use new type

* only include install commands for kots apps

Author: bbawn

cli/cmd/channel_counts.go

@@ -25,7 +25,7 @@ func (r *runners) channelCounts(cmd *cobra.Command, args []string) error {
 	chanID := args[0]
 
 	if r.appType == "platform" {
-		appChan, _, err := r.api.GetChannel(r.appID, r.appType, chanID)
+		appChan, _, err := r.platformAPI.GetChannel(r.appID, chanID)
 		if err != nil {
 			return err
 		}

cli/cmd/channel_create.go

@@ -24,7 +24,7 @@ func (r *runners) InitChannelCreate(parent *cobra.Command) {
 }
 
 func (r *runners) channelCreate(cmd *cobra.Command, args []string) error {
-	allChannels, err := r.api.CreateChannel(r.appID, r.appType, r.appSlug, r.args.channelCreateName, r.args.channelCreateDescription)
+	allChannels, err := r.api.CreateChannel(r.appID, r.appType, r.args.channelCreateName, r.args.channelCreateDescription)
 	if err != nil {
 		return err
 	}

cli/cmd/channel_inspect.go

@@ -25,12 +25,12 @@ func (r *runners) channelInspect(_ *cobra.Command, args []string) error {
 	}
 
 	channelNameOrID := args[0]
-	appChan, err := r.api.GetChannelByName(r.appID, r.appType, r.appSlug, channelNameOrID)
+	appChan, err := r.api.GetChannelByName(r.appID, r.appType, channelNameOrID)
 	if err != nil {
 		return err
 	}
 
-	if err = print.ChannelAttrs(r.w, appChan); err != nil {
+	if err = print.ChannelAttrs(r.w, r.appType, r.appSlug, appChan); err != nil {
 		return err
 	}
 

cli/cmd/channel_ls.go

@@ -17,7 +17,7 @@ func (r *runners) InitChannelList(parent *cobra.Command) {
 }
 
 func (r *runners) channelList(cmd *cobra.Command, args []string) error {
-	channels, err := r.api.ListChannels(r.appID, r.appType, r.appSlug, "")
+	channels, err := r.api.ListChannels(r.appID, r.appType, "")
 	if err != nil {
 		return err
 	}

cli/cmd/channel_releases.go

@@ -26,7 +26,7 @@ func (r *runners) channelReleases(cmd *cobra.Command, args []string) error {
 
 	if r.appType == "platform" {
 
-		_, releases, err := r.api.GetChannel(r.appID, r.appType, chanID)
+		_, releases, err := r.platformAPI.GetChannel(r.appID, chanID)
 		if err != nil {
 			return err
 		}

cli/cmd/customer_create.go

@@ -31,7 +31,6 @@ func (r *runners) createCustomer(_ *cobra.Command, _ []string) error {
 	channel, err := r.api.GetOrCreateChannelByName(
 		r.appID,
 		r.appType,
-		r.appSlug,
 		r.args.customerCreateChannel,
 		"",
 		r.args.customerCreateEnsureChannel,

cli/cmd/release_create.go

@@ -320,7 +320,6 @@ func (r *runners) getOrCreateChannelForPromotion(channelName string, createIfAbs
 	channel, err := r.api.GetOrCreateChannelByName(
 		r.appID,
 		r.appType,
-		r.appSlug,
 		channelName,
 		description,
 		createIfAbsent,

cli/cmd/release_promote.go

@@ -41,7 +41,7 @@ func (r *runners) releasePromote(cmd *cobra.Command, args []string) error {
 
 	if r.appType != "ship" {
 		// try to turn chanID into an actual id if it was a channel name
-		channelID, err := r.api.GetOrCreateChannelByName(r.appID, r.appType, r.appSlug, channelName, "", false)
+		channelID, err := r.api.GetOrCreateChannelByName(r.appID, r.appType, channelName, "", false)
 		if err != nil {
 			return errors.Wrapf(err, "unable to get channel ID from name")
 		}

cli/print/channel_attributes.go

@@ -1,35 +1,106 @@
 package print
 
 import (
-	"github.com/replicatedhq/replicated/pkg/types"
+	"fmt"
+	"os"
 	"text/tabwriter"
 	"text/template"
+
+	"github.com/replicatedhq/replicated/pkg/types"
 )
 
-var channelAttrsTmplSrc = `ID:	{{ .ID }}
-NAME:	{{ .Name }}
-DESCRIPTION:	{{ .Description }}
-RELEASE:	{{ if ge .ReleaseSequence 1 }}{{ .ReleaseSequence }}{{else}}	{{end}}
-VERSION:	{{ .ReleaseLabel }}{{ with .InstallCommands }}
+var channelAttrsTmplSrc = `ID:	{{ .Chan.ID }}
+NAME:	{{ .Chan.Name }}
+DESCRIPTION:	{{ .Chan.Description }}
+RELEASE:	{{ if ge .Chan.ReleaseSequence 1 }}{{ .Chan.ReleaseSequence }}{{else}}	{{end}}
+VERSION:	{{ .Chan.ReleaseLabel }}{{ with .Existing }}
 EXISTING:
 
-{{ .Existing }}
-
+{{ . }}
+{{end}}{{with .Embedded}}
 EMBEDDED:
 
-{{ .Embedded }}
-
+{{ . }}
+{{end}}{{with .Airgap}}
 AIRGAP:
 
-{{ .Airgap }}
+{{ . }}
 {{end}}
 `
 
 var channelAttrsTmpl = template.Must(template.New("ChannelAttributes").Parse(channelAttrsTmplSrc))
 
-func ChannelAttrs(w *tabwriter.Writer, appChan *types.Channel) error {
-	if err := channelAttrsTmpl.Execute(w, appChan); err != nil {
+func ChannelAttrs(
+	w *tabwriter.Writer,
+	appType string,
+	appSlug string,
+	appChan *types.Channel,
+) error {
+	attrs := struct {
+		Existing string
+		Embedded string
+		Airgap   string
+		Chan     *types.Channel
+	}{
+		Chan: appChan,
+	}
+	if appType == "kots" {
+		attrs.Existing = existingInstallCommand(appSlug, appChan.Slug)
+		attrs.Embedded = embeddedInstallCommand(appSlug, appChan.Slug)
+		attrs.Airgap = embeddedAirgapInstallCommand(appSlug, appChan.Slug)
+	}
+	if err := channelAttrsTmpl.Execute(w, attrs); err != nil {
 		return err
 	}
 	return w.Flush()
 }
+
+const embeddedInstallBaseURL = "https://k8s.kurl.sh"
+
+var embeddedInstallOverrideURL = os.Getenv("EMBEDDED_INSTALL_BASE_URL")
+
+func embeddedInstallCommand(appSlug, chanSlug string) string {
+
+	kurlBaseURL := embeddedInstallBaseURL
+	if embeddedInstallOverrideURL != "" {
+		kurlBaseURL = embeddedInstallOverrideURL
+	}
+
+	kurlURL := fmt.Sprintf("%s/%s-%s", kurlBaseURL, appSlug, chanSlug)
+	if chanSlug == "stable" {
+		kurlURL = fmt.Sprintf("%s/%s", kurlBaseURL, appSlug)
+	}
+	return fmt.Sprintf(`    curl -fsSL %s | sudo bash`, kurlURL)
+
+}
+
+func embeddedAirgapInstallCommand(appSlug, chanSlug string) string {
+
+	kurlBaseURL := embeddedInstallBaseURL
+	if embeddedInstallOverrideURL != "" {
+		kurlBaseURL = embeddedInstallOverrideURL
+	}
+
+	slug := fmt.Sprintf("%s-%s", appSlug, chanSlug)
+	if chanSlug == "stable" {
+		slug = appSlug
+	}
+	kurlURL := fmt.Sprintf("%s/bundle/%s.tar.gz", kurlBaseURL, slug)
+
+	return fmt.Sprintf(`    curl -fSL -o %s.tar.gz %s
+    # ... scp or sneakernet %s.tar.gz to airgapped machine, then
+    tar xvf %s.tar.gz
+    sudo bash ./install.sh airgap`, slug, kurlURL, slug, slug)
+
+}
+
+func existingInstallCommand(appSlug, chanSlug string) string {
+
+	slug := appSlug
+	if chanSlug != "stable" {
+		slug = fmt.Sprintf("%s/%s", appSlug, chanSlug)
+	}
+
+	return fmt.Sprintf(`    curl -fsSL https://kots.io/install | bash
+    kubectl kots install %s`, slug)
+}

client/channel.go

@@ -5,12 +5,11 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	channels "github.com/replicatedhq/replicated/gen/go/v1"
 	"github.com/replicatedhq/replicated/pkg/platformclient"
 	"github.com/replicatedhq/replicated/pkg/types"
 )
 
-func (c *Client) ListChannels(appID string, appType string, appSlug string, channelName string) ([]types.Channel, error) {
+func (c *Client) ListChannels(appID string, appType string, channelName string) ([]types.Channel, error) {
 
 	if appType == "platform" {
 		platformChannels, err := c.PlatformClient.ListChannels(appID)
@@ -35,22 +34,32 @@ func (c *Client) ListChannels(appID string, appType string, appSlug string, chan
 	} else if appType == "ship" {
 		return c.ShipClient.ListChannels(appID)
 	} else if appType == "kots" {
-		return c.KotsClient.ListChannels(appID, appSlug, channelName)
+		return c.KotsClient.ListChannels(appID, channelName)
 	}
 
 	return nil, errors.New("unknown app type")
 }
 
-func (c *Client) GetChannel(appID string, appType string, channelID string) (*channels.AppChannel, []channels.ChannelRelease, error) {
+func (c *Client) GetChannel(appID string, appType string, channelID string) (*types.Channel, error) {
 	if appType == "platform" {
-		return c.PlatformClient.GetChannel(appID, channelID)
+		platformChannel, _, err := c.PlatformClient.GetChannel(appID, channelID)
+		if err != nil {
+			return nil, err
+		}
+		channel := types.Channel{
+			ID:              platformChannel.Id,
+			Name:            platformChannel.Name,
+			Description:     platformChannel.Description,
+			ReleaseSequence: platformChannel.ReleaseSequence,
+			ReleaseLabel:    platformChannel.ReleaseLabel,
+		}
+		return &channel, nil
 	} else if appType == "ship" {
 		return c.ShipClient.GetChannel(appID, channelID)
 	} else if appType == "kots" {
 		return c.KotsClient.GetChannel(appID, channelID)
 	}
-	return nil, nil, errors.New("unknown app type")
-
+	return nil, errors.New("unknown app type")
 }
 
 func (c *Client) ArchiveChannel(appID string, appType string, channelID string) error {
@@ -65,13 +74,13 @@ func (c *Client) ArchiveChannel(appID string, appType string, channelID string)
 
 }
 
-func (c *Client) CreateChannel(appID string, appType string, appSlug string, name string, description string) ([]types.Channel, error) {
+func (c *Client) CreateChannel(appID string, appType string, name string, description string) ([]types.Channel, error) {
 
 	if appType == "platform" {
 		if err := c.PlatformClient.CreateChannel(appID, name, description); err != nil {
 			return nil, err
 		}
-		return c.ListChannels(appID, appType, appSlug, name)
+		return c.ListChannels(appID, appType, name)
 	} else if appType == "ship" {
 		if _, err := c.ShipClient.CreateChannel(appID, name, description); err != nil {
 			return nil, err
@@ -81,36 +90,30 @@ func (c *Client) CreateChannel(appID string, appType string, appSlug string, nam
 		if _, err := c.KotsClient.CreateChannel(appID, name, description); err != nil {
 			return nil, err
 		}
-		return c.KotsClient.ListChannels(appID, appSlug, name)
+		return c.KotsClient.ListChannels(appID, name)
 	}
 
 	return nil, errors.New("unknown app type")
 }
 
-func (c *Client) GetOrCreateChannelByName(appID string, appType string, appSlug string, nameOrID string, description string, createIfAbsent bool) (*types.Channel, error) {
+func (c *Client) GetOrCreateChannelByName(appID string, appType string, nameOrID string, description string, createIfAbsent bool) (*types.Channel, error) {
 	gqlNotFoundErr := fmt.Sprintf("channel %s not found", nameOrID)
-	channel, _, err := c.GetChannel(appID, appType, nameOrID)
+	channel, err := c.GetChannel(appID, appType, nameOrID)
 	if err == nil {
-		return &types.Channel{
-			ID:              channel.Id,
-			Name:            channel.Name,
-			Description:     channel.Description,
-			ReleaseSequence: channel.ReleaseSequence,
-			ReleaseLabel:    channel.ReleaseLabel,
-		}, nil
+		return channel, nil
 	} else if !strings.Contains(err.Error(), gqlNotFoundErr) && !errors.Is(err, platformclient.ErrNotFound) {
 		return nil, errors.Wrap(err, "get channel")
 	}
 
-	allChannels, err := c.ListChannels(appID, appType, appSlug, nameOrID)
+	allChannels, err := c.ListChannels(appID, appType, nameOrID)
 	if err != nil {
 		return nil, err
 	}
 
 	foundChannel, numMatching, err := c.findChannel(allChannels, nameOrID)
 
 	if numMatching == 0 && createIfAbsent {
-		updatedListOfChannels, err := c.CreateChannel(appID, appType, appSlug, nameOrID, description)
+		updatedListOfChannels, err := c.CreateChannel(appID, appType, nameOrID, description)
 		if err != nil {
 			return nil, errors.Wrapf(err, "create channel %q ", nameOrID)
 		}
@@ -123,8 +126,8 @@ func (c *Client) GetOrCreateChannelByName(appID string, appType string, appSlug
 	return foundChannel, errors.Wrapf(err, "find channel %q", nameOrID)
 }
 
-func (c *Client) GetChannelByName(appID string, appType string, appSlug string, name string) (*types.Channel, error) {
-	return c.GetOrCreateChannelByName(appID, appType, appSlug, name, "", false)
+func (c *Client) GetChannelByName(appID string, appType string, name string) (*types.Channel, error) {
+	return c.GetOrCreateChannelByName(appID, appType, name, "", false)
 }
 
 func (c *Client) findChannel(channels []types.Channel, name string) (*types.Channel, int, error) {
@@ -150,7 +153,7 @@ func (c *Client) UpdateSemanticVersioningForChannel(appType string, appID string
 	} else if appType == "ship" {
 		return errors.New("This feature is not currently supported for Ship applications.")
 	} else if appType == "kots" {
-		channel, _, err := c.KotsClient.GetChannel(appID, chanID)
+		channel, err := c.KotsClient.GetChannel(appID, chanID)
 		if err != nil {
 			return err
 		}