update cli w correct endpoints, fix unmarshal error

api/client/api.go

@@ -65,12 +65,22 @@ func (c *Client) getRequest(relPath string, data interface{}, response interface
 	err := schema.NewEncoder().Encode(data, vals)
 
 	urlVals := url.Values(vals)
-
-	req, err := http.NewRequest(
-		"GET",
-		fmt.Sprintf("%s/%s?%s", c.BaseURL, relPath, urlVals.Encode()),
-		nil,
-	)
+	encodedURLVals := urlVals.Encode()
+	var req *http.Request
+
+	if encodedURLVals != "" {
+		req, err = http.NewRequest(
+			"GET",
+			fmt.Sprintf("%s%s?%s", c.BaseURL, relPath, encodedURLVals),
+			nil,
+		)
+	} else {
+		req, err = http.NewRequest(
+			"GET",
+			fmt.Sprintf("%s%s", c.BaseURL, relPath),
+			nil,
+		)
+	}
 
 	if err != nil {
 		return err
@@ -98,7 +108,7 @@ func (c *Client) postRequest(relPath string, data interface{}, response interfac
 
 	req, err := http.NewRequest(
 		"POST",
-		fmt.Sprintf("%s/%s", c.BaseURL, relPath),
+		fmt.Sprintf("%s%s", c.BaseURL, relPath),
 		strings.NewReader(string(strData)),
 	)
 
@@ -126,7 +136,7 @@ func (c *Client) deleteRequest(relPath string, data interface{}, response interf
 
 	req, err := http.NewRequest(
 		"DELETE",
-		fmt.Sprintf("%s/%s", c.BaseURL, relPath),
+		fmt.Sprintf("%s%s", c.BaseURL, relPath),
 		strings.NewReader(string(strData)),
 	)
 
@@ -178,13 +188,7 @@ func (c *Client) sendRequest(req *http.Request, v interface{}, useCookie bool) (
 	}
 
 	if v != nil {
-		debugBytes, _ := ioutil.ReadAll(res.Body)
-
-		fmt.Println(string(debugBytes))
-
-		copyBody := strings.NewReader(string(debugBytes))
-
-		if err = json.NewDecoder(copyBody).Decode(v); err != nil {
+		if err = json.NewDecoder(res.Body).Decode(v); err != nil {
 			return nil, err
 		}
 	}

api/server/handlers/release/create.go

@@ -316,16 +316,16 @@ func getGARunner(
 	helmRelease *release.Release,
 ) (*actions.GithubActions, error) {
 	cEnv := &containerEnvConfig{}
-	rawValues, err := yaml.Marshal(helmRelease.Config)
 
-	if err != nil {
-		return nil, err
-	}
+	rawValues, err := yaml.Marshal(helmRelease.Config)
 
-	err = yaml.Unmarshal(rawValues, cEnv)
+	if err == nil {
+		err = yaml.Unmarshal(rawValues, cEnv)
 
-	if err != nil {
-		return nil, err
+		// if unmarshal error, just set to empty map
+		if err != nil {
+			cEnv.Container.Env.Normal = make(map[string]string)
+		}
 	}
 
 	repoSplit := strings.Split(ga.GitRepo, "/")

docker/cli.Dockerfile

@@ -2,12 +2,13 @@
 
 # Base Go environment
 # -------------------
-FROM golang:1.15-alpine as base
+FROM golang:1.15 as base
 WORKDIR /porter
 
-RUN apk update && apk add --no-cache gcc musl-dev git make
+RUN apt-get update && apt-get install -y gcc musl-dev git make
 
 COPY go.mod go.sum ./
+COPY Makefile .
 COPY /cli ./cli
 COPY /internal ./internal
 COPY /api ./api
@@ -25,8 +26,8 @@ RUN make build-cli
 
 # Deployment environment
 # ----------------------
-FROM alpine
-RUN apk update
+FROM ubuntu:latest
+RUN apt-get update && apt-get install -y ca-certificates
 
 COPY --from=build-go /porter/bin/porter .