Make test resource config override dev service config (and system properties)

Author: holly-cummins

core/deployment/src/main/java/io/quarkus/deployment/builditem/DevServicesResultBuildItem.java

@@ -174,9 +174,6 @@ public Map<String, Function<Startable, String>> getApplicationConfigProvider() {
 
     public Map<String, String> getConfig(Startable startable) {
         SupplierMap<String, String> map = new SupplierMap<>();
-        if (config != null && !config.isEmpty()) {
-            map.putAll(config);
-        }
         for (Map.Entry<String, Function<Startable, String>> entry : applicationConfigProvider.entrySet()) {
             map.put(entry.getKey(), () -> entry.getValue().apply(startable));
         }

core/runtime/src/main/java/io/quarkus/devservice/runtime/config/DevServicesConfigBuilder.java

@@ -14,11 +14,6 @@ public SmallRyeConfigBuilder configBuilder(SmallRyeConfigBuilder builder) {
 
     @Override
     public int priority() {
-        // What's the right priority? This is a cheeky dynamic override, so a high priority seems correct, but dev services are supposed to fill in gaps in existing information.
-        // Dev services should be looking at those sources and not doing anything if there's existing config,
-        // so a very low priority is also arguably correct.
-        // In principle the priority actually shouldn't matter much, but in practice it needs to not be higher than Arquillian config overrides or some tests fail
-
         return 10;
     }
 }

core/runtime/src/main/java/io/quarkus/devservice/runtime/config/DevServicesConfigSource.java

@@ -56,7 +56,7 @@ public String getName() {
 
     @Override
     public int getOrdinal() {
-        // See discussion on DevServicesConfigBuilder about what the right value here is
-        return 10;
+        // This is a dynamic override, so it needs a high priority to be able to override ephemeral port (0) with real values
+        return 410; // a bit more than system properties, but less than the TestResource config overrides done via RuntimeOverrideConfigSource
     }
 }

core/runtime/src/main/java/io/quarkus/runtime/configuration/RuntimeOverrideConfigSource.java

@@ -49,7 +49,7 @@ public Set<String> getPropertyNames() {
 
     @Override
     public int getOrdinal() {
-        return 399; //one less that system properties
+        return 420; // higher than dev services config source
     }
 
     @Override

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java

@@ -49,6 +49,8 @@ private EffectiveConfig(Builder builder) {
         // (see also https://quarkus.io/guides/config-reference#configuration-sources)
         // 600 -> forcedProperties
         // 500 -> taskProperties
+        // 420 -> RuntimeOverride (used by TestResource and other Startup actions)
+        // 410 -> Dev Service overrides
         // 400 -> System.getProperties() (provided by default sources)
         // 300 -> System.getenv() (provided by default sources)
         // 290 -> quarkusBuildProperties

integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaEphemeralPortTestCase.java

@@ -3,14 +3,12 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.it.amazon.lambda.profiles.EphemeralPortProfile;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 
-@Disabled("Tracked by https://github.com/quarkusio/quarkus/issues/48784")
 @TestProfile(EphemeralPortProfile.class)
 @QuarkusTest
 public class AmazonLambdaEphemeralPortTestCase {