[TEST] Enforce skip headers when needed

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml

@@ -82,6 +82,9 @@
 
 ---
 "Find a task result record from the old cluster":
+  - skip:
+      features: headers
+
   - do:
       search:
         index: .tasks

test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java

@@ -86,7 +86,6 @@ public static ClientYamlTestSuite parse(String api, String suiteName, XContentPa
 
         SetupSection setupSection = SetupSection.parseIfNext(parser);
         TeardownSection teardownSection = TeardownSection.parseIfNext(parser);
-
         Set<ClientYamlTestSection> testSections = new TreeSet<>();
         while(true) {
             //the "---" section separator is not understood by the yaml parser. null is returned, same as when the parser is closed
@@ -179,6 +178,14 @@ private static Stream<String> validateExecutableSections(List<ExecutableSection>
                 "without a corresponding [\"skip\": \"features\": \"contains\"] so runners that do not support the " +
                 "[contains] assertion can skip the test at line [" + section.getLocation().lineNumber + "]"));
 
+        errors = Stream.concat(errors, sections.stream().filter(section -> section instanceof DoSection)
+            .map(section -> (DoSection) section)
+            .filter(section -> false == section.getApiCallSection().getHeaders().isEmpty())
+            .filter(section -> false == hasSkipFeature("headers", testSection, setupSection, teardownSection))
+            .map(section -> "attempted to add a [do] with a [headers] section without a corresponding "
+                + "[\"skip\": \"features\": \"headers\"] so runners that do not support the [headers] section can skip the test at " +
+                "line [" + section.getLocation().lineNumber + "]"));
+
         return errors;
     }
 

test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java

@@ -31,6 +31,7 @@
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -403,11 +404,24 @@ public void testAddingDoWithWarningWithoutSkipWarnings() {
         DoSection doSection = new DoSection(new XContentLocation(lineNumber, 0));
         doSection.setExpectedWarningHeaders(singletonList("foo"));
         doSection.setApiCallSection(new ApiCallSection("test"));
-        ClientYamlTestSuite testSuite = createTestSuite(doSection);
+        ClientYamlTestSuite testSuite = createTestSuite(SkipSection.EMPTY, doSection);
         Exception e = expectThrows(IllegalArgumentException.class, testSuite::validate);
-        assertEquals("api/name:\nattempted to add a [do] with a [warnings] section without a corresponding " +
+        assertThat(e.getMessage(), containsString("api/name:\nattempted to add a [do] with a [warnings] section without a corresponding " +
             "[\"skip\": \"features\": \"warnings\"] so runners that do not support the [warnings] section can skip the test " +
-            "at line [" + lineNumber + "]", e.getMessage());
+            "at line [" + lineNumber + "]"));
+    }
+
+    public void testAddingDoWithHeaderWithoutSkipHeaders() {
+        int lineNumber = between(1, 10000);
+        DoSection doSection = new DoSection(new XContentLocation(lineNumber, 0));
+        ApiCallSection apiCallSection = new ApiCallSection("test");
+        apiCallSection.addHeaders(Collections.singletonMap("header", "value"));
+        doSection.setApiCallSection(apiCallSection);
+        ClientYamlTestSuite testSuite = createTestSuite(SkipSection.EMPTY, doSection);
+        Exception e = expectThrows(IllegalArgumentException.class, testSuite::validate);
+        assertThat(e.getMessage(), containsString("api/name:\nattempted to add a [do] with a [headers] section without a corresponding " +
+            "[\"skip\": \"features\": \"headers\"] so runners that do not support the [headers] section can skip the test at line ["
+            + lineNumber + "]"));
     }
 
     public void testAddingDoWithNodeSelectorWithoutSkipNodeSelector() {
@@ -416,11 +430,11 @@ public void testAddingDoWithNodeSelectorWithoutSkipNodeSelector() {
         ApiCallSection apiCall = new ApiCallSection("test");
         apiCall.setNodeSelector(NodeSelector.SKIP_DEDICATED_MASTERS);
         doSection.setApiCallSection(apiCall);
-        ClientYamlTestSuite testSuite = createTestSuite(doSection);
+        ClientYamlTestSuite testSuite = createTestSuite(SkipSection.EMPTY, doSection);
         Exception e = expectThrows(IllegalArgumentException.class, testSuite::validate);
-        assertEquals("api/name:\nattempted to add a [do] with a [node_selector] section without a corresponding"
-            + " [\"skip\": \"features\": \"node_selector\"] so runners that do not support the [node_selector] section can skip the test at"
-            + " line [" + lineNumber + "]", e.getMessage());
+        assertThat(e.getMessage(), containsString("api/name:\nattempted to add a [do] with a [node_selector] section without a " +
+            "corresponding [\"skip\": \"features\": \"node_selector\"] so runners that do not support the [node_selector] section can " +
+            "skip the test at line [" + lineNumber + "]"));
     }
 
     public void testAddingContainsWithoutSkipContains() {
@@ -429,11 +443,11 @@ public void testAddingContainsWithoutSkipContains() {
             new XContentLocation(lineNumber, 0),
             randomAlphaOfLength(randomIntBetween(3, 30)),
             randomDouble());
-        ClientYamlTestSuite testSuite = createTestSuite(containsAssertion);
+        ClientYamlTestSuite testSuite = createTestSuite(SkipSection.EMPTY, containsAssertion);
         Exception e = expectThrows(IllegalArgumentException.class, testSuite::validate);
-        assertEquals("api/name:\nattempted to add a [contains] assertion without a corresponding " +
+        assertThat(e.getMessage(), containsString("api/name:\nattempted to add a [contains] assertion without a corresponding " +
             "[\"skip\": \"features\": \"contains\"] so runners that do not support the [contains] assertion " +
-            "can skip the test at line [" + lineNumber + "]", e.getMessage());
+            "can skip the test at line [" + lineNumber + "]"));
     }
 
     public void testMultipleValidationErrors() {
@@ -477,44 +491,13 @@ public void testMultipleValidationErrors() {
             e.getMessage());
     }
 
-    private static ClientYamlTestSuite createTestSuite(ExecutableSection executableSection) {
-        final SetupSection setupSection;
-        final TeardownSection teardownSection;
-        final ClientYamlTestSection clientYamlTestSection;
-        switch(randomIntBetween(0, 2)) {
-            case 0:
-                setupSection = new SetupSection(SkipSection.EMPTY, Collections.singletonList(executableSection));
-                teardownSection = TeardownSection.EMPTY;
-                clientYamlTestSection = new ClientYamlTestSection(new XContentLocation(0, 0), "test",
-                    SkipSection.EMPTY, Collections.emptyList());
-                break;
-            case 1:
-                setupSection = SetupSection.EMPTY;
-                teardownSection = new TeardownSection(SkipSection.EMPTY, Collections.singletonList(executableSection));
-                clientYamlTestSection = new ClientYamlTestSection(new XContentLocation(0, 0), "test",
-                    SkipSection.EMPTY, Collections.emptyList());
-                break;
-            case 2:
-                setupSection = SetupSection.EMPTY;
-                teardownSection = TeardownSection.EMPTY;
-                clientYamlTestSection = new ClientYamlTestSection(new XContentLocation(0, 0), "test",
-                    SkipSection.EMPTY, Collections.singletonList(executableSection));
-                break;
-            default:
-                throw new UnsupportedOperationException();
-        }
-
-        return new ClientYamlTestSuite("api", "name", setupSection, teardownSection,
-            Collections.singletonList(clientYamlTestSection));
-    }
-
     public void testAddingDoWithWarningWithSkip() {
         int lineNumber = between(1, 10000);
         DoSection doSection = new DoSection(new XContentLocation(lineNumber, 0));
         doSection.setExpectedWarningHeaders(singletonList("foo"));
         doSection.setApiCallSection(new ApiCallSection("test"));
         SkipSection skipSection = new SkipSection(null, singletonList("warnings"), null);
-        createTestSuiteAndValidate(skipSection, doSection);
+        createTestSuite(skipSection, doSection).validate();
     }
 
     public void testAddingDoWithNodeSelectorWithSkip() {
@@ -524,7 +507,17 @@ public void testAddingDoWithNodeSelectorWithSkip() {
         ApiCallSection apiCall = new ApiCallSection("test");
         apiCall.setNodeSelector(NodeSelector.SKIP_DEDICATED_MASTERS);
         doSection.setApiCallSection(apiCall);
-        createTestSuiteAndValidate(skipSection, doSection);
+        createTestSuite(skipSection, doSection).validate();
+    }
+
+    public void testAddingDoWithHeadersWithSkip() {
+        int lineNumber = between(1, 10000);
+        SkipSection skipSection = new SkipSection(null, singletonList("headers"), null);
+        DoSection doSection = new DoSection(new XContentLocation(lineNumber, 0));
+        ApiCallSection apiCallSection = new ApiCallSection("test");
+        apiCallSection.addHeaders(singletonMap("foo", "bar"));
+        doSection.setApiCallSection(apiCallSection);
+        createTestSuite(skipSection, doSection).validate();
     }
 
     public void testAddingContainsWithSkip() {
@@ -534,10 +527,10 @@ public void testAddingContainsWithSkip() {
             new XContentLocation(lineNumber, 0),
             randomAlphaOfLength(randomIntBetween(3, 30)),
             randomDouble());
-        createTestSuiteAndValidate(skipSection, containsAssertion);
+        createTestSuite(skipSection, containsAssertion).validate();
     }
 
-    private static void createTestSuiteAndValidate(SkipSection skipSection, ExecutableSection executableSection) {
+    private static ClientYamlTestSuite createTestSuite(SkipSection skipSection, ExecutableSection executableSection) {
         final SetupSection setupSection;
         final TeardownSection teardownSection;
         final ClientYamlTestSection clientYamlTestSection;
@@ -571,13 +564,11 @@ private static void createTestSuiteAndValidate(SkipSection skipSection, Executab
                 teardownSection = new TeardownSection(skipSection, Collections.singletonList(executableSection));
                 clientYamlTestSection = new ClientYamlTestSection(new XContentLocation(0, 0), "test",
                     SkipSection.EMPTY, randomBoolean() ? Collections.emptyList() : Collections.singletonList(executableSection));
-
                 break;
             default:
                 throw new UnsupportedOperationException();
         }
-        ClientYamlTestSuite clientYamlTestSuite = new ClientYamlTestSuite("api", "name", setupSection, teardownSection,
+        return new ClientYamlTestSuite("api", "name", setupSection, teardownSection,
             Collections.singletonList(clientYamlTestSection));
-        clientYamlTestSuite.validate();
     }
 }

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/custom_all_field.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/delete_forecast.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/delete_job_force.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/delete_model_snapshot.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/filter_crud.yml

@@ -1,6 +1,7 @@
 ---
 setup:
-
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/find_file_structure.yml

@@ -1,3 +1,6 @@
+setup:
+  - skip:
+      features: headers
 ---
 "Test NDJSON file structure analysis without overrides":
   - do:

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/get_datafeed_stats.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/get_datafeeds.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/get_model_snapshots.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/index_layout.yml

@@ -1,3 +1,6 @@
+setup:
+  - skip:
+      features: headers
 ---
 "Test CRUD on two jobs in shared index":
 

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/job_groups.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_crud.yml

@@ -399,6 +399,8 @@
 
 ---
 "Test cannot decrease model_memory_limit below current usage":
+  - skip:
+      features: headers
   - do:
       xpack.ml.put_job:
         job_id: jobs-crud-model-memory-limit-decrease
@@ -527,7 +529,8 @@
 
 ---
 "Test close job":
-
+  - skip:
+      features: headers
   - do:
       xpack.ml.put_job:
         job_id: jobs-crud-close-job
@@ -762,7 +765,8 @@
 
 ---
 "Test force close job":
-
+  - skip:
+      features: headers
   - do:
       xpack.ml.put_job:
         job_id: jobs-crud-force-close-job
@@ -929,7 +933,8 @@
 
 ---
 "Test cannot create job with existing result document":
-
+  - skip:
+      features: headers
   - do:
       headers:
         Content-Type: application/json
@@ -1068,7 +1073,8 @@
 
 ---
 "Test max model memory limit":
-
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
@@ -1315,7 +1321,8 @@
 
 ---
 "Test open job when persistent task allocation disabled":
-
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_result_buckets.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_result_categories.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_result_influencers.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_result_overall_buckets.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_result_records.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_get_stats.yml

@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: headers
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/ml_anomalies_default_mappings.yml

@@ -1,3 +1,6 @@
+setup:
+  - skip:
+      features: headers
 ---
 "Test new fields are mapped as keyword":