Add extra database manipulation to multi-project, too

Author: joegallo

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

@@ -21,12 +21,20 @@
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+
 import static org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT.assertDatabasesLoaded;
+import static org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT.getRootPath;
 import static org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT.putGeoipPipeline;
+import static org.hamcrest.Matchers.is;
 
 @FixForMultiProject(description = "Potentially remove this test after https://elasticco.atlassian.net/browse/ES-12094 is implemented")
 public class IngestGeoIpClientMultiProjectYamlTestSuiteIT extends MultipleProjectsClientYamlSuiteTestCase {
@@ -35,7 +43,10 @@ public class IngestGeoIpClientMultiProjectYamlTestSuiteIT extends MultipleProjec
 
     private static GeoIpHttpFixture fixture = new GeoIpHttpFixture(useFixture);
 
+    public static TemporaryFolder configDir = new TemporaryFolder();
+
     private static ElasticsearchCluster cluster = ElasticsearchCluster.local()
+        .withConfigDir(() -> getRootPath(configDir))
         .module("reindex")
         .module("ingest-geoip")
         .systemProperty("ingest.geoip.downloader.enabled.default", "true")
@@ -51,7 +62,7 @@ public class IngestGeoIpClientMultiProjectYamlTestSuiteIT extends MultipleProjec
         .build();
 
     @ClassRule
-    public static TestRule ruleChain = RuleChain.outerRule(fixture).around(cluster);
+    public static TestRule ruleChain = RuleChain.outerRule(fixture).around(configDir).around(cluster);
 
     @Override
     protected String getTestRestCluster() {
@@ -67,6 +78,19 @@ public static Iterable<Object[]> parameters() throws Exception {
         return ESClientYamlSuiteTestCase.createParameters();
     }
 
+    @BeforeClass
+    public static void copyExtraDatabase() throws Exception {
+        Path configPath = getRootPath(configDir);
+        assertThat(Files.exists(configPath), is(true));
+        Path ingestGeoipDatabaseDir = configPath.resolve("ingest-geoip");
+        Files.createDirectory(ingestGeoipDatabaseDir);
+        final var clazz = IngestGeoIpClientYamlTestSuiteIT.class; // long line prevention
+        Files.copy(
+            Objects.requireNonNull(clazz.getResourceAsStream("/ipinfo/asn_sample.mmdb")),
+            ingestGeoipDatabaseDir.resolve("asn.mmdb")
+        );
+    }
+
     @Before
     public void waitForDatabases() throws Exception {
         putGeoipPipeline("pipeline-with-geoip");

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

@@ -162,7 +162,7 @@ static void assertDatabasesLoaded() throws Exception {
     }
 
     @SuppressForbidden(reason = "fixtures use java.io.File based APIs")
-    private static Path getRootPath(TemporaryFolder folder) {
+    public static Path getRootPath(TemporaryFolder folder) {
         return folder.getRoot().toPath();
     }
 }