Merge pull request #15618 from talevy/rename_pipeline_param

rename "pipeline_id" param to "pipeline"

plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java

@@ -50,7 +50,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 public class IngestPlugin extends Plugin {
 
     public static final String PIPELINE_ID_PARAM_CONTEXT_KEY = "__pipeline_id__";
-    public static final String PIPELINE_ID_PARAM = "pipeline_id";
+    public static final String PIPELINE_ID_PARAM = "pipeline";
     public static final String PIPELINE_ALREADY_PROCESSED = "ingest_already_processed";
     public static final String NAME = "ingest";
     public static final String NODE_INGEST_SETTING = "node.ingest";

plugins/ingest/src/test/resources/rest-api-spec/api/ingest.bulk.json

@@ -41,7 +41,7 @@
           "type": "list",
           "description" : "Default comma-separated list of fields to return in the response for updates"
         },
-        "pipeline_id" : {
+        "pipeline" : {
           "type" : "string",
           "description" : "The pipeline id to preprocess incoming documents with"
         }

plugins/ingest/src/test/resources/rest-api-spec/api/ingest.index.json

@@ -66,7 +66,7 @@
           "options" : ["internal", "external", "external_gte", "force"],
           "description" : "Specific version type"
         },
-        "pipeline_id" : {
+        "pipeline" : {
           "type" : "string",
           "description" : "The pipeline id to preprocess incoming documents with"
         }

plugins/ingest/src/test/resources/rest-api-spec/test/ingest/30_grok.yaml

@@ -22,7 +22,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "123.42 400 <foo>"}
 
   - do:
@@ -61,7 +61,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "<foo>"}
 
   - do:
@@ -98,7 +98,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "<foo>"}
 
   - do:

plugins/ingest/src/test/resources/rest-api-spec/test/ingest/40_geoip_processor.yaml

@@ -21,7 +21,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "128.101.101.101"}
 
   - do:
@@ -65,7 +65,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "128.101.101.101"}
 
   - do:
@@ -110,7 +110,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "128.101.101.101"}
 
   - do:

plugins/ingest/src/test/resources/rest-api-spec/test/ingest/50_date_processor.yaml

@@ -24,7 +24,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {date_source_field: "12/06/2010"}
 
   - do:

plugins/ingest/src/test/resources/rest-api-spec/test/ingest/60_mutate.yaml

@@ -79,7 +79,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {
           field_to_rename: "value",
           field_to_remove: "old_value",
@@ -137,7 +137,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field: "value"}
 
   - do:

plugins/ingest/src/test/resources/rest-api-spec/test/ingest/80_on_failure.yaml

@@ -42,7 +42,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "123.42 400 <foo>"}
 
   - do:
@@ -107,7 +107,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline"
+        pipeline: "my_pipeline"
         body: {field1: "123.42 400 <foo>"}
 
   - do:

qa/ingest-with-mustache/src/test/resources/rest-api-spec/test/ingest_mustache/10_pipeline_with_mustache_templates.yaml

@@ -32,7 +32,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline_1"
+        pipeline: "my_pipeline_1"
         body: {}
 
   - do:
@@ -112,7 +112,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline_1"
+        pipeline: "my_pipeline_1"
         body: {
           metadata: "0",
           field1: "1",
@@ -137,7 +137,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline_2"
+        pipeline: "my_pipeline_2"
         body: {
           field1: "field2"
         }
@@ -156,7 +156,7 @@
         index: test
         type: test
         id: 1
-        pipeline_id: "my_pipeline_3"
+        pipeline: "my_pipeline_3"
         body: {
           field_to_remove: "field2",
           field2: "2",