Merge pull request #177 from replicatedhq/divolgin/gzip-kots

gzip kots release data in http requests

Author: divolgin

client/release.go

@@ -113,7 +113,7 @@ func (c *Client) CreateRelease(appID string, appType string, yaml string) (*type
 	} else if appType == "ship" {
 		return c.ShipClient.CreateRelease(appID, yaml)
 	} else if appType == "kots" {
-		return c.KotsClient.CreateRelease(appID, yaml)
+		return c.KotsHTTPClient.CreateRelease(appID, yaml)
 	}
 
 	return nil, errors.New("unknown app type")
@@ -126,7 +126,7 @@ func (c *Client) UpdateRelease(appID string, appType string, sequence int64, yam
 	} else if appType == "ship" {
 		return c.ShipClient.UpdateRelease(appID, sequence, yaml)
 	} else if appType == "kots" {
-		return c.KotsClient.UpdateRelease(appID, sequence, yaml)
+		return c.KotsHTTPClient.UpdateRelease(appID, sequence, yaml)
 	}
 	return errors.New("unknown app type")
 }

pkg/kotsclient/release.go

@@ -1,36 +1,18 @@
 package kotsclient
 
 import (
+	"bytes"
+	"compress/gzip"
 	"fmt"
+	"io"
 	"net/http"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/replicated/pkg/graphql"
 	"github.com/replicatedhq/replicated/pkg/types"
 )
 
-type GraphQLResponseKotsCreateRelease struct {
-	Data   KotsCreateReleaseData `json:"data,omitempty"`
-	Errors []graphql.GQLError    `json:"errors,omitempty"`
-}
-
-type KotsCreateReleaseData struct {
-	KotsReleaseData KotsReleaseSequence `json:"createKotsRelease"`
-}
-
-type KotsReleaseSequence struct {
-	Sequence int64 `json:"sequence"`
-}
-
-type GraphQLResponseKotsUpdateRelease struct {
-	Data   KotsUpdateReleaseData `json:"data,omitempty"`
-	Errors []graphql.GQLError    `json:"errors,omitempty"`
-}
-
-type KotsUpdateReleaseData struct {
-	KotsReleaseData KotsReleaseSequence `json:"updateKotsRelease"`
-}
-
 type GraphQLResponseListReleases struct {
 	Data   *KotsReleasesData  `json:"data,omitempty"`
 	Errors []graphql.GQLError `json:"errors,omitempty"`
@@ -48,72 +30,60 @@ type KotsRelease struct {
 	Channels     []*KotsChannel `json:"channels"`
 }
 
-type GraphQLResponseUpdateKotsRelease struct {
-	Data *KotsReleaseUpdateData `json:"data,omitempty"`
-}
-
-type KotsReleaseUpdateData struct {
-	UpdateKotsRelease *UpdateKotsRelease `json:"updateKotsRelease"`
-}
-
-type UpdateKotsRelease struct {
-	ID     string `json:"id"`
-	Config string `json:"spec,omitempty"`
-}
-
-const createReleaseQuery = `
-mutation createKotsRelease($appId: ID!, $spec: String) {
-	createKotsRelease(appId: $appId, spec: $spec) {
-		sequence
+func (c *VendorV3Client) CreateRelease(appID string, multiyaml string) (*types.ReleaseInfo, error) {
+	gzipData := bytes.NewBuffer(nil)
+	gzipWriter := gzip.NewWriter(gzipData)
+	_, err := io.Copy(gzipWriter, strings.NewReader(multiyaml))
+	if err != nil {
+		gzipWriter.Close()
+		return nil, errors.Wrap(err, "failed to write gzip data")
 	}
-}`
 
-func (c *GraphQLClient) CreateRelease(appID string, multiyaml string) (*types.ReleaseInfo, error) {
-	response := GraphQLResponseKotsCreateRelease{}
+	if err := gzipWriter.Close(); err != nil {
+		return nil, errors.Wrap(err, "failed to close gzip writer")
+	}
 
-	request := graphql.Request{
-		Query: createReleaseQuery,
-		Variables: map[string]interface{}{
-			"appId": appID,
-			"spec":  multiyaml,
-		},
+	request := types.KotsCreateReleaseRequest{
+		SpecGzip: gzipData.Bytes(),
 	}
 
-	if err := c.ExecuteRequest(request, &response); err != nil {
-		return nil, err
+	response := types.KotsGetReleaseResponse{}
+
+	url := fmt.Sprintf("/v3/app/%s/release", appID)
+	err = c.DoJSON("POST", url, http.StatusCreated, request, &response)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create release")
 	}
 
 	releaseInfo := types.ReleaseInfo{
-		AppID:    appID,
-		Sequence: response.Data.KotsReleaseData.Sequence,
+		AppID:    response.Release.AppID,
+		Sequence: response.Release.Sequence,
 	}
 
 	return &releaseInfo, nil
 }
 
-const updateKotsRelease = `
-  mutation updateKotsRelease($appId: ID!, $spec: String!, $sequence: Int) {
-    updateKotsRelease(appId: $appId, spec: $spec, sequence: $sequence) {
-      sequence
-    }
-  }
-`
-
-func (c *GraphQLClient) UpdateRelease(appID string, sequence int64, multiyaml string) error {
-	response := GraphQLResponseUpdateKotsRelease{}
+func (c *VendorV3Client) UpdateRelease(appID string, sequence int64, multiyaml string) error {
+	gzipData := bytes.NewBuffer(nil)
+	gzipWriter := gzip.NewWriter(gzipData)
+	_, err := io.Copy(gzipWriter, strings.NewReader(multiyaml))
+	if err != nil {
+		gzipWriter.Close()
+		return errors.Wrap(err, "failed to write gzip data")
+	}
 
-	request := graphql.Request{
-		Query: updateKotsRelease,
+	if err := gzipWriter.Close(); err != nil {
+		return errors.Wrap(err, "failed to close gzip writer")
+	}
 
-		Variables: map[string]interface{}{
-			"appId":    appID,
-			"spec":     multiyaml,
-			"sequence": sequence,
-		},
+	request := types.KotsUpdateReleaseRequest{
+		SpecGzip: gzipData.Bytes(),
 	}
 
-	if err := c.ExecuteRequest(request, &response); err != nil {
-		return err
+	url := fmt.Sprintf("/v3/app/%s/release/%d", appID, sequence)
+	err = c.DoJSON("PUT", url, http.StatusOK, request, nil)
+	if err != nil {
+		return errors.Wrap(err, "failed to create release")
 	}
 
 	return nil
@@ -124,7 +94,7 @@ func (c *VendorV3Client) ListReleases(appID string) ([]types.ReleaseInfo, error)
 	done := false
 	page := 0
 	for !done {
-		resp := types.ListReleasesResponse{}
+		resp := types.KotsListReleasesResponse{}
 		path := fmt.Sprintf("/v3/app/%s/releases?currentPage=%d&pageSize=20", appID, page)
 		err := c.DoJSON("GET", path, http.StatusOK, nil, &resp)
 		if err != nil {

pkg/types/release.go

@@ -32,8 +32,20 @@ type LintLinePosition struct {
 	Column   int64 `json:"column"`
 }
 
-// ListReleasesResponse contains the JSON releases list
-type ListReleasesResponse struct {
+type KotsCreateReleaseRequest struct {
+	SpecGzip []byte `json:"spec_gzip"`
+}
+
+type KotsGetReleaseResponse struct {
+	Release KotsAppRelease `json:"release"`
+}
+
+type KotsUpdateReleaseRequest struct {
+	SpecGzip []byte `json:"spec_gzip"`
+}
+
+// KotsListReleasesResponse contains the JSON releases list
+type KotsListReleasesResponse struct {
 	Releases []*KotsAppRelease `json:"releases"`
 }