pr feedback

Author: pandemicsyn

cmd/kots/cli/install.go

@@ -163,14 +163,10 @@ func InstallCmd() *cobra.Command {
 			}()
 
 			upstream := pull.RewriteUpstream(args[0])
-			preferredChannelSlug, err := extractPreferredChannelSlug(upstream)
+			preferredChannelSlug, err := extractPreferredChannelSlug(log, upstream)
 			if err != nil {
 				return errors.Wrap(err, "failed to extract preferred channel slug")
 			}
-			if preferredChannelSlug == "" {
-				preferredChannelSlug = "stable"
-				log.ActionWithoutSpinner(fmt.Sprintf("No channel specified in upstream URI, falling back to channel %q.", preferredChannelSlug))
-			}
 
 			license, err = kotslicense.VerifyAndUpdateLicense(log, license, preferredChannelSlug, isAirgap)
 			if err != nil {

cmd/kots/cli/pull.go

@@ -1,7 +1,6 @@
 package cli
 
 import (
-	"fmt"
 	"os"
 	"path"
 	"strings"
@@ -106,16 +105,11 @@ func PullCmd() *cobra.Command {
 			log := logger.NewCLILogger(cmd.OutOrStdout())
 			log.Initialize()
 
-			preferredChannelSlug, err := extractPreferredChannelSlug(upstream)
+			preferredChannelSlug, err := extractPreferredChannelSlug(log, upstream)
 			if err != nil {
 				return errors.Wrap(err, "failed to extract preferred channel slug")
 			}
 
-			if preferredChannelSlug == "" {
-				preferredChannelSlug = "stable"
-				log.ActionWithoutSpinner(fmt.Sprintf("No channel specified in upstream URI, falling back to channel %q.", preferredChannelSlug))
-			}
-
 			// If we are passed a multi-channel license, verify that the requested channel is in the license
 			// so that we can warn the user immediately if it is not.
 			license, err = kotslicense.VerifyAndUpdateLicense(log, license, preferredChannelSlug, false)

cmd/kots/cli/util.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/kots/pkg/logger"
 	"github.com/replicatedhq/kots/pkg/replicatedapp"
 	"github.com/replicatedhq/kots/pkg/util"
 )
@@ -53,7 +54,7 @@ func splitEndpointAndNamespace(endpoint string) (string, string) {
 	return registryEndpoint, registryNamespace
 }
 
-func extractPreferredChannelSlug(upstreamURI string) (string, error) {
+func extractPreferredChannelSlug(log *logger.CLILogger, upstreamURI string) (string, error) {
 	u, err := url.ParseRequestURI(upstreamURI)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to parse uri")
@@ -67,5 +68,9 @@ func extractPreferredChannelSlug(upstreamURI string) (string, error) {
 	if replicatedUpstream.Channel != nil {
 		return *replicatedUpstream.Channel, nil
 	}
-	return "", nil
+
+	if log != nil {
+		log.ActionWithoutSpinner("No channel specified in upstream URI, falling back to channel slug 'stable.")
+	}
+	return "stable", nil
 }

cmd/kots/cli/util_test.go

@@ -111,7 +111,7 @@ func Test_extractPreferredChannelSlug(t *testing.T) {
 			args{
 				upstreamURI: "replicated://app-slug",
 			},
-			"",
+			"stable",
 			false,
 		},
 		{
@@ -133,7 +133,7 @@ func Test_extractPreferredChannelSlug(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := extractPreferredChannelSlug(tt.args.upstreamURI)
+			got, err := extractPreferredChannelSlug(nil, tt.args.upstreamURI)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("extractPreferredChannelSlug() error = %v, wantErr %v", err, tt.wantErr)
 				return