Add input plugin with dash in id (integration tests)

Verify #93 (comment)
magnusbaeck · Sep 9, 2021 · 482dcea · 482dcea
1 parent f22e89f
commit 482dcea
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/internal/daemon/api/grpc/api.pb.go b/internal/daemon/api/grpc/api.pb.go
diff --git a/internal/daemon/filtermock/filtermock.go b/internal/daemon/filtermock/filtermock.go
@@ -94,7 +94,7 @@ func (m Mocks) Walk(c *astutil.Cursor) {
 			c.Delete()
 			return
 		}
-		replacement.Attributes = append(replacement.Attributes, ast.NewStringAttribute("id", id, ast.Bareword))
+		replacement.Attributes = append(replacement.Attributes, ast.NewStringAttribute("id", id, ast.DoubleQuoted))
 		c.Replace(replacement)
 	}
 }
diff --git a/internal/daemon/logstashconfig/file.go b/internal/daemon/logstashconfig/file.go
@@ -88,7 +88,7 @@ func (r replaceInputsWalker) replaceInputs(c *astutil.Cursor) {
 	}
 
 	var attrs []ast.Attribute
-	attrs = append(attrs, ast.NewStringAttribute("address", fmt.Sprintf("%s_%s_%s", "__lfv_input", r.idPrefix, id), ast.Bareword))
+	attrs = append(attrs, ast.NewStringAttribute("address", fmt.Sprintf("%s_%s_%s", "__lfv_input", r.idPrefix, id), ast.DoubleQuoted))
 
 	for _, attr := range c.Plugin().Attributes {
 		if attr == nil {

diff --git a/internal/daemon/logstashconfig/file_test.go b/internal/daemon/logstashconfig/file_test.go
@@ -55,7 +55,7 @@ func TestReplaceInputs(t *testing.T) {
 
 			wantConfig: `input {
   pipeline {
-    address => __lfv_input_prefix_testid
+    address => "__lfv_input_prefix_testid"
   }
 }
 `,

diff --git a/testdata/basic_pipeline/main/dir/main2.conf b/testdata/basic_pipeline/main/dir/main2.conf
@@ -3,4 +3,4 @@ filter {
     id => mutate2
     add_tag => [ "main2_passed" ]
   }
-}
+}
diff --git a/testdata/basic_pipeline_debug/main/main.conf b/testdata/basic_pipeline_debug/main/main.conf
@@ -1,6 +1,6 @@
 input {
   stdin {
-    id => stdin
+    id => "stdin-with-dash"
   }
 }
 

diff --git a/testdata/testcases/basic_pipeline_debug/testcase1.json b/testdata/testcases/basic_pipeline_debug/testcase1.json
@@ -5,7 +5,7 @@
   "ignore": [
     "@timestamp"
   ],
-  "input_plugin": "stdin",
+  "input_plugin": "stdin-with-dash",
   "testcases": [
     {
       "input": [

diff --git a/testdata/testcases/basic_pipeline_debug/testcase2.json b/testdata/testcases/basic_pipeline_debug/testcase2.json
@@ -6,7 +6,7 @@
   "ignore": [
     "@timestamp"
   ],
-  "input_plugin": "stdin",
+  "input_plugin": "stdin-with-dash",
   "export_metadata": true,
   "testcases": [
     {