Replace Nginx fixture usage with UrlFixture (elastic#103494)

- Simplify test setup in URLSearchableSnapshotsIT - Delete nginx test fixture project
jimczi · Dec 20, 2023 · 7773364 · 7773364
1 parent 842303c
commit 7773364
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 78 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -100,7 +100,6 @@ List projects = [
   'test:fixtures:testcontainer-utils',
   'test:fixtures:geoip-fixture',
   'test:fixtures:url-fixture',
-  'test:fixtures:nginx-fixture',
   'test:logger-usage',
   'test:test-clusters',
   'test:x-content',

diff --git a/test/fixtures/nginx-fixture/Dockerfile b/test/fixtures/nginx-fixture/Dockerfile
diff --git a/test/fixtures/nginx-fixture/build.gradle b/test/fixtures/nginx-fixture/build.gradle
diff --git a/test/fixtures/nginx-fixture/docker-compose.yml b/test/fixtures/nginx-fixture/docker-compose.yml
diff --git a/test/fixtures/nginx-fixture/nginx.conf b/test/fixtures/nginx-fixture/nginx.conf
diff --git a/x-pack/plugin/searchable-snapshots/qa/url/build.gradle b/x-pack/plugin/searchable-snapshots/qa/url/build.gradle
@@ -1,12 +1,11 @@
 import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE
 
-apply plugin: 'elasticsearch.legacy-java-rest-test'
+apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.rest-resources'
 
-final Project fixture = project(':test:fixtures:nginx-fixture')
-
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('searchable-snapshots'))))
+  javaRestTestImplementation project(':test:fixtures:url-fixture')
 }
 
 restResources {
@@ -15,34 +14,6 @@ restResources {
   }
 }
 
-apply plugin: 'elasticsearch.test.fixtures'
-testFixtures.useFixture(fixture.path, 'nginx-fixture')
-
-def fixtureAddress = { fixtureName ->
-  int ephemeralPort = fixture.postProcessFixture.ext."test.fixtures.${fixtureName}.tcp.80"
-  assert ephemeralPort > 0
-  'http://127.0.0.1:' + ephemeralPort
-}
-
-File repositoryDir = fixture.fsRepositoryDir as File
-
 tasks.named("javaRestTest").configure {
-  dependsOn fixture.getTasks().named("postProcessFixture")
-
-  nonInputProperties.systemProperty 'test.url.fs.repo.dir', repositoryDir.absolutePath
-  nonInputProperties.systemProperty 'test.url.http', "${-> fixtureAddress('nginx-fixture')}"
-}
-
-testClusters.matching { it.name == "javaRestTest" }.configureEach {
-  testDistribution = 'DEFAULT'
-  setting 'path.repo', repositoryDir.absolutePath, IGNORE_VALUE
-  setting 'repositories.url.allowed_urls', { "${-> fixtureAddress('nginx-fixture')}" }, IGNORE_VALUE
-
-  setting 'xpack.license.self_generated.type', 'trial'
-
-  setting 'xpack.searchable.snapshot.shared_cache.size', '16MB'
-  setting 'xpack.searchable.snapshot.shared_cache.region_size', '256KB'
-  setting 'xpack.searchable_snapshots.cache_fetch_async_thread_pool.keep_alive', '0ms'
-
-  setting 'xpack.security.enabled', 'false'
+  usesDefaultDistribution()
 }
diff --git a/...vaRestTest/java/org/elasticsearch/xpack/searchablesnapshots/URLSearchableSnapshotsIT.java b/...vaRestTest/java/org/elasticsearch/xpack/searchablesnapshots/URLSearchableSnapshotsIT.java
@@ -7,22 +7,45 @@
 
 package org.elasticsearch.xpack.searchablesnapshots;
 
+import fixture.url.URLFixture;
+
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.repositories.fs.FsRepository;
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.cluster.local.distribution.DistributionType;
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
 
 import static org.hamcrest.Matchers.blankOrNullString;
 import static org.hamcrest.Matchers.not;
 
 public class URLSearchableSnapshotsIT extends AbstractSearchableSnapshotsRestTestCase {
 
+    public static URLFixture urlFixture = new URLFixture();
+
+    public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
+        .distribution(DistributionType.DEFAULT)
+        .setting("xpack.license.self_generated.type", "trial")
+        .setting("repositories.url.allowed_urls", () -> urlFixture.getAddress())
+        .setting("path.repo", () -> urlFixture.getRepositoryDir())
+        .setting("xpack.searchable.snapshot.shared_cache.size", "16MB")
+        .setting("xpack.searchable.snapshot.shared_cache.region_size", "256KB")
+        .setting("xpack.searchable_snapshots.cache_fetch_async_thread_pool.keep_alive", "0ms")
+        .setting("xpack.security.enabled", "false")
+        .build();
+
+    @ClassRule
+    public static TestRule ruleChain = RuleChain.outerRule(urlFixture).around(cluster);
+
     @Override
     protected String writeRepositoryType() {
         return FsRepository.TYPE;
     }
 
     @Override
     protected Settings writeRepositorySettings() {
-        final String repoDirectory = System.getProperty("test.url.fs.repo.dir");
+        final String repoDirectory = urlFixture.getRepositoryDir();
         assertThat(repoDirectory, not(blankOrNullString()));
 
         return Settings.builder().put("location", repoDirectory).build();
@@ -40,9 +63,14 @@ protected String readRepositoryType() {
 
     @Override
     protected Settings readRepositorySettings() {
-        final String url = System.getProperty("test.url.http");
+        final String url = urlFixture.getAddress();
         assertThat(url, not(blankOrNullString()));
 
         return Settings.builder().put("url", url).build();
     }
+
+    @Override
+    protected String getTestRestCluster() {
+        return cluster.getHttpAddresses();
+    }
 }