[RELEASE] 20160720

api/controllers/environment.go

@@ -39,12 +39,12 @@ func EnvironmentSet(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 		return httperr.Server(err)
 	}
 
-	releaseId, err := models.PutEnvironment(app, models.LoadEnvironment(body))
+	releaseID, err := models.PutEnvironment(app, models.LoadEnvironment(body))
 	if err != nil {
 		return httperr.Server(err)
 	}
 
-	rw.Header().Set("Release-Id", releaseId)
+	rw.Header().Set("Release-Id", releaseID)
 
 	env, err := models.GetEnvironment(app)
 	if err != nil {
@@ -71,13 +71,13 @@ func EnvironmentDelete(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 
 	delete(env, name)
 
-	releaseId, err := models.PutEnvironment(app, env)
+	releaseID, err := models.PutEnvironment(app, env)
 
 	if err != nil {
 		return httperr.Server(err)
 	}
 
-	rw.Header().Set("Release-Id", releaseId)
+	rw.Header().Set("Release-Id", releaseID)
 
 	env, err = models.GetEnvironment(app)
 

api/controllers/processes.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/convox/rack/api/httperr"
@@ -126,6 +127,10 @@ func ProcessRunDetached(rw http.ResponseWriter, r *http.Request) *httperr.Error
 	err = a.RunDetached(process, command, release)
 
 	if err != nil {
+		if strings.HasPrefix(err.Error(), "no such release") {
+			return httperr.Errorf(404, err.Error())
+		}
+
 		return httperr.Server(err)
 	}
 

api/controllers/services.go

@@ -33,7 +33,8 @@ func ServiceShow(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 	}
 
 	// new services should use the provider interfaces
-	if s.Type == "syslog" {
+	switch s.Type {
+	case "fluentd", "papertrail", "syslog":
 		s, err := provider.ServiceGet(service)
 		if err != nil {
 			return httperr.Server(err)
@@ -64,7 +65,8 @@ func ServiceCreate(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 	delete(params, "type")
 
 	// new services should use the provider interfaces
-	if kind == "syslog" || kind == "papertrail" {
+	switch kind {
+	case "fluentd", "papertrail", "syslog":
 		s, err := provider.ServiceCreate(name, kind, params)
 		if err != nil {
 			return httperr.Server(err)
@@ -111,9 +113,6 @@ func ServiceDelete(rw http.ResponseWriter, r *http.Request) *httperr.Error {
 	service := mux.Vars(r)["service"]
 
 	s, err := provider.ServiceGet(service)
-	if awsError(err) == "ValidationError" {
-		return httperr.Errorf(404, "no such service: %s", service)
-	}
 	if err != nil {
 		return httperr.Server(err)
 	}