Update ingest-common REST tests

Since this change modifies how updates behave with ingest pipelines,
the tests need to be updated to reflect the new behavior (where single
item updates behave the same as bulk updates).

Signed-off-by: Michael Froh <[email protected]>

Author: msfroh

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/200_default_pipeline.yml

@@ -76,15 +76,17 @@ teardown:
   - match: { _source.bytes_source_field: "1kb" }
   - match: { _source.bytes_target_field: 1024 }
 # default pipeline via scripted upsert
+# note - scripted upserts execute the pipeline before the script, so any data referenced by the pipeline
+# needs to be in the upsert, not the script
   - do:
       update:
         index: test
         id: 4
         body:
           script:
-            source: "ctx._source.bytes_source_field = '1kb'"
+            source: "ctx._source.ran_script = true"
             lang: "painless"
-          upsert : {}
+          upsert : {"bytes_source_field": "1kb"}
           scripted_upsert: true
   - do:
       get:
@@ -107,7 +109,7 @@ teardown:
   - match: { _source.bytes_source_field: "1kb" }
   - match: { _source.bytes_target_field: 1024 }
 # default pipeline via bulk upsert
-# note - bulk scripted upsert's execute the pipeline before the script, so any data referenced by the pipeline
+# note - bulk scripted upserts execute the pipeline before the script, so any data referenced by the pipeline
 # needs to be in the upsert, not the script
   - do:
       bulk:

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/240_required_pipeline.yml

@@ -76,15 +76,17 @@ teardown:
   - match: { _source.bytes_source_field: "1kb" }
   - match: { _source.bytes_target_field: 1024 }
   # final pipeline via scripted upsert
+  # note - scripted upserts execute the pipeline before the script, so any data referenced by the pipeline
+  # needs to be in the upsert, not the script
   - do:
       update:
         index: test
         id: 4
         body:
           script:
-            source: "ctx._source.bytes_source_field = '1kb'"
+            source: "ctx._source.ran_script = true"
             lang: "painless"
-          upsert : {}
+          upsert : {"bytes_source_field":"1kb"}
           scripted_upsert: true
   - do:
       get:
@@ -107,7 +109,7 @@ teardown:
   - match: { _source.bytes_source_field: "1kb" }
   - match: { _source.bytes_target_field: 1024 }
   # final pipeline via bulk upsert
-  # note - bulk scripted upsert's execute the pipeline before the script, so any data referenced by the pipeline
+  # note - bulk scripted upserts execute the pipeline before the script, so any data referenced by the pipeline
   # needs to be in the upsert, not the script
   - do:
       bulk:

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/75_update.yml

@@ -58,8 +58,6 @@ teardown:
 
   - do:
       headers: { "X-Opaque-Id": "default_pipeline_request" }
-      warnings:
-        - "the index [test_1] has a default ingest pipeline or a final ingest pipeline, the support of the ingest pipelines for update operation causes unexpected result and will be removed in 3.0.0"
       update:
         index:            test_1
         id:               1
@@ -87,8 +85,6 @@ teardown:
 
   - do:
       headers: { "X-Opaque-Id": "final_pipeline_request" }
-      warnings:
-        - "the index [test_2] has a default ingest pipeline or a final ingest pipeline, the support of the ingest pipelines for update operation causes unexpected result and will be removed in 3.0.0"
       update:
         index:            test_2
         id:               1