Accept stack.yaml as a default file if present

Requested by @welteki, if stack.yml is present then it is
taken to be the default with a --yaml/-f argument being needed.

This change also looks for stack.yaml as a valid alternative
name.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

commands/faas.go

@@ -21,9 +21,11 @@ import (
 )
 
 const (
-	defaultGateway       = "http://127.0.0.1:8080"
-	defaultNetwork       = ""
-	defaultYAML          = "stack.yml"
+	defaultGateway = "http://127.0.0.1:8080"
+	defaultNetwork = ""
+	defaultYML     = "stack.yml"
+	defaultYAML    = "stack.yaml"
+
 	defaultSchemaVersion = "1.0"
 )
 
@@ -144,6 +146,8 @@ func checkAndSetDefaultYaml() {
 	// Check if there is a default yaml file and set it
 	if _, err := stat(defaultYAML); err == nil {
 		yamlFile = defaultYAML
+	} else if _, err := stat(defaultYML); err == nil {
+		yamlFile = defaultYML
 	}
 }
 

commands/faas_test.go

@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 )
@@ -11,15 +11,15 @@ var mockStatParams string
 func setupFaas(statError error) {
 	yamlFile = ""
 	mockStatParams = ""
-	faasCmd.SetOutput(ioutil.Discard)
+	faasCmd.SetOutput(io.Discard)
 
 	stat = func(f string) (os.FileInfo, error) {
 		mockStatParams = f
 		return nil, statError
 	}
 }
 
-func TestCallsStatWithDefaulYAMLFileName(t *testing.T) {
+func TestCallsStatWithDefaultYAMLFileName(t *testing.T) {
 	setupFaas(nil)
 
 	Execute([]string{"help"})

commands/template_store_list.go

@@ -138,7 +138,7 @@ func getTemplateInfo(repository string) ([]TemplateInfo, error) {
 
 	templatesInfo := []TemplateInfo{}
 	if err := json.Unmarshal(body, &templatesInfo); err != nil {
-		return nil, fmt.Errorf("can't unmarshal text: %s", err.Error())
+		return nil, fmt.Errorf("can't unmarshal text: %s, value: %s", err.Error(), string(body))
 	}
 
 	sortTemplates(templatesInfo)