fix: Process Jsonnet Errors (#11)

* fix: foreach & process libsonnet * test: multi-line JSON * docs: add comments
brexhq · Aug 1, 2022 · 9507c83 · 9507c83
1 parent 6cab3f7
commit 9507c83
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/config/process.libsonnet b/config/process.libsonnet
@@ -68,7 +68,7 @@
     type: 'delete',
     settings: {
       condition: { operator: condition_operator, inspectors: condition_inspectors},
-      input: input,
+      input_key: input,
     },
   },
   domain(input, output, _function, 
@@ -101,7 +101,7 @@
     type: 'expand',
     settings: {
       condition: { operator: condition_operator, inspectors: condition_inspectors},
-      input: input,
+      input_key: input,
     },
   },
   flatten(input, output, 
@@ -157,7 +157,7 @@
     settings: {
       options: { value: value },
       condition: { operator: condition_operator, inspectors: condition_inspectors},
-      output: output,
+      output_key: output,
     },
   },
   lambda(input, output, _function, 

diff --git a/internal/json/json_test.go b/internal/json/json_test.go
@@ -41,6 +41,16 @@ var getTests = []struct {
 		test:     []byte(`{"foo":false}`),
 		expected: false,
 	},
+	{
+		name: "multi-line",
+		key:  "foo",
+		test: []byte(`{
+"foo":
+"string"
+}
+`),
+		expected: "string",
+	},
 }
 
 func TestGetJson(t *testing.T) {

diff --git a/process/for_each.go b/process/for_each.go
@@ -3,6 +3,7 @@ package process
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/brexhq/substation/condition"
 	"github.com/brexhq/substation/internal/config"
@@ -102,17 +103,21 @@ func (p ForEach) Byte(ctx context.Context, data []byte) ([]byte, error) {
 		return nil, fmt.Errorf("byter settings %+v: %w", p, ProcessorInvalidSettings)
 	}
 
+	// processor settings loaded via Jsonnet may create invalid keys such as
+	// `foo.bar.` -- the trailing dot creates an invalid path, so it is trimmed
 	if _, ok := p.Options.Processor.Settings["input_key"]; ok {
 		p.Options.Processor.Settings["input_key"] = p.Options.Processor.Type + "." + p.Options.Processor.Settings["input_key"].(string)
 	} else {
 		p.Options.Processor.Settings["input_key"] = p.Options.Processor.Type
 	}
+	p.Options.Processor.Settings["input_key"] = strings.TrimSuffix(p.Options.Processor.Settings["input_key"].(string), ".")
 
 	if _, ok := p.Options.Processor.Settings["output_key"]; ok {
 		p.Options.Processor.Settings["output_key"] = p.Options.Processor.Type + "." + p.Options.Processor.Settings["output_key"].(string)
 	} else {
 		p.Options.Processor.Settings["output_key"] = p.Options.Processor.Type
 	}
+	p.Options.Processor.Settings["output_key"] = strings.TrimSuffix(p.Options.Processor.Settings["output_key"].(string), ".")
 
 	byter, err := ByterFactory(p.Options.Processor)
 	if err != nil {