Correctly load jsonnet files with multiple objects (#58)

* Correctly load jsonnet files with multiple objects

* Add JSONNET section to Readme

* Add explanation for jsonnetparser's behaviour

README.md

@@ -144,6 +144,10 @@ Difference between a.json and b.json:
 + "true"
 ```
 
+## Using JSONNET
+
+Files that have a `.jsonnet` file extention will be evaluated as JSONNET files. Output of each file should be either a single object or an array of objects.
+
 ## License
 
 Floodgate is licensed under Apache 2.0 License, following other Spinnaker's components.

parser/fileloader/fileloader.go

@@ -8,6 +8,6 @@ package fileloader
 //
 // SupportedFileExtensions returns a slice of strings representing supported file format extensions
 type FileLoader interface {
-	LoadFile(filePath string) (map[string]interface{}, error)
+	LoadFile(filePath string) ([]map[string]interface{}, error)
 	SupportedFileExtensions() []string
 }

parser/fileloader/jsonloader.go

@@ -14,7 +14,7 @@ func NewJSONLoader() *JSONLoader {
 type JSONLoader struct{}
 
 // LoadFile load file
-func (jl *JSONLoader) LoadFile(filePath string) (map[string]interface{}, error) {
+func (jl *JSONLoader) LoadFile(filePath string) ([]map[string]interface{}, error) {
 	inputFile, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return nil, err
@@ -23,7 +23,7 @@ func (jl *JSONLoader) LoadFile(filePath string) (map[string]interface{}, error)
 	if err := json.Unmarshal(inputFile, &output); err != nil {
 		return nil, err
 	}
-	return output, nil
+	return []map[string]interface{}{output}, nil
 }
 
 // SupportedFileExtensions get supported file extensions

parser/fileloader/jsonloader_test.go

@@ -12,7 +12,7 @@ func TestJSONLoader_LoadFile(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    map[string]interface{}
+		want    []map[string]interface{}
 		wantErr bool
 	}{
 		{
@@ -59,7 +59,7 @@ func TestJSONLoader_SupportedFileExtensions(t *testing.T) {
 	}
 }
 
-var testJSONFIle = map[string]interface{}{
+var testJSONFIle = []map[string]interface{}{{
 	"name":     "testjson",
 	"variable": false,
-}
+}}

parser/fileloader/jsonnetloader.go

@@ -21,17 +21,28 @@ type JsonnetLoader struct {
 }
 
 // LoadFile load file
-func (jl *JsonnetLoader) LoadFile(filePath string) (map[string]interface{}, error) {
+func (jl *JsonnetLoader) LoadFile(filePath string) ([]map[string]interface{}, error) {
 	inputFile, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
-	evaluatedSnipped, err := jl.EvaluateSnippet(filePath, string(inputFile))
+	// EvaluateSnippetStream fails if generated output does not fit into a slice...
+	snippetStream, err := jl.EvaluateSnippetStream(filePath, string(inputFile))
 	if err != nil {
-		return nil, err
+		// ...at which point we evaluate it as a single object and let further processing take care
+		evaluatedSingleSnippet, err := jl.EvaluateSnippet(filePath, string(inputFile))
+		if err != nil {
+			return nil, err
+		}
+		// wrap the single object in slice to keep interface intact
+		snippetStream = []string{evaluatedSingleSnippet}
+	}
+	var output []map[string]interface{}
+	for i := range snippetStream {
+		var partial map[string]interface{}
+		json.Unmarshal([]byte(snippetStream[i]), &partial)
+		output = append(output, partial)
 	}
-	var output map[string]interface{}
-	json.Unmarshal([]byte(evaluatedSnipped), &output)
 	return output, nil
 }
 

parser/fileloader/jsonnetloader_test.go

@@ -20,7 +20,7 @@ func TestJsonnetLoader_LoadFile(t *testing.T) {
 		name    string
 		fields  fields
 		args    args
-		want    map[string]interface{}
+		want    []map[string]interface{}
 		wantErr bool
 	}{
 		{
@@ -78,7 +78,7 @@ func TestJsonnetLoader_SupportedFileExtensions(t *testing.T) {
 	}
 }
 
-var testJsonnetFile = map[string]interface{}{
+var testJsonnetFile = []map[string]interface{}{{
 	"name":     "testjsonnet",
 	"variable": false,
-}
+}}

parser/fileloader/yamlloader.go

@@ -15,7 +15,7 @@ func NewYAMLLoader() *YAMLLoader {
 type YAMLLoader struct{}
 
 // LoadFile load file
-func (yl *YAMLLoader) LoadFile(filePath string) (map[string]interface{}, error) {
+func (yl *YAMLLoader) LoadFile(filePath string) ([]map[string]interface{}, error) {
 	inputFile, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return nil, err
@@ -24,7 +24,7 @@ func (yl *YAMLLoader) LoadFile(filePath string) (map[string]interface{}, error)
 	if err := yaml.Unmarshal(inputFile, &output); err != nil {
 		return nil, err
 	}
-	return output, nil
+	return []map[string]interface{}{output}, nil
 }
 
 // SupportedFileExtensions get supported file extensions

parser/fileloader/yamlloader_test.go

@@ -12,7 +12,7 @@ func TestYAMLLoader_LoadFile(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    map[string]interface{}
+		want    []map[string]interface{}
 		wantErr bool
 	}{
 		{
@@ -67,12 +67,12 @@ func TestYAMLLoader_SupportedFileExtensions(t *testing.T) {
 	}
 }
 
-var testYAMLFile = map[string]interface{}{
+var testYAMLFile = []map[string]interface{}{{
 	"name":     "testyaml",
 	"variable": false,
-}
+}}
 
-var testYMLFile = map[string]interface{}{
+var testYMLFile = []map[string]interface{}{{
 	"name":     "testyml",
 	"variable": false,
-}
+}}

parser/parser.go

@@ -96,7 +96,7 @@ func (p *Parser) loadFilesFromDirectory(entrypoint string) ([]map[string]interfa
 				log.Warn(f.Name(), "not loaded due to", err)
 				return nil
 			}
-			objects = append(objects, obj)
+      objects = append(objects, obj...)
 			log.Printf("%s loaded", f.Name())
 			return nil
 		})
@@ -121,8 +121,7 @@ func (p *Parser) parseObjects(objects []map[string]interface{}) (*ParsedResource
 			parsedResources.PipelineTemplates = append(parsedResources.PipelineTemplates, object)
 			continue
 		}
-		if _, ok := object["providerSettings"]; ok {
-
+		if _, ok := object["email"]; ok {
 			parsedResources.Applications = append(parsedResources.Applications, object)
 			continue
 		}