Merge pull request #159 from replicatedhq/laverya/use-ve-api-to-list-releases

use the paged /v3 api to list kots releases

Author: laverya

client/release.go

@@ -76,7 +76,7 @@ func (c *Client) ListReleases(appID string, appType string) ([]types.ReleaseInfo
 		return releaseInfos, nil
 
 	} else if appType == "kots" {
-		return c.KotsClient.ListReleases(appID)
+		return c.KotsHTTPClient.ListReleases(appID)
 	}
 
 	return nil, errors.New("unknown app type")

pkg/kotsclient/kotsclient_test.go

@@ -1,12 +1,12 @@
 package kotsclient
 
 import (
-	"time"
+	"fmt"
+	"net/http"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/replicated/pkg/graphql"
 	"github.com/replicatedhq/replicated/pkg/types"
-	"github.com/replicatedhq/replicated/pkg/util"
 )
 
 type GraphQLResponseKotsCreateRelease struct {
@@ -119,75 +119,51 @@ func (c *GraphQLClient) UpdateRelease(appID string, sequence int64, multiyaml st
 	return nil
 }
 
-const allKotsReleases = `
-  query allKotsReleases($appId: ID!, $pageSize: Int, $currentPage: Int) {
-    allKotsReleases(appId: $appId, pageSize: $pageSize, currentPage: $currentPage) {
-      sequence
-      channelSequence
-      created
-      updated
-      releasedAt
-      releaseNotes
-      channels {
-        id
-        name
-        currentVersion
-        numReleases
-      }
-      isReleaseNotEditable
-    }
-  }
-`
-
-func (c *GraphQLClient) ListReleases(appID string) ([]types.ReleaseInfo, error) {
-	response := GraphQLResponseListReleases{}
-
-	request := graphql.Request{ // todo: move to v3 api and make paged
-		Query: allKotsReleases,
-		Variables: map[string]interface{}{
-			"appId": appID,
-		},
-	}
-
-	if err := c.ExecuteRequest(request, &response); err != nil {
-		return nil, err
-	}
-
-	location, err := time.LoadLocation("Local")
-	if err != nil {
-		return nil, err
-	}
-
-	releaseInfos := make([]types.ReleaseInfo, 0, 0)
-	for _, kotsRelease := range response.Data.KotsReleases {
-		activeChannels := make([]types.Channel, 0, 0)
-		createdAt, err := util.ParseTime(kotsRelease.CreatedAt)
+func (c *VendorV3Client) ListReleases(appID string) ([]types.ReleaseInfo, error) {
+	allReleases := []types.ReleaseInfo{}
+	resp := types.ListReleasesResponse{}
+	done := false
+	page := 0
+	for !done {
+		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 {
-			return nil, err
+			done = true
+			continue
 		}
-
-		for _, kotsReleaseChannel := range kotsRelease.Channels {
-			activeChannel := types.Channel{
-				ID:   kotsReleaseChannel.ID,
-				Name: kotsReleaseChannel.Name,
+		page += 1
+		for _, release := range resp.Releases {
+			activeChannels := make([]types.Channel, 0, 0)
+
+			for _, kotsReleaseChannel := range release.Channels {
+				if kotsReleaseChannel.IsArchived {
+					continue
+				}
+				activeChannel := types.Channel{
+					ID:   kotsReleaseChannel.ID,
+					Name: kotsReleaseChannel.Name,
+				}
+				activeChannels = append(activeChannels, activeChannel)
 			}
-			activeChannels = append(activeChannels, activeChannel)
 
-		}
-		releaseInfo := types.ReleaseInfo{
-			AppID:          appID,
-			CreatedAt:      createdAt.In(location),
-			EditedAt:       time.Time{}, // not supported
-			Editable:       false,
-			Sequence:       kotsRelease.Sequence,
-			Version:        "n/a",
-			ActiveChannels: activeChannels,
+
+			newReleaseInfo := types.ReleaseInfo{
+				ActiveChannels: activeChannels,
+				AppID:          release.AppID,
+				CreatedAt:      release.CreatedAt,
+				Editable:       !release.IsReleaseNotEditable,
+				Sequence:       release.Sequence,
+			}
+			allReleases = append(allReleases, newReleaseInfo)
 		}
 
-		releaseInfos = append(releaseInfos, releaseInfo)
+		if len(resp.Releases) == 0 {
+			done = true
+			continue
+		}
 	}
 
-	return releaseInfos, nil
+	return allReleases, nil
 }
 
 const promoteKotsRelease = `

pkg/kotsclient/release.go

@@ -9,6 +9,8 @@ type Channel struct {
 	ReleaseSequence int64
 	ReleaseLabel    string
 
+	IsArchived bool `json:"isArchived"`
+
 	InstallCommands *InstallCommands
 }
 

pkg/kotsclient/release_test.go

@@ -31,3 +31,19 @@ type LintLinePosition struct {
 	Line     int64 `json:"line"`
 	Column   int64 `json:"column"`
 }
+
+// ListReleasesResponse contains the JSON releases list
+type ListReleasesResponse struct {
+	Releases []*KotsAppRelease `json:"releases"`
+}
+
+type KotsAppRelease struct {
+	AppID                string     `json:"appId"`
+	Sequence             int64      `json:"sequence"`
+	CreatedAt            time.Time  `json:"created"`
+	IsArchived           bool       `json:"isArchived"`
+	Spec                 string     `json:"spec"`
+	ReleaseNotes         string     `json:"releaseNotes"`
+	IsReleaseNotEditable bool       `json:"isReleaseNotEditable"`
+	Channels             []*Channel `json:"channels"`
+}