Merge remote-tracking branch 'origin/master' into CR-4490-svc-cs

# Conflicts:
#	VERSION

Author: andrii-codefresh

VERSION

@@ -1 +1 @@
-0.25.3
+0.26.0

go.mod

@@ -3,6 +3,7 @@ module github.com/codefresh-io/go-sdk
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/dustin/go-humanize v1.0.0
+	github.com/google/go-querystring v1.1.0
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mitchellh/go-homedir v1.0.0

go.sum

@@ -10,6 +10,10 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
@@ -51,6 +55,8 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7D
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

pkg/codefresh/codefresh.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/google/go-querystring/query"
 	"io/ioutil"
 	"net/http"
-	"strings"
 )
 
 type (
@@ -92,12 +92,9 @@ func (c *codefresh) requestAPI(opt *requestOptions) (*http.Response, error) {
 	return response, nil
 }
 
-func toQS(qs map[string]string) string {
-	var arr = []string{}
-	for k, v := range qs {
-		arr = append(arr, fmt.Sprintf("%s=%s", k, v))
-	}
-	return "?" + strings.Join(arr, "&")
+func toQS(qs interface{}) string {
+	v, _ := query.Values(qs)
+	return "?" + v.Encode()
 }
 
 func (c *codefresh) decodeResponseInto(resp *http.Response, target interface{}) error {

pkg/codefresh/contexts.go

@@ -32,6 +32,11 @@ type (
 			} `json:"data"`
 		} `json:"spec"`
 	}
+
+	GitContextsQs struct {
+		Type    []string `url:"type"`
+		Decrypt string   `url:"decrypt"`
+	}
 )
 
 func newContextAPI(codefresh *codefresh) IContextAPI {
@@ -40,9 +45,10 @@ func newContextAPI(codefresh *codefresh) IContextAPI {
 
 func (c context) GetGitContexts() (error, *[]ContextPayload) {
 	var result []ContextPayload
-	var qs = map[string]string{
-		"type":    "git.github",
-		"decrypt": "true",
+
+	qs := GitContextsQs{
+		Type:    []string{"git.github", "git.gitlab", "git.github-app"},
+		Decrypt: "true",
 	}
 
 	resp, err := c.codefresh.requestAPI(&requestOptions{

pkg/codefresh/types.go

@@ -28,6 +28,6 @@ type (
 		path   string
 		method string
 		body   interface{}
-		qs     map[string]string
+		qs     interface{}
 	}
 )