Additional tests and fixes for those tests

Author: lukewhiting

modules/streams/src/yamlRestTest/resources/rest-api-spec/test/streams/logs/30_param_restrictions.yml

@@ -24,7 +24,7 @@ teardown:
   - match: { errors: true }
   - match: { items.0.index.status: 400 }
   - match: { items.0.index.error.type: "illegal_argument_exception" }
-  - match: { items.0.index.error.reason: "When writing to a stream, only the following parameters are allowed: [error_trace,timeout]" }
+  - match: { items.0.index.error.reason: "When writing to a stream, only the following parameters are allowed: [index,op_type,error_trace,timeout]" }
   - match: { items.1.index.status: 201 }
 
 ---
@@ -42,4 +42,134 @@ teardown:
         refresh: true
         index: logs
         body: { "foo": "bar" }
-      catch: '/When writing to a stream, only the following parameters are allowed: \[error_trace,timeout\]/'
+      catch: '/When writing to a stream, only the following parameters are allowed: \[index,op_type,error_trace,timeout\]/'
+
+---
+"Allowed Params Only - Bulk Should Succeed":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      bulk:
+        error_trace: true
+        timeout: "1m"
+        body: |
+          { "index": { "_index": "logs"} }
+          { "foo": "bar" }
+  - match: { errors: false }
+  - match: { items.0.index.status: 201 }
+
+---
+"Allowed Params Only - Single Doc Should Succeed":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      index:
+        index: logs
+        error_trace: true
+        timeout: "1m"
+        body: |
+          { "foo": "bar" }
+  - match: { _index: "logs" }
+  - match: { result: "created" }
+
+---
+"No Params - Bulk Should Succeed":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      bulk:
+        body: |
+          { "index": { "_index": "logs"} }
+          { "foo": "bar" }
+  - match: { errors: false }
+  - match: { items.0.index.status: 201 }
+
+---
+"No Params - Single Doc Should Succeed":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+  -
+    do:
+      index:
+        index: logs
+        body: { "foo": "bar" }
+  - match: { _index: "logs" }
+  - match: { result: "created" }
+
+---
+"Mixed Allowed and Disallowed Params - Bulk Should Fail":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      bulk:
+        error_trace: true
+        timeout: "1m"
+        routing: "custom-routing"
+        refresh: true
+        body: |
+          { "index": { "_index": "logs"} }
+          { "foo": "bar" }
+  - match: { errors: true }
+  - match: { items.0.index.status: 400 }
+  - match: { items.0.index.error.type: "illegal_argument_exception" }
+  - match: { items.0.index.error.reason: "When writing to a stream, only the following parameters are allowed: [index,op_type,error_trace,timeout]" }
+
+---
+"Mixed Allowed and Disallowed Params - Single Doc Should Fail":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      index:
+        index: logs
+        error_trace: true
+        timeout: "1m"
+        routing: "custom-routing"
+        refresh: true
+        body: { "foo": "bar" }
+      catch: '/When writing to a stream, only the following parameters are allowed: \[index,op_type,error_trace,timeout\]/'
+
+---
+"Multiple Disallowed Params - Bulk Should Fail":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      bulk:
+        routing: "custom-routing"
+        wait_for_active_shards: "2"
+        refresh: true
+        body: |
+          { "index": { "_index": "logs"} }
+          { "foo": "bar" }
+  - match: { errors: true }
+  - match: { items.0.index.status: 400 }
+  - match: { items.0.index.error.type: "illegal_argument_exception" }
+  - match: { items.0.index.error.reason: "When writing to a stream, only the following parameters are allowed: [index,op_type,error_trace,timeout]" }
+
+---
+"Multiple Disallowed Params - Single Doc Should Fail":
+  - do:
+      streams.logs_enable: { }
+  - is_true: acknowledged
+
+  - do:
+      index:
+        index: logs
+        routing: "custom-routing"
+        pipeline: "my-pipeline"
+        wait_for_active_shards: "2"
+        refresh: true
+        body: { "foo": "bar" }
+      catch: '/When writing to a stream, only the following parameters are allowed: \[index,op_type,error_trace,timeout\]/'

server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java

@@ -64,8 +64,10 @@ public class RestBulkAction extends BaseRestHandler {
 
     public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in bulk requests is deprecated.";
     public static final String FAILURE_STORE_STATUS_CAPABILITY = "failure_store_status";
-    public static final LinkedHashSet<String> STREAMS_ALLOWED_PARAMS = new LinkedHashSet<>(2) {
+    public static final Set<String> STREAMS_ALLOWED_PARAMS = new LinkedHashSet<>(2) {
         {
+            add("index");
+            add("op_type");
             add("error_trace");
             add("timeout");
         }