Merge pull request #95 from replicatedhq/createIfAbsent

Fix an issue that prevented promoting ship releases with "release create"

Author: dexhorthy

cli/cmd/release_create.go

@@ -55,8 +55,8 @@ func (r *runners) releaseCreate(cmd *cobra.Command, args []string) error {
 	}
 
 	// we check this again below, but lets be explicit and fail fast
-	if r.args.createReleasePromoteEnsureChannel && r.appType != "kots" {
-		return errors.Errorf("the flag --ensure-channel is only supported for KOTS applications, app %q is of type %q", r.appID, r.appType)
+	if r.args.createReleasePromoteEnsureChannel && !(r.appType == "ship" || r.appType == "kots") {
+		return errors.Errorf("the flag --ensure-channel is only supported for KOTS and Ship applications, app %q is of type %q", r.appID, r.appType)
 	}
 
 	if r.args.createReleaseYaml != "" && r.args.createReleaseYamlFile != "" {
@@ -92,7 +92,7 @@ func (r *runners) releaseCreate(cmd *cobra.Command, args []string) error {
 	var promoteChanID string
 	if r.args.createReleasePromote != "" {
 		var err error
-		promoteChanID, err = r.getOrCreateChannelForPromotion()
+		promoteChanID, err = r.getOrCreateChannelForPromotion(r.args.createReleasePromoteEnsureChannel)
 		if err != nil {
 			return errors.Wrapf(err, "get or create channel %q for promotion", promoteChanID)
 		}
@@ -129,7 +129,7 @@ func (r *runners) releaseCreate(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runners) getOrCreateChannelForPromotion() (string, error) {
+func (r *runners) getOrCreateChannelForPromotion(createIfAbsent bool) (string, error) {
 
 	description := "" // todo: do we want a flag for the desired channel description
 
@@ -138,7 +138,7 @@ func (r *runners) getOrCreateChannelForPromotion() (string, error) {
 		r.appType,
 		r.args.createReleasePromote,
 		description,
-		true,
+		createIfAbsent,
 	); if err != nil {
 		return "", errors.Wrapf(err, "get-or-create channel %q", r.args.createReleasePromote)
 	}

client/channel.go

@@ -72,7 +72,7 @@ func (c *Client) CreateChannel(appID string, appType string, name string, descri
 		}
 		return c.ListChannels(appID, appType)
 	} else if appType == "ship" {
-		if err := c.ShipClient.CreateChannel(appID, name, description); err != nil {
+		if _, err := c.ShipClient.CreateChannel(appID, name, description); err != nil {
 			return nil, err
 		}
 		return c.ShipClient.ListChannels(appID)
@@ -91,7 +91,7 @@ func (c *Client) GetChannelByName(appID string, appType string, name string, des
 	if appType == "platform" {
 		return c.PlatformClient.GetChannelByName(appID, name, description, createIfAbsent)
 	} else if appType == "ship" {
-		return nil, errors.New("ensure-channel operations are not supported for ship applications")
+		return c.ShipClient.GetChannelByName(appID, name, description, createIfAbsent)
 	} else if appType == "kots" {
 		return c.KotsClient.GetChannelByName(appID, name, description, createIfAbsent)
 	}

pkg/shipclient/channel.go

@@ -1,6 +1,8 @@
 package shipclient
 
 import (
+	"fmt"
+	"github.com/pkg/errors"
 	channels "github.com/replicatedhq/replicated/gen/go/v1"
 	"github.com/replicatedhq/replicated/pkg/graphql"
 	"github.com/replicatedhq/replicated/pkg/types"
@@ -16,6 +18,15 @@ type GraphQLResponseGetChannel struct {
 	Errors []graphql.GQLError  `json:"errors,omitempty"`
 }
 
+type GraphQLResponseCreateChannel struct {
+	Data   *ShipCreateChannelData `json:"data,omitempty"`
+	Errors []graphql.GQLError  `json:"errors,omitempty"`
+}
+
+type ShipCreateChannelData struct {
+	ShipChannel *ShipChannel `json:"createChannel"`
+}
+
 type ShipGetChannelData struct {
 	ShipChannel *ShipChannel `json:"getChannel"`
 }
@@ -111,8 +122,8 @@ mutation createChannel($appId: String!, $channelName: String!, $description: Str
   }
 }`
 
-func (c *GraphQLClient) CreateChannel(appID string, name string, description string) error {
-	response := graphql.ResponseErrorOnly{}
+func (c *GraphQLClient) CreateChannel(appID string, name string, description string) (*types.Channel, error) {
+	response := GraphQLResponseCreateChannel{}
 
 	request := graphql.Request{
 		Query: createChannelQuery,
@@ -124,15 +135,52 @@ func (c *GraphQLClient) CreateChannel(appID string, name string, description str
 	}
 
 	if err := c.ExecuteRequest(request, &response); err != nil {
-		return err
+		return nil, err
 	}
+	return &types.Channel{
+		ID:              response.Data.ShipChannel.ID,
+		Name:            response.Data.ShipChannel.Name,
+		Description:     response.Data.ShipChannel.Description,
+		ReleaseSequence: response.Data.ShipChannel.CurrentSequence,
+		ReleaseLabel:    response.Data.ShipChannel.CurrentVersion,
+	}, nil
+}
 
-	return nil
+func (c *GraphQLClient) GetChannelByName(appID string, name string, description string, create bool) (*types.Channel, error) {
+	allChannels, err := c.ListChannels(appID)
+	if err != nil {
+		return nil, err
+	}
 
-}
+	matchingChannels := make([]*types.Channel, 0)
+	for _, channel := range allChannels {
+		if channel.ID == name || channel.Name == name {
+			matchingChannels = append(matchingChannels, &types.Channel{
+				ID:              channel.ID,
+				Name:            channel.Name,
+				Description:     channel.Description,
+				ReleaseSequence: channel.ReleaseSequence,
+				ReleaseLabel:    channel.ReleaseLabel,
+			})
+		}
+	}
+
+	if len(matchingChannels) == 0 {
+		if create {
+			channel, err := c.CreateChannel(appID, name, description)
+			if err != nil {
+				return nil, errors.Wrapf(err, "create channel %q ", name)
+			}
+			return channel, nil
+		}
+
+		return nil, fmt.Errorf("could not find channel %q", name)
+	}
 
-func ArchiveChannel(appID string, channelID string) error {
-	return nil
+	if len(matchingChannels) > 1 {
+		return nil, fmt.Errorf("channel %q is ambiguous, please use channel ID", name)
+	}
+	return matchingChannels[0], nil
 }
 
 var getShipChannel = `