feat(*): switch to using controller-sdk-go for controller interactions (#402)

Author: Joshua-Anderson

glide.lock

@@ -41,3 +41,5 @@ import:
   version: 8e7dc108ab3a1ab6ce6d922bbaff5657b88e8e49
   repo: https://github.com/spf13/pflag
   vcs: git
+- package: github.com/deis/controller-sdk-go
+  version: 1c9d1c9821ed4984babf7136f1de46ac1698590a

glide.yaml

@@ -1,105 +1,48 @@
 package controller
 
 import (
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
 	"fmt"
-	"net/http"
 	"os"
-	"strings"
 
 	"github.com/deis/builder/pkg/conf"
-	"golang.org/x/crypto/ssh"
+	deis "github.com/deis/controller-sdk-go"
+	"github.com/deis/pkg/log"
 )
 
 const (
 	hostEnvName = "DEIS_CONTROLLER_SERVICE_HOST"
 	portEnvName = "DEIS_CONTROLLER_SERVICE_PORT"
 )
 
-// UserInfo represents the required information from a user to make a push and interact with the
-// controller
-type UserInfo struct {
-	Username    string
-	Key         string
-	Fingerprint string
-	Apps        []string
-}
-
-// URLStr returns the url of the controller with the given path prepended.
-func URLStr(additionalPath ...string) (string, error) {
+// New creates a new SDK client configured as the builder.
+func New() (*deis.Client, error) {
 	host := os.Getenv(hostEnvName)
 	port := os.Getenv(portEnvName)
 
-	if host == "" {
-		return "", fmt.Errorf("missing required '%v' environment variable", hostEnvName)
-	}
-
-	if port == "" {
-		return "", fmt.Errorf("missing required '%v' environment variable", portEnvName)
-	}
-
-	return fmt.Sprintf("http://%s:%s/%s", host, port, strings.Join(additionalPath, "/")), nil
-}
-
-// fingerprint generates a colon-separated fingerprint string from a public key.
-func fingerprint(key ssh.PublicKey) string {
-	hash := md5.Sum(key.Marshal())
-	buf := make([]byte, hex.EncodedLen(len(hash)))
-	hex.Encode(buf, hash[:])
-	// We need this in colon notation:
-	fp := make([]byte, len(buf)+15)
-
-	i, j := 0, 0
-	for ; i < len(buf); i++ {
-		if i > 0 && i%2 == 0 {
-			fp[j] = ':'
-			j++
-		}
-		fp[j] = buf[i]
-		j++
-	}
-	return string(fp)
-}
-
-// UserInfoFromKey makes a request to the controller to get the user info from they given key.
-func UserInfoFromKey(key ssh.PublicKey) (*UserInfo, error) {
-	fp := fingerprint(key)
-	url, err := URLStr("v2", "hooks", "key", fp)
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequest("GET", url, nil)
+	client, err := deis.New(true, fmt.Sprintf("http://%s:%s/", host, port), "")
 	if err != nil {
-		return nil, err
+		return client, err
 	}
+	client.UserAgent = "deis-builder"
 
 	builderKey, err := conf.GetBuilderKey()
 	if err != nil {
-		return nil, err
+		return client, err
 	}
+	client.HooksToken = builderKey
 
-	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Accept", "application/json")
-	req.Header.Add("User-Agent", "deis-builder")
-	req.Header.Add("X-Deis-Builder-Auth", builderKey)
+	return client, nil
+}
 
-	res, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
+// CheckAPICompat checks for API compatibility errors and warns about them.
+func CheckAPICompat(c *deis.Client, err error) error {
+	if err == deis.ErrAPIMismatch {
+		log.Info("WARNING: SDK and Controller API versions do not match. SDK: %s Controller: %s",
+			deis.APIVersion, c.ControllerAPIVersion)
 
-	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("user has no permissions to push in application")
+		// API mismatch isn't fatal, so after warning continue on.
+		return nil
 	}
 
-	ret := &UserInfo{}
-	if err := json.NewDecoder(res.Body).Decode(ret); err != nil {
-		return nil, err
-	}
-	ret.Fingerprint = fp
-	return ret, nil
+	return err
 }

pkg/controller/utils.go

@@ -11,11 +11,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/deis/builder/pkg"
+	"github.com/deis/builder/pkg/controller"
 	"github.com/deis/builder/pkg/git"
 	"github.com/deis/builder/pkg/k8s"
 	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
+	"github.com/deis/controller-sdk-go"
+	deisAPI "github.com/deis/controller-sdk-go/api"
+	"github.com/deis/controller-sdk-go/hooks"
 	"github.com/deis/pkg/log"
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
@@ -44,6 +47,7 @@ func run(cmd *exec.Cmd) error {
 }
 
 func build(
+	client *deis.Client,
 	conf *Config,
 	storageDriver storagedriver.StorageDriver,
 	kubeClient *client.Client,
@@ -91,11 +95,12 @@ func build(
 	slugBuilderInfo := NewSlugBuilderInfo(slugName)
 
 	// Get the application config from the controller, so we can check for a custom buildpack URL
-	appConf, err := getAppConfig(conf, builderKey, conf.Username, appName)
-	if err != nil {
-		return fmt.Errorf("getting app config for %s (%s)", appName, err)
+	appConf, err := hooks.GetAppConfig(client, conf.Username, appName)
+	if controller.CheckAPICompat(client, err) != nil {
+		return err
 	}
-	log.Debug("got the following config back for app %s: %+v", appName, *appConf)
+
+	log.Debug("got the following config back for app %s: %+v", appName, appConf)
 	var buildPackURL string
 	if buildPackURLInterface, ok := appConf.Values["BUILDPACK_URL"]; ok {
 		if bpStr, ok := buildPackURLInterface.(string); ok {
@@ -252,26 +257,24 @@ func build(
 	}
 	log.Debug("Done")
 
-	procType := pkg.ProcessType{}
+	procType := deisAPI.ProcessType{}
 	if procType, err = getProcFile(storageDriver, tmpDir, slugBuilderInfo.AbsoluteProcfileKey(), bType); err != nil {
 		return err
 	}
 
 	log.Info("Build complete.")
 
-	buildHook := createBuildHook(slugBuilderInfo, gitSha, conf.Username, appName, image, procType, usingDockerfile)
 	quit := progress("...", conf.SessionIdleInterval())
 	log.Info("Launching App...")
-	buildHookResp, err := publishRelease(conf, builderKey, buildHook)
+	if !usingDockerfile {
+		image = slugBuilderInfo.AbsoluteSlugObjectKey()
+	}
+	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), image, gitSha.Short(), procType, usingDockerfile)
 	quit <- true
 	<-quit
-	if err != nil {
+	if controller.CheckAPICompat(client, err) != nil {
 		return fmt.Errorf("publishing release (%s)", err)
 	}
-	release, ok := buildHookResp.Release["version"]
-	if !ok {
-		return fmt.Errorf("No release returned from Deis controller")
-	}
 
 	log.Info("Done, %s:v%d deployed to Deis\n", appName, release)
 	log.Info("Use 'deis open' to view this application in your browser\n")
@@ -294,8 +297,8 @@ func prettyPrintJSON(data interface{}) (string, error) {
 	return string(formatted.Bytes()), nil
 }
 
-func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, bType buildType) (pkg.ProcessType, error) {
-	procType := pkg.ProcessType{}
+func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, bType buildType) (deisAPI.ProcessType, error) {
+	procType := deisAPI.ProcessType{}
 	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
 		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
 		if err != nil {

pkg/gitreceive/build.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/arschles/assert"
-	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/storage"
+	"github.com/deis/controller-sdk-go/api"
 	"github.com/docker/distribution/context"
 	"gopkg.in/yaml.v2"
 )
@@ -35,7 +35,7 @@ func TestGetProcFileFromRepoSuccess(t *testing.T) {
 	}()
 	getter := &storage.FakeObjectGetter{}
 	procType, err := getProcFile(getter, tmpDir, objKey, buildTypeProcfile)
-	actualData := pkg.ProcessType{}
+	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
 	assert.Equal(t, procType, actualData, "data")
@@ -70,7 +70,7 @@ func TestGetProcFileFromServerSuccess(t *testing.T) {
 	}
 
 	procType, err := getProcFile(getter, "", objKey, buildTypeProcfile)
-	actualData := pkg.ProcessType{}
+	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
 	assert.Equal(t, procType, actualData, "data")