ref(controller.go,run.go): move all controller API calls to controller.go

also pass the builder key into the receive func for auth

Author: arschles

pkg/gitreceive/controller.go

@@ -1,9 +1,14 @@
 package gitreceive
 
 import (
+	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"strings"
+
+	"github.com/deis/builder/pkg"
 )
 
 var (
@@ -28,3 +33,116 @@ func (u unexpectedControllerStatusCode) Error() string {
 func controllerURLStr(conf *Config, additionalPath ...string) string {
 	return fmt.Sprintf("http://%s:%s/%s", conf.WorkflowHost, conf.WorkflowPort, strings.Join(additionalPath, "/"))
 }
+
+func setReqHeaders(builderKey string, req *http.Request) {
+	req.Header.Add("Content-Type", contentType)
+	req.Header.Add("Accept", contentType)
+	req.Header.Add("User-Agent", userAgent)
+	req.Header.Add("X-Deis-Builder-Auth", builderKey)
+}
+
+func getAppConfig(conf *Config, builderKey, userName, appName string) (*pkg.Config, error) {
+	data, err := json.Marshal(&pkg.ConfigHook{
+		ReceiveUser: userName,
+		ReceiveRepo: appName,
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	b := bytes.NewReader(data)
+	url := controllerURLStr(conf, "v2", "hooks", "config")
+	req, err := http.NewRequest("POST", url, b)
+
+	if err != nil {
+		return nil, err
+	}
+
+	setReqHeaders(builderKey, req)
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode == 404 {
+		return nil, errControllerNotFound
+	} else if res.StatusCode != 200 {
+		return nil, newUnexpectedControllerStatusCode(url, 200, res.StatusCode)
+	}
+
+	ret := &pkg.Config{}
+	if err := json.NewDecoder(res.Body).Decode(ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+}
+
+func publishRelease(conf *Config, builderKey string, buildHook *pkg.BuildHook) (*pkg.BuildHookResponse, error) {
+
+	var b bytes.Buffer
+	if err := json.NewEncoder(&b).Encode(buildHook); err != nil {
+		return nil, err
+	}
+	url := controllerURLStr(conf, "v2", "hooks", "build")
+	req, err := http.NewRequest("POST", url, &b)
+	if err != nil {
+		return nil, err
+	}
+	setReqHeaders(builderKey, req)
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer res.Body.Close()
+
+	if res.StatusCode == http.StatusNotFound {
+		return nil, errControllerNotFound
+	} else if res.StatusCode == http.StatusServiceUnavailable {
+		return nil, errControllerServiceUnavailable
+	} else if res.StatusCode != 200 {
+		return nil, newUnexpectedControllerStatusCode(url, 200, res.StatusCode)
+	}
+
+	ret := new(pkg.BuildHookResponse)
+	if err := json.NewDecoder(res.Body).Decode(ret); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
+
+func receive(conf *Config, builderKey, gitSha string) error {
+	urlStr := controllerURLStr(conf, "v2", "hooks", "push")
+	bodyMap := map[string]string{
+		"receive_user":         conf.Username,
+		"receive_repo":         conf.App(),
+		"sha":                  gitSha,
+		"fingerprint":          conf.Fingerprint,
+		"ssh_connection":       conf.SSHConnection,
+		"ssh_original_command": conf.SSHOriginalCommand,
+	}
+	var body bytes.Buffer
+	if err := json.NewEncoder(&body).Encode(bodyMap); err != nil {
+		return err
+	}
+	req, err := http.NewRequest("POST", urlStr, &body)
+	if err != nil {
+		return err
+	}
+	setReqHeaders(builderKey, req)
+
+	// TODO: use ctxhttp here (https://godoc.org/golang.org/x/net/context/ctxhttp)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != 201 {
+		return newUnexpectedControllerStatusCode(urlStr, 201, resp.StatusCode)
+	}
+	return nil
+}

pkg/gitreceive/get_app_config.go

@@ -71,7 +71,7 @@ func Run(conf *Config) error {
 		if err != nil {
 			return err
 		}
-		if err := receive(conf, newRev); err != nil {
+		if err := receive(conf, builderKey, newRev); err != nil {
 			return err
 		}
 		if err := build(conf, builderKey, newRev); err != nil {