[7.x] Watcher - ensure that rest_total_hits_as_int is persisted (#65988…

…) (#66029) A minor logic bug only persists the rest_total_hits_as_int option for Watch search inputs if the value is true.
elastic · Dec 8, 2020 · 4c9b9b8 · 4c9b9b8
1 parent 7244948
commit 4c9b9b8
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/...mlRestTest/resources/rest-api-spec/test/watcher/put_watch/91_search_total_hits_as_int.yml b/...mlRestTest/resources/rest-api-spec/test/watcher/put_watch/91_search_total_hits_as_int.yml
@@ -110,3 +110,42 @@ setup:
 
   - match: { _source.key: "value" }
 
+---
+"Test persist rest_total_hits_as_int":
+  - do:
+      watcher.put_watch:
+        id: "my_watch1"
+        body:  >
+          {
+            "trigger": {
+              "schedule" : { "cron" : "0 0 0 1 * ? 2099" }
+            },
+            "input": {
+              "search" : {
+                "request" : {
+                  "indices" : [ "my_test_index" ],
+                  "rest_total_hits_as_int": false,
+                  "body" : {
+                    "query": {
+                      "match_all" : {}
+                    }
+                  }
+                }
+              }
+            },
+            "actions": {
+              "test_index": {
+                "index": {
+                  "index": "test"
+                }
+              }
+            }
+          }
+  - match: { _id: "my_watch1" }
+
+  - do:
+      watcher.get_watch:
+        id: "my_watch1"
+  - match: { found : true}
+  - match: { _id: "my_watch1" }
+  - match: { watch.input.search.request.rest_total_hits_as_int: false }
diff --git a/...ain/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java b/...ain/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java
@@ -148,9 +148,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (types != null) {
             builder.array(TYPES_FIELD.getPreferredName(), types);
         }
-        if (restTotalHitsAsInt) {
-            builder.field(REST_TOTAL_HITS_AS_INT_FIELD.getPreferredName(), restTotalHitsAsInt);
-        }
+
+        builder.field(REST_TOTAL_HITS_AS_INT_FIELD.getPreferredName(), restTotalHitsAsInt);
+
         if (searchSource != null && searchSource.length() > 0) {
             try (InputStream stream = searchSource.streamInput()) {
                 builder.rawField(BODY_FIELD.getPreferredName(), stream);