Fix dependency resolution error in mixed cluster type projects

mark-vieira · Nov 13, 2023 · 533c936 · 533c936
1 parent e0261a7
commit 533c936
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/...nternal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java b/...nternal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
@@ -77,6 +77,7 @@ public class RestTestBasePlugin implements Plugin<Project> {
     private static final String EXTRACTED_PLUGINS_CONFIGURATION = "extractedPlugins";
     private static final Attribute<String> CONFIGURATION_ATTRIBUTE = Attribute.of("test-cluster-artifacts", String.class);
     private static final String FEATURES_METADATA_CONFIGURATION = "featuresMetadataDeps";
+    private static final String DEFAULT_DISTRO_FEATURES_METADATA_CONFIGURATION = "defaultDistrofeaturesMetadataDeps";
     private static final String TESTS_FEATURES_METADATA_PATH = "tests.features.metadata.path";
 
     private final ProviderFactory providerFactory;
@@ -126,6 +127,21 @@ public void apply(Project project) {
             });
         });
 
+        Configuration defaultDistroFeatureMetadataConfig = project.getConfigurations()
+            .create(DEFAULT_DISTRO_FEATURES_METADATA_CONFIGURATION, c -> {
+                c.setCanBeConsumed(false);
+                c.setCanBeResolved(true);
+                c.attributes(
+                    a -> a.attribute(
+                        ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE,
+                        HistoricalFeaturesMetadataPlugin.FEATURES_METADATA_TYPE
+                    )
+                );
+                c.defaultDependencies(
+                    d -> d.add(project.getDependencies().project(Map.of("path", ":distribution", "configuration", "featuresMetadata")))
+                );
+            });
+
         // For plugin and module projects, register the current project plugin bundle as a dependency
         project.getPluginManager().withPlugin("elasticsearch.esplugin", plugin -> {
             if (GradleUtils.isModuleProject(project.getPath())) {
@@ -188,8 +204,9 @@ public Void call(Object... args) {
                     );
 
                     // If we are using the default distribution we need to register all module feature metadata
-                    featureMetadataConfig.getDependencies()
-                        .add(project.getDependencies().project(Map.of("path", ":distribution", "configuration", "featuresMetadata")));
+                    task.getInputs().files(defaultDistroFeatureMetadataConfig).withPathSensitivity(PathSensitivity.NONE);
+                    nonInputSystemProperties.systemProperty(TESTS_FEATURES_METADATA_PATH, defaultDistroFeatureMetadataConfig::getAsPath);
+
                     return null;
                 }
             });

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -77,6 +77,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.nio.CharBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -2237,7 +2238,7 @@ protected Map<NodeFeature, Version> getHistoricalFeatures() {
                         historicalFeaturesMap.put(new NodeFeature(entry.getKey()), Version.fromString(entry.getValue()));
                     }
                 } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    throw new UncheckedIOException(e);
                 }
             }