Properly handle underscores in bulk request metadata

Since 6.1.0 all metadata except _index, _type and _id are accepted without the
underscore. In 6.5 it produces a deprecation warning and in 7 they are no
longer accepted.

Author: nomoa

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file based on the
 
 ### Bugfixes
 * Always set the Guzzle `base_uri` to support connecting to multiple ES hosts. [#1618](https://github.com/ruflin/Elastica/pull/1618)
+* Properly handle underscore prefixes in bulk request metadata ([cf upstream](https://github.com/elastic/elasticsearch/issues/26886). [#1621](https://github.com/ruflin/Elastica/pull/1621)
 
 ### Added
 

lib/Elastica/Bulk/Action/IndexDocument.php

@@ -29,7 +29,9 @@ public function setDocument(Document $document): AbstractDocument
      */
     protected function _getMetadata(AbstractUpdateAction $action): array
     {
-        return $action->getOptions([
+        // see https://github.com/elastic/elasticsearch/issues/26886
+        // for underscore handling
+        $options = $action->getOptions([
             'index',
             'type',
             'id',
@@ -39,5 +41,17 @@ protected function _getMetadata(AbstractUpdateAction $action): array
             'parent',
             'retry_on_conflict',
         ], true);
+
+        $newOptions = \array_intersect_key($options, [
+            '_index' => 1,
+            '_type' => 1,
+            '_id' => 1,
+        ]);
+
+        foreach (\array_diff_key($options, $newOptions) as $k => $v) {
+            $newOptions[\ltrim($k, '_')] = $v;
+        }
+
+        return $newOptions;
     }
 }

test/Elastica/BulkTest.php

@@ -639,7 +639,7 @@ public function testRetry()
         $actions = $bulk->getActions();
 
         $metadata = $actions[0]->getMetadata();
-        $this->assertEquals(5, $metadata['_retry_on_conflict']);
+        $this->assertEquals(5, $metadata['retry_on_conflict']);
 
         $script = new Script('');
         $script->setRetryOnConflict(5);
@@ -650,7 +650,7 @@ public function testRetry()
         $actions = $bulk->getActions();
 
         $metadata = $actions[0]->getMetadata();
-        $this->assertEquals(5, $metadata['_retry_on_conflict']);
+        $this->assertEquals(5, $metadata['retry_on_conflict']);
     }
 
     /**