Merge pull request #1151 from convox/20160826

[RELEASE] 20160826

api/controllers/builds.go

@@ -62,6 +62,13 @@ func BuildGet(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 		return httperr.Server(err)
 	}
 
+	l, err := models.Provider().BuildLogs(app, build)
+	if err != nil {
+		return httperr.Server(err)
+	}
+
+	b.Logs = l
+
 	return RenderJson(rw, b)
 }
 

api/models/cronjob.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"crypto/sha256"
+	"encoding/base32"
 	"fmt"
 	"strings"
 
@@ -47,5 +49,13 @@ func (cr *CronJob) ShortName() string {
 }
 
 func (cr *CronJob) LongName() string {
-	return fmt.Sprintf("%s-%s-%s", cr.App.StackName(), cr.Process(), cr.Name)
+	prefix := fmt.Sprintf("%s-%s-%s", cr.App.StackName(), cr.Process(), cr.Name)
+	hash := sha256.Sum256([]byte(prefix))
+	suffix := "-" + base32.StdEncoding.EncodeToString(hash[:])[:7]
+
+	// $prefix-$suffix-schedule" needs to be <= 64 characters
+	if len(prefix) > 55-len(suffix) {
+		prefix = prefix[:55-len(suffix)]
+	}
+	return prefix + suffix
 }

api/models/fixtures/Makefile

@@ -9,4 +9,4 @@ fixture:
 	go build -o ./fixture fixture.go
 
 %.json: %.yml
-	env AWS_REGION=test PROVIDER=test RACK=convox-test ./fixture $< > $@
+	env AWS_REGION=test PROVIDER=test CLUSTER=convox-test RACK=convox-test ./fixture $< > $@