Merge pull request #172 from replicatedhq/jelena-vendor-api-kots-channel

Using vendor-api instead graphql-api when getting channel
replicatedhq · Mar 31, 2021 · 85c1118 · 85c1118
2 parents a33bbcd + b840de3
commit 85c1118
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 81 deletions.
diff --git a/client/channel.go b/client/channel.go
@@ -48,7 +48,7 @@ func (c *Client) GetChannel(appID string, appType string, channelID string) (*ch
 	} else if appType == "ship" {
 		return c.ShipClient.GetChannel(appID, channelID)
 	} else if appType == "kots" {
-		return c.KotsClient.GetChannel(appID, channelID)
+		return c.KotsHTTPClient.GetChannel(appID, channelID)
 	}
 	return nil, nil, errors.New("unknown app type")
 

diff --git a/pkg/kotsclient/channel.go b/pkg/kotsclient/channel.go
@@ -12,11 +12,6 @@ import (
 	"github.com/replicatedhq/replicated/pkg/types"
 )
 
-type GraphQLResponseGetChannel struct {
-	Data   *KotsGetChannelData `json:"data,omitempty"`
-	Errors []graphql.GQLError  `json:"errors,omitempty"`
-}
-
 type GraphQLResponseCreateChannel struct {
 	Data   *KotsCreateChannelData `json:"data,omitempty"`
 	Errors []graphql.GQLError     `json:"errors,omitempty"`
@@ -172,85 +167,21 @@ func (c *GraphQLClient) CreateChannel(appID string, name string, description str
 
 }
 
-const getKotsChannel = `
-query getKotsChannel($channelId: ID!) {
-  getKotsChannel(channelId: $channelId) {
-    id
-    appId
-    name
-    description
-    channelIcon
-    channelSequence
-    releaseSequence
-    currentVersion
-    currentReleaseDate
-    installInstructions
-    numReleases
-    adoptionRate {
-      releaseSequence
-      semver
-      count
-      percent
-      totalOnChannel
-    }
-    customers {
-      id
-      name
-      avatar
-      actions {
-	shipApplyDocker
-      }
-      installationId
-      shipInstallStatus {
-	status
-	updatedAt
-      }
-    }
-    githubRef {
-      owner
-      repoFullName
-      branch
-      path
-    }
-    extraLintRules
-    created
-    updated
-    isDefault
-    isArchived
-    releases {
-      semver
-      releaseNotes
-      created
-      updated
-      releasedAt
-      sequence
-      channelSequence
-      airgapBuildStatus
-    }
-  }
-}
-`
+func (c *VendorV3Client) GetChannel(appID string, channelID string) (*channels.AppChannel, []channels.ChannelRelease, error) {
+	var response = KotsGetChannelData{}
 
-func (c *GraphQLClient) GetChannel(appID string, channelID string) (*channels.AppChannel, []channels.ChannelRelease, error) {
-	response := GraphQLResponseGetChannel{}
-
-	request := graphql.Request{
-		Query: getKotsChannel,
-		Variables: map[string]interface{}{
-			"appID":     appID,
-			"channelId": channelID,
-		},
-	}
-	if err := c.ExecuteRequest(request, &response); err != nil {
-		return nil, nil, err
+	url := fmt.Sprintf("/v3/app/%s/channel/%s", appID, channelID)
+	err := c.DoJSON("GET", url, http.StatusOK, nil, &response)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "get app channel")
 	}
 
 	channelDetail := channels.AppChannel{
-		Id:              response.Data.KotsChannel.ID,
-		Name:            response.Data.KotsChannel.Name,
-		Description:     response.Data.KotsChannel.Description,
-		ReleaseLabel:    response.Data.KotsChannel.CurrentVersion,
-		ReleaseSequence: response.Data.KotsChannel.ReleaseSequence,
+		Id:              response.KotsChannel.ID,
+		Name:            response.KotsChannel.Name,
+		Description:     response.KotsChannel.Description,
+		ReleaseLabel:    response.KotsChannel.CurrentVersion,
+		ReleaseSequence: response.KotsChannel.ReleaseSequence,
 	}
 	return &channelDetail, nil, nil
 }