Adjust BWC versions after backport of elastic#69756

danhermann · Mar 8, 2021 · 56650d7 · 56650d7
1 parent 5697643
commit 56650d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yml
@@ -156,8 +156,8 @@
 ---
 "Test Get Summarized Pipelines":
   - skip:
-      version: " - 7.99.99"
-      reason:  "change to appropriate 7.x release after backport"
+      version: " - 7.12.99"
+      reason:  "summary option added in 7.13"
 
   - do:
       ingest.put_pipeline:

diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java
@@ -41,14 +41,14 @@ public GetPipelineRequest(String... ids) {
     public GetPipelineRequest(StreamInput in) throws IOException {
         super(in);
         ids = in.readStringArray();
-        summary = in.getVersion().onOrAfter(Version.V_8_0_0) ? in.readBoolean() : false;
+        summary = in.getVersion().onOrAfter(Version.V_7_13_0) ? in.readBoolean() : false;
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(ids);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
             out.writeBoolean(summary);
         }
     }

diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java
@@ -42,7 +42,7 @@ public GetPipelineResponse(StreamInput in) throws IOException {
         for (int i = 0; i < size; i++) {
             pipelines.add(PipelineConfiguration.readFrom(in));
         }
-        summary = in.getVersion().onOrAfter(Version.V_8_0_0) ? in.readBoolean() : false;
+        summary = in.getVersion().onOrAfter(Version.V_7_13_0) ? in.readBoolean() : false;
     }
 
     public GetPipelineResponse(List<PipelineConfiguration> pipelines, boolean summary) {
@@ -69,7 +69,7 @@ public void writeTo(StreamOutput out) throws IOException {
         for (PipelineConfiguration pipeline : pipelines) {
             pipeline.writeTo(out);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
             out.writeBoolean(summary);
         }
     }