fix the inject_headers transpiler rule (elastic#27481)

bmorelli25 · Aug 19, 2021 · 4b442ce · 4b442ce
1 parent 53d7c2e
commit 4b442ce
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 6 deletions.
diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml
@@ -39,5 +39,7 @@ output:
     hosts:
       - 127.0.0.1:9200
       - 127.0.0.1:9300
+    headers:
+      h1: test-header
     username: elastic
     password: changeme
diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml
@@ -39,5 +39,7 @@ output:
     hosts:
       - 127.0.0.1:9200
       - 127.0.0.1:9300
+    headers:
+      h1: test-header
     username: elastic
     password: changeme
diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/fleet_server-fleet-server.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/fleet_server-fleet-server.yml
@@ -8,6 +8,8 @@ fleet:
 output:
   elasticsearch:
     hosts: [ 127.0.0.1:9200, 127.0.0.1:9300 ]
+    headers:
+      h1: test-header
     username: fleet
     password: fleetpassword
 

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-filebeat.yml
@@ -68,6 +68,9 @@ output:
     hosts:
       - 127.0.0.1:9200
       - 127.0.0.1:9300
+    headers:
+      h1: test-header
+
     namespace: test_namespace
     username: elastic
     password: changeme

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-fleet-server.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-fleet-server.yml
@@ -8,6 +8,8 @@ fleet:
 output:
   elasticsearch:
     hosts: [ 127.0.0.1:9200, 127.0.0.1:9300 ]
+    headers:
+      h1: test-header
     username: fleet
     password: fleetpassword
 

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-metricbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/namespace-metricbeat.yml
@@ -88,6 +88,9 @@ metricbeat:
 output:
   elasticsearch:
     hosts: [127.0.0.1:9200, 127.0.0.1:9300]
+    headers:
+      h1: test-header
+
     namespace: test_namespace
     username: elastic
     password: changeme

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml
@@ -68,6 +68,8 @@ output:
     hosts:
       - 127.0.0.1:9200
       - 127.0.0.1:9300
+    headers:
+      h1: test-header
     username: elastic
     password: changeme
     bulk_max_size: 23

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-fleet-server.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-fleet-server.yml
@@ -8,6 +8,8 @@ fleet:
 output:
   elasticsearch:
     hosts: [ 127.0.0.1:9200, 127.0.0.1:9300 ]
+    headers:
+      h1: test-header
     username: fleet
     password: fleetpassword
 

diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml
@@ -88,6 +88,8 @@ metricbeat:
 output:
   elasticsearch:
     hosts: [127.0.0.1:9200, 127.0.0.1:9300]
+    headers:
+      h1: test-header
     username: elastic
     password: changeme
     bulk_max_size: 23

diff --git a/x-pack/elastic-agent/pkg/agent/transpiler/rules.go b/x-pack/elastic-agent/pkg/agent/transpiler/rules.go
@@ -1638,12 +1638,12 @@ func (r *InjectHeadersRule) Apply(agentInfo AgentInfo, ast *AST) (err error) {
 		return nil
 	}
 
-	outputsNode, found := Lookup(ast, "outputs")
+	outputNode, found := Lookup(ast, "output")
 	if !found {
 		return nil
 	}
 
-	elasticsearchNode, found := outputsNode.Find("elasticsearch")
+	elasticsearchNode, found := outputNode.Find("elasticsearch")
 	if found {
 		headersNode, found := elasticsearchNode.Find("headers")
 		if found {

diff --git a/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go b/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go
@@ -725,7 +725,7 @@ rest: of
 
 		"inject auth headers: no headers": {
 			givenYAML: `
-outputs:
+output:
   elasticsearch:
     hosts:
       - "127.0.0.1:9201"
@@ -734,7 +734,7 @@ outputs:
     port: 5
 `,
 			expectedYAML: `
-outputs:
+output:
   elasticsearch:
     headers:
       h1: test-header
@@ -753,7 +753,7 @@ outputs:
 
 		"inject auth headers: existing headers": {
 			givenYAML: `
-outputs:
+output:
   elasticsearch:
     headers:
       sample-header: existing
@@ -764,7 +764,7 @@ outputs:
     port: 5
 `,
 			expectedYAML: `
-outputs:
+output:
   elasticsearch:
     headers:
       sample-header: existing