Fix an annoying chef-pedant failure over error strings

ctdk · Jul 2, 2015 · aef8927 · aef8927
1 parent 9eb4796
commit aef8927
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/environment/sql_funcs.go b/environment/sql_funcs.go
@@ -58,6 +58,9 @@ func (e *ChefEnvironment) fillEnvFromSQL(row datastore.ResRow) error {
 	e.ChefType = "environment"
 	e.JSONClass = "Chef::Environment"
 	if e.Name == "_default" {
+		e.Default = make(map[string]interface{})
+		e.Override = make(map[string]interface{})
+		e.CookbookVersions = make(map[string]string)
 		return nil
 	}
 

diff --git a/environments.go b/environments.go
@@ -247,7 +247,8 @@ func environmentHandler(w http.ResponseWriter, r *http.Request) {
 		env, err := environment.Get(envName)
 		if err != nil {
 			var errMsg string
-			if err.Status() == http.StatusNotFound {
+			// bleh, stupid errors
+			if err.Status() == http.StatusNotFound && (op != "recipes" && op != "cookbooks") {
 				errMsg = fmt.Sprintf("environment '%s' not found", envName)
 			} else {
 				errMsg = err.Error()