share yaml test code WIP

Author: samxbr

modules/ingest-geoip/build.gradle

@@ -85,7 +85,16 @@ tasks.named("dependencyLicenses").configure {
   ignoreFile 'elastic-geoip-database-service-agreement-LICENSE.txt'
 }
 
+configurations {
+  yamlRestImplementation {
+    attributes {
+      attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JVM_CLASS_DIRECTORY)
+    }
+  }
+}
+
 artifacts {
+  yamlRestImplementation(new File(projectDir, "src/yamlRestTest/java"))
   restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
 }
 

modules/ingest-geoip/qa/multi-project/build.gradle

@@ -9,14 +9,18 @@
 
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
-apply plugin: 'elasticsearch.yaml-rest-compat-test'
+//apply plugin: 'elasticsearch.yaml-rest-compat-test'
 
 dependencies {
+  yamlRestTestImplementation project(path: ':modules:ingest-geoip', configuration: 'yamlRestImplementation')
   javaRestTestImplementation project(':modules:ingest-geoip')
   javaRestTestImplementation project(':test:external-modules:test-multi-project')
   javaRestTestImplementation project(':test:fixtures:geoip-fixture')
 
+//  testImplementation project(':modules:ingest-geoip')
   yamlRestTestImplementation project(':modules:ingest-geoip')
+
+//  yamlRestTestImplementation(testArtifact(project(":modules:ingest-geoip")))
   yamlRestTestImplementation project(':test:external-modules:test-multi-project')
   yamlRestTestImplementation project(':test:fixtures:geoip-fixture')
   yamlRestTestImplementation project(':x-pack:qa:multi-project:yaml-test-framework')

modules/ingest-geoip/qa/multi-project/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientMultiProjectYamlTestSuiteIT.java

@@ -38,6 +38,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT.putGeoipPipeline;
 
 public class IngestGeoIpClientMultiProjectYamlTestSuiteIT extends MultipleProjectsClientYamlSuiteTestCase {
 
@@ -79,7 +80,7 @@ public static Iterable<Object[]> parameters() throws Exception {
 
     @Before
     public void waitForDatabases() throws Exception {
-        putGeoipPipeline();
+        putGeoIpPipeline();
         assertBusy(() -> {
             Request request = new Request("GET", "/_ingest/geoip/stats");
             Map<String, Object> response = entityAsMap(client().performRequest(request));
@@ -104,33 +105,33 @@ public void waitForDatabases() throws Exception {
      * This creates a pipeline with a geoip processor so that the GeoipDownloader will download its databases.
      * @throws IOException
      */
-    private void putGeoipPipeline() throws IOException {
-        final BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
-            {
-                builder.startArray("processors");
-                {
-                    builder.startObject();
-                    {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-city");
-                            builder.field("database_file", "GeoLite2-City.mmdb");
-                        }
-                        builder.endObject();
-                    }
-                    builder.endObject();
-                }
-                builder.endArray();
-            }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        Request putPipelineRequest = new Request("PUT", "/_ingest/pipeline/pipeline-with-geoip");
-        putPipelineRequest.setEntity(new ByteArrayEntity(bytes.array(), ContentType.APPLICATION_JSON));
-        client().performRequest(putPipelineRequest);
-    }
+//    private void putGeoipPipeline() throws IOException {
+//        final BytesReference bytes;
+//        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
+//            builder.startObject();
+//            {
+//                builder.startArray("processors");
+//                {
+//                    builder.startObject();
+//                    {
+//                        builder.startObject("geoip");
+//                        {
+//                            builder.field("field", "ip");
+//                            builder.field("target_field", "ip-city");
+//                            builder.field("database_file", "GeoLite2-City.mmdb");
+//                        }
+//                        builder.endObject();
+//                    }
+//                    builder.endObject();
+//                }
+//                builder.endArray();
+//            }
+//            builder.endObject();
+//            bytes = BytesReference.bytes(builder);
+//        }
+//        Request putPipelineRequest = new Request("PUT", "/_ingest/pipeline/pipeline-with-geoip");
+//        putPipelineRequest.setEntity(new ByteArrayEntity(bytes.array(), ContentType.APPLICATION_JSON));
+//        client().performRequest(putPipelineRequest);
+//    }
 
 }

modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java

@@ -78,10 +78,10 @@ public void waitForDatabases() throws Exception {
         assertBusy(() -> {
             Request request = new Request("GET", "/_ingest/geoip/stats");
             Map<String, Object> response = entityAsMap(client().performRequest(request));
-
+            // assert databases are downloaded
             Map<?, ?> downloadStats = (Map<?, ?>) response.get("stats");
             assertThat(downloadStats.get("databases_count"), equalTo(4));
-
+            // assert databases are loaded to node
             Map<?, ?> nodes = (Map<?, ?>) response.get("nodes");
             assertThat(nodes.size(), equalTo(1));
             Map<?, ?> node = (Map<?, ?>) nodes.values().iterator().next();
@@ -99,7 +99,7 @@ public void waitForDatabases() throws Exception {
      * This creates a pipeline with a geoip processor so that the GeoipDownloader will download its databases.
      * @throws IOException
      */
-    private void putGeoipPipeline() throws IOException {
+    public static void putGeoipPipeline() throws IOException {
         final BytesReference bytes;
         try (XContentBuilder builder = JsonXContent.contentBuilder()) {
             builder.startObject();