skip cluster_uuid check for earlier versions until it is backported

Author: pickypg

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml

@@ -3,7 +3,6 @@
   - do:
       cluster.state: {}
 
-  - is_true: cluster_uuid
   - is_true: master_node
 
 ---
@@ -16,7 +15,21 @@
       cluster.state:
         human: true
 
-  - is_true: cluster_uuid
   - is_true: master_node
   - gte: { compressed_size_in_bytes: 50 }
   - is_true: compressed_size
+
+---
+"get cluster state returns cluster_uuid at the top level":
+  - skip:
+      version:  " - 6.99.99"
+      reason:   "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
+
+  - do:
+      cluster.state:
+        human: true
+
+  - is_true: cluster_uuid
+  - is_true: master_node
+  - gte: { compressed_size_in_bytes: 50 }
+  - is_true: compressed_size

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml

@@ -13,7 +13,6 @@ setup:
       cluster.state:
         metric: [ blocks ]
 
-  - is_true: cluster_uuid
   - is_true: blocks
   - is_false: nodes
   - is_false: metadata
@@ -32,7 +31,6 @@ setup:
       cluster.state:
         metric: [ blocks ]
 
-  - is_true: cluster_uuid
   - is_true: blocks
   - is_false: nodes
   - is_false: metadata
@@ -52,7 +50,6 @@ setup:
       cluster.state:
         metric: [ nodes ]
 
-  - is_true: cluster_uuid
   - is_false: blocks
   - is_true: nodes
   - is_false: metadata
@@ -65,7 +62,6 @@ setup:
       cluster.state:
         metric: [ metadata ]
 
-  - is_true: cluster_uuid
   - is_false: blocks
   - is_false: nodes
   - is_true: metadata
@@ -79,7 +75,6 @@ setup:
       cluster.state:
         metric: [ routing_table ]
 
-  - is_true: cluster_uuid
   - is_false: blocks
   - is_false: nodes
   - is_false: metadata
@@ -92,7 +87,6 @@ setup:
       cluster.state:
         metric: [ routing_nodes ]
 
-  - is_true: cluster_uuid
   - is_false: blocks
   - is_false: nodes
   - is_false: metadata
@@ -114,7 +108,6 @@ setup:
         metric: [ routing_table, metadata ]
         index: [ testidx ]
 
-  - is_true: cluster_uuid
   - is_false: metadata.indices.another
   - is_false: routing_table.indices.another
   - is_true: metadata.indices.testidx
@@ -127,7 +120,6 @@ setup:
         metric: [ '_all' ]
         index: [ '_all' ]
 
-  - is_true: cluster_uuid
   - is_true: blocks
   - is_true: nodes
   - is_true: metadata
@@ -160,8 +152,23 @@ setup:
   - is_false: metadata.indices.testidx
   - is_false: routing_table.indices.testidx
 
-  - is_true: cluster_uuid
   - is_true: metadata.indices.index1
   - is_true: routing_table.indices.index1
   - is_true: metadata.indices.index2
   - is_true: routing_table.indices.index2
+
+---
+"Filtering the cluster state returns cluster_uuid at the top level regardless of metric filters":
+  - skip:
+      version:  " - 6.99.99"
+      reason:   "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
+
+  - do:
+      cluster.state:
+        metric: [ master_node, version, metadata ]
+
+  - is_true: cluster_uuid
+  - is_true: master_node
+  - is_true: version
+  - is_true: state_uuid
+  - is_true: metadata

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml

@@ -35,7 +35,6 @@ setup:
         index: test*
         expand_wildcards: [ closed ]
 
-  - is_true: cluster_uuid
   - is_false: metadata.indices.test_open_index
   - match: {metadata.indices.test_close_index.state: "close"}
 
@@ -45,7 +44,6 @@ setup:
         index: test*
         expand_wildcards: [ open ]
 
-  - is_true: cluster_uuid
   - match: {metadata.indices.test_open_index.state: "open"}
   - is_false: metadata.indices.test_close_index
 
@@ -55,7 +53,6 @@ setup:
         index: test*
         expand_wildcards: [ open,closed ]
 
-  - is_true: cluster_uuid
   - match: {metadata.indices.test_open_index.state: "open"}
   - match: {metadata.indices.test_close_index.state: "close"}
 
@@ -68,7 +65,6 @@ setup:
         index: foobla
         ignore_unavailable: true
 
-  - is_true: cluster_uuid
   - match: {metadata.indices: {}}
 
   - do:
@@ -86,7 +82,6 @@ setup:
         metric: [ metadata ]
         index: not_there*
 
-  - is_true: cluster_uuid
   - match: {metadata.indices: {}}
 
   - do:

server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java

@@ -69,6 +69,7 @@ public void testToXContent() throws IOException {
             assertEquals("{\n" +
                     "  \"acknowledged\" : true,\n" +
                     "  \"state\" : {\n" +
+                    "    \"cluster_uuid\" : \"_na_\",\n" +
                     "    \"version\" : 0,\n" +
                     "    \"state_uuid\" : \"" + clusterState.stateUUID() + "\",\n" +
                     "    \"master_node\" : \"node0\",\n" +
@@ -136,6 +137,7 @@ public void testToXContent() throws IOException {
             assertEquals("{\n" +
                     "  \"acknowledged\" : true,\n" +
                     "  \"state\" : {\n" +
+                    "    \"cluster_uuid\" : \"_na_\",\n" +
                     "    \"version\" : 0,\n" +
                     "    \"state_uuid\" : \"" + clusterState.stateUUID() + "\",\n" +
                     "    \"master_node\" : \"node0\"\n" +
@@ -168,6 +170,7 @@ public void testToXContent() throws IOException {
             assertEquals("{\n" +
                     "  \"acknowledged\" : true,\n" +
                     "  \"state\" : {\n" +
+                    "    \"cluster_uuid\" : \"_na_\",\n" +
                     "    \"metadata\" : {\n" +
                     "      \"cluster_uuid\" : \"_na_\",\n" +
                     "      \"templates\" : { },\n" +