Merge pull request #175 from replicatedhq/jelena-nil-fix-promote

jgruica · web-flow · commit ba075ca0e2b1 · 2021-04-07T15:35:14.000-06:00
Nil pointer fix when promoting release
diff --git a/pkg/kotsclient/channel.go b/pkg/kotsclient/channel.go
@@ -18,7 +18,7 @@ type GraphQLResponseCreateChannel struct {
 }
 
 type KotsGetChannelData struct {
-	KotsChannel *KotsChannel `json:"getKotsChannel"`
+	KotsChannel *KotsChannel `json:"channel"`
 }
 
 type KotsCreateChannelData struct {
@@ -168,9 +168,9 @@ func (c *GraphQLClient) CreateChannel(appID string, name string, description str
 }
 
 func (c *VendorV3Client) GetChannel(appID string, channelID string) (*channels.AppChannel, []channels.ChannelRelease, error) {
-	var response = KotsGetChannelData{}
+	response := KotsGetChannelData{}
 
-	url := fmt.Sprintf("/v3/app/%s/channel/%s", appID, channelID)
+	url := fmt.Sprintf("/v3/app/%s/channel/%s", appID, url.QueryEscape(channelID))
 	err := c.DoJSON("GET", url, http.StatusOK, nil, &response)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "get app channel")

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ type GraphQLResponseCreateChannel struct {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`type KotsGetChannelData struct {`
`21`		- KotsChannel *KotsChannel `json:"getKotsChannel"`
	`21`	+ KotsChannel *KotsChannel `json:"channel"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`type KotsCreateChannelData struct {`
`@@ -168,9 +168,9 @@ func (c *GraphQLClient) CreateChannel(appID string, name string, description str`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`func (c VendorV3Client) GetChannel(appID string, channelID string) (channels.AppChannel, []channels.ChannelRelease, error) {`
`171`		`- var response = KotsGetChannelData{}`
	`171`	`+ response := KotsGetChannelData{}`
`172`	`172`
`173`		`- url := fmt.Sprintf("/v3/app/%s/channel/%s", appID, channelID)`
	`173`	`+ url := fmt.Sprintf("/v3/app/%s/channel/%s", appID, url.QueryEscape(channelID))`
`174`	`174`	`err := c.DoJSON("GET", url, http.StatusOK, nil, &response)`
`175`	`175`	`if err != nil {`
`176`	`176`	`return nil, nil, errors.Wrap(err, "get app channel")`