use the graphqlAPI in all relevant calls

handle non-error responses which represent server errors.

Author: ATGardner

VERSION

@@ -1 +1 @@
-0.31.2
+0.32.0

pkg/codefresh/argo_runtime.go

@@ -1,17 +1,16 @@
 package codefresh
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"io/ioutil"
 
 	"github.com/codefresh-io/go-sdk/pkg/codefresh/model"
 )
 
 type (
 	IArgoRuntimeAPI interface {
-		List() ([]model.Runtime, error)
-		Create(runtimeName, cluster, runtimeVersion string) (*model.RuntimeCreationResponse, error)
+		List(ctx context.Context) ([]model.Runtime, error)
+		Create(ctx context.Context, runtimeName, cluster, runtimeVersion string) (*model.RuntimeCreationResponse, error)
 	}
 	argoRuntime struct {
 		codefresh *codefresh
@@ -35,107 +34,75 @@ func newArgoRuntimeAPI(codefresh *codefresh) IArgoRuntimeAPI {
 	return &argoRuntime{codefresh: codefresh}
 }
 
-func (r *argoRuntime) Create(runtimeName, cluster, runtimeVersion string) (*model.RuntimeCreationResponse, error) {
+func (r *argoRuntime) List(ctx context.Context) ([]model.Runtime, error) {
 	jsonData := map[string]interface{}{
-		"query": `mutation CreateRuntime($name: String!, $cluster: String!, $runtimeVersion: String!) {
-		runtime(name: $name, cluster: $cluster, runtimeVersion: $runtimeVersion) {
-		  name
-		  newAccessToken
-		}
-	  }`,
-		"variables": map[string]interface{}{
-			"name":           runtimeName,
-			"cluster":        cluster,
-			"runtimeVersion": runtimeVersion,
-		},
-	}
-
-	response, err := r.codefresh.requestAPI(&requestOptions{
-		method: "POST",
-		path:   qlEndPoint,
-		body:   jsonData,
-	})
-
-	if err != nil {
-		fmt.Printf("The HTTP request failed with error %s\n", err)
-		return nil, err
-	}
-
-	defer response.Body.Close()
-
-	data, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		fmt.Printf("failed to read from response body")
-		return nil, err
+		"query": `{
+				runtimes {
+					edges {
+						node {
+							metadata {
+								name
+								namespace
+							}
+							self {
+								healthStatus
+								version
+							}
+							cluster
+						}
+					}
+				}
+			}`,
 	}
 
-	res := graphQlRuntimeCreationResponse{}
-	err = json.Unmarshal(data, &res)
+	res := &graphqlRuntimesResponse{}
+	err := r.codefresh.graphqlAPI(ctx, jsonData, res)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed getting runtime list: %w", err)
 	}
 
 	if len(res.Errors) > 0 {
 		return nil, graphqlErrorResponse{errors: res.Errors}
 	}
 
-	return &res.Data.Runtime, nil
+	runtimes := make([]model.Runtime, len(res.Data.Runtimes.Edges))
+	for i := range res.Data.Runtimes.Edges {
+		runtimes[i] = *res.Data.Runtimes.Edges[i].Node
+	}
+
+	return runtimes, nil
 }
 
-func (r *argoRuntime) List() ([]model.Runtime, error) {
+func (r *argoRuntime) Create(ctx context.Context, runtimeName, cluster, runtimeVersion string) (*model.RuntimeCreationResponse, error) {
 	jsonData := map[string]interface{}{
-		"query": `{
-		  runtimes {
-			edges {
-			  node {
-				metadata {
-				  name
-				  namespace
-				}
-				self {
-				  healthStatus
-				  version
+		"query": `
+			mutation CreateRuntime(
+				$name: String!
+				$cluster: String!
+				$runtimeVersion: String!
+			) {
+				runtime(name: $name, cluster: $cluster, runtimeVersion: $runtimeVersion) {
+					name
+					newAccessToken
 				}
-				cluster
-			  }
 			}
-		  }
-		}
-        `,
-	}
-
-	response, err := r.codefresh.requestAPI(&requestOptions{
-		method: "POST",
-		path:   qlEndPoint,
-		body:   jsonData,
-	})
-	if err != nil {
-		fmt.Printf("The HTTP request failed with error %s\n", err)
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	data, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		fmt.Printf("failed to read from response body")
-		return nil, err
+		`,
+		"variables": map[string]interface{}{
+			"name":           runtimeName,
+			"cluster":        cluster,
+			"runtimeVersion": runtimeVersion,
+		},
 	}
 
-	res := graphqlRuntimesResponse{}
-	err = json.Unmarshal(data, &res)
-
+	res := &graphQlRuntimeCreationResponse{}
+	err := r.codefresh.graphqlAPI(ctx, jsonData, res)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed getting runtime list: %w", err)
 	}
 
 	if len(res.Errors) > 0 {
 		return nil, graphqlErrorResponse{errors: res.Errors}
 	}
 
-	runtimes := make([]model.Runtime, len(res.Data.Runtimes.Edges))
-	for i := range res.Data.Runtimes.Edges {
-		runtimes[i] = *res.Data.Runtimes.Edges[i].Node
-	}
-
-	return runtimes, nil
+	return &res.Data.Runtime, nil
 }

pkg/codefresh/codefresh.go

@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
-	"github.com/codefresh-io/go-sdk/pkg/codefresh/model"
 	"github.com/google/go-querystring/query"
 )
 
@@ -33,13 +33,6 @@ type (
 		GitSource() IGitSourceAPI
 		Component() IComponentAPI
 	}
-
-	graphqlResponse struct {
-		Data struct {
-			Runtimes model.RuntimePage
-		}
-		Errors []graphqlError
-	}
 )
 
 var qlEndPoint = "/2.0/api/graphql"
@@ -148,6 +141,11 @@ func (c *codefresh) graphqlAPI(ctx context.Context, body map[string]interface{},
 	}
 	defer response.Body.Close()
 
+	statusOK := response.StatusCode >= 200 && response.StatusCode < 300
+	if !statusOK {
+		return errors.New(response.Status)
+	}
+
 	data, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read from response body: %w", err)

pkg/codefresh/git-source.go

@@ -1,16 +1,15 @@
 package codefresh
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"io/ioutil"
 
 	"github.com/codefresh-io/go-sdk/pkg/codefresh/model"
 )
 
 type (
 	IGitSourceAPI interface {
-		List(runtimeName string) ([]model.GitSource, error)
+		List(ctc context.Context, runtimeName string) ([]model.GitSource, error)
 	}
 
 	gitSource struct {
@@ -29,54 +28,37 @@ func newGitSourceAPI(codefresh *codefresh) IGitSourceAPI {
 	return &gitSource{codefresh: codefresh}
 }
 
-func (g *gitSource) List(runtimeName string) ([]model.GitSource, error) {
+func (g *gitSource) List(ctx context.Context, runtimeName string) ([]model.GitSource, error) {
 	jsonData := map[string]interface{}{
-		"query": `query GitSources($runtime: String) {
-			gitSources(runtime: $runtime) {
-			  edges {
-				node {
-				  metadata {
-					name
-				  }
-				  self {
-					path
-					repoURL
-					status {
-					  syncStatus
-					  healthStatus
+		"query": `
+			query GitSources($runtime: String) {
+				gitSources(runtime: $runtime) {
+					edges {
+						node {
+							metadata {
+								name
+							}
+							self {
+								path
+								repoURL
+								status {
+									syncStatus
+									healthStatus
+								}
+							}
+						}
 					}
-				  }
 				}
-			  }
-			}
-		  }`,
+			}`,
 		"variables": map[string]interface{}{
 			"runtime": runtimeName,
 		},
 	}
 
-	response, err := g.codefresh.requestAPI(&requestOptions{
-		method: "POST",
-		path:   "/2.0/api/graphql",
-		body:   jsonData,
-	})
+	res := &graphQlGitSourcesListResponse{}
+	err := g.codefresh.graphqlAPI(ctx, jsonData, res)
 	if err != nil {
-		fmt.Printf("The HTTP request failed with error %s\n", err)
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	data, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		fmt.Printf("failed to read from response body")
-		return nil, err
-	}
-
-	res := graphQlGitSourcesListResponse{}
-	err = json.Unmarshal(data, &res)
-
-	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed getting git-source list: %w", err)
 	}
 
 	gitSources := make([]model.GitSource, len(res.Data.GitSources.Edges))