ingest: minor - update test to include dissect (elastic#33211)

This change also includes placing the bytes processor in the correct order (helps to avoid merge conflict when back patching processors)
jakelandis · Sep 5, 2018 · 3d53d82 · 3d53d82
1 parent d1a9a14
commit 3d53d82
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java
@@ -82,7 +82,7 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
         processors.put(KeyValueProcessor.TYPE, new KeyValueProcessor.Factory());
         processors.put(URLDecodeProcessor.TYPE, new URLDecodeProcessor.Factory());
         processors.put(BytesProcessor.TYPE, new BytesProcessor.Factory());
-		processors.put(PipelineProcessor.TYPE, new PipelineProcessor.Factory(parameters.ingestService));
+        processors.put(PipelineProcessor.TYPE, new PipelineProcessor.Factory(parameters.ingestService));
         processors.put(DissectProcessor.TYPE, new DissectProcessor.Factory());
         return Collections.unmodifiableMap(processors);
     }

diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml
@@ -14,22 +14,23 @@
     - match:  { nodes.$master.ingest.processors.2.type: convert }
     - match:  { nodes.$master.ingest.processors.3.type: date }
     - match:  { nodes.$master.ingest.processors.4.type: date_index_name }
-    - match:  { nodes.$master.ingest.processors.5.type: dot_expander }
-    - match:  { nodes.$master.ingest.processors.6.type: fail }
-    - match:  { nodes.$master.ingest.processors.7.type: foreach }
-    - match:  { nodes.$master.ingest.processors.8.type: grok }
-    - match:  { nodes.$master.ingest.processors.9.type: gsub }
-    - match:  { nodes.$master.ingest.processors.10.type: join }
-    - match:  { nodes.$master.ingest.processors.11.type: json }
-    - match:  { nodes.$master.ingest.processors.12.type: kv }
-    - match:  { nodes.$master.ingest.processors.13.type: lowercase }
-    - match:  { nodes.$master.ingest.processors.14.type: pipeline }
-    - match:  { nodes.$master.ingest.processors.15.type: remove }
-    - match:  { nodes.$master.ingest.processors.16.type: rename }
-    - match:  { nodes.$master.ingest.processors.17.type: script }
-    - match:  { nodes.$master.ingest.processors.18.type: set }
-    - match:  { nodes.$master.ingest.processors.19.type: sort }
-    - match:  { nodes.$master.ingest.processors.20.type: split }
-    - match:  { nodes.$master.ingest.processors.21.type: trim }
-    - match:  { nodes.$master.ingest.processors.22.type: uppercase }
+    - match:  { nodes.$master.ingest.processors.5.type: dissect }
+    - match:  { nodes.$master.ingest.processors.6.type: dot_expander }
+    - match:  { nodes.$master.ingest.processors.7.type: fail }
+    - match:  { nodes.$master.ingest.processors.8.type: foreach }
+    - match:  { nodes.$master.ingest.processors.9.type: grok }
+    - match:  { nodes.$master.ingest.processors.10.type: gsub }
+    - match:  { nodes.$master.ingest.processors.11.type: join }
+    - match:  { nodes.$master.ingest.processors.12.type: json }
+    - match:  { nodes.$master.ingest.processors.13.type: kv }
+    - match:  { nodes.$master.ingest.processors.14.type: lowercase }
+    - match:  { nodes.$master.ingest.processors.15.type: pipeline }
+    - match:  { nodes.$master.ingest.processors.16.type: remove }
+    - match:  { nodes.$master.ingest.processors.17.type: rename }
+    - match:  { nodes.$master.ingest.processors.18.type: script }
+    - match:  { nodes.$master.ingest.processors.19.type: set }
+    - match:  { nodes.$master.ingest.processors.20.type: sort }
+    - match:  { nodes.$master.ingest.processors.21.type: split }
+    - match:  { nodes.$master.ingest.processors.22.type: trim }
+    - match:  { nodes.$master.ingest.processors.23.type: uppercase }