From d5231687cc1edb4098f015d564744f9bda2a370b Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Mon, 25 Oct 2021 14:07:14 +1100
Subject: [PATCH] Clear cached devservices properties on close

Otherwise QuarkusUnitTest based tests can potentially see dev services
properties from previous tests.
---
 .../deployment/steps/DevServicesConfigBuildStep.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevServicesConfigBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevServicesConfigBuildStep.java
index fbe44bbd7b74c..5c01b2b7bbf1b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevServicesConfigBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevServicesConfigBuildStep.java
@@ -12,6 +12,7 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Produce;
+import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesNativeConfigResultBuildItem;
@@ -30,7 +31,8 @@ List<DevServicesConfigResultBuildItem> deprecated(List<DevServicesNativeConfigRe
     @BuildStep
     @Produce(ServiceStartBuildItem.class)
     DevServicesLauncherConfigResultBuildItem setup(BuildProducer<RunTimeConfigurationDefaultBuildItem> runtimeConfig,
-            List<DevServicesConfigResultBuildItem> devServicesConfigResultBuildItems) {
+            List<DevServicesConfigResultBuildItem> devServicesConfigResultBuildItems,
+            CuratedApplicationShutdownBuildItem shutdownBuildItem) {
         Map<String, String> newProperties = new HashMap<>(devServicesConfigResultBuildItems.stream().collect(
                 Collectors.toMap(DevServicesConfigResultBuildItem::getKey, DevServicesConfigResultBuildItem::getValue)));
         Config config = ConfigProvider.getConfig();
@@ -45,6 +47,13 @@ DevServicesLauncherConfigResultBuildItem setup(BuildProducer<RunTimeConfiguratio
                     newProperties.put(entry.getKey(), entry.getValue());
                 }
             }
+        } else {
+            shutdownBuildItem.addCloseTask(new Runnable() {
+                @Override
+                public void run() {
+                    oldConfig = null;
+                }
+            }, true);
         }
         for (Map.Entry<String, String> entry : newProperties.entrySet()) {
             runtimeConfig.produce(new RunTimeConfigurationDefaultBuildItem(entry.getKey(), entry.getValue()));