From fe0cb362848eee8f0d43dd1a2ebeb454bcde1bf3 Mon Sep 17 00:00:00 2001
From: Pedro Igor <pigor.craveiro@gmail.com>
Date: Mon, 31 Jan 2022 19:49:20 -0300
Subject: [PATCH] Do not run re-augmentation if config is the same in dev mode

Closes #9906
---
 .../quarkus/deployment/KeycloakProcessor.java |  8 ++++++++
 .../keycloak/quarkus/runtime/Environment.java |  4 ++--
 .../it/cli/dist/StartAutoBuildDistTest.java   | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
index 092f8e526e0..8769a07f305 100644
--- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
+++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
@@ -67,6 +67,7 @@ import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
 import io.quarkus.hibernate.orm.deployment.PersistenceXmlDescriptorBuildItem;
 import io.quarkus.resteasy.server.common.deployment.ResteasyDeploymentCustomizerBuildItem;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.smallrye.health.runtime.SmallRyeHealthHandler;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
@@ -341,6 +342,13 @@ class KeycloakProcessor {
             properties.put(String.format("kc.provider.file.%s.last-modified", jar.getName()), String.valueOf(jar.lastModified()));
         }
 
+        String profile = Environment.getProfile();
+
+        if (profile != null) {
+            properties.put(Environment.PROFILE, profile);
+            properties.put(ProfileManager.QUARKUS_PROFILE_PROP, profile);
+        }
+
         properties.put(QUARKUS_PROPERTY_ENABLED, String.valueOf(QuarkusPropertiesConfigSource.getConfigurationFile() != null));
 
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java
index ba3efe366c8..e5c3197e299 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java
@@ -108,12 +108,12 @@ public final class Environment {
 
     public static void setProfile(String profile) {
         System.setProperty(PROFILE, profile);
-        System.setProperty("quarkus.profile", profile);
+        System.setProperty(ProfileManager.QUARKUS_PROFILE_PROP, profile);
         if (isTestLaunchMode()) {
             System.setProperty("mp.config.profile", profile);
-            System.setProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profile);
         }
     }
+
     public static String getCurrentOrPersistedProfile() {
         String profile = getProfile();
         if(profile == null) {
diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java
index 58242b4b316..68925b5750f 100644
--- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java
+++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java
@@ -18,6 +18,7 @@
 package org.keycloak.it.cli.dist;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -93,4 +94,22 @@ public class StartAutoBuildDistTest {
         cliResult.assertBuild();
         cliResult.assertStarted();
     }
+
+    @Test
+    @Launch({ "start-dev" })
+    @Order(7)
+    void testStartDevFirstTime(LaunchResult result) {
+        CLIResult cliResult = (CLIResult) result;
+        assertTrue(cliResult.getOutput().contains("Updating the configuration and installing your custom providers, if any. Please wait."));
+        cliResult.assertStartedDevMode();
+    }
+
+    @Test
+    @Launch({ "start-dev" })
+    @Order(8)
+    void testShouldNotReAugStartDevIfConfigIsSame(LaunchResult result) {
+        CLIResult cliResult = (CLIResult) result;
+        assertFalse(cliResult.getOutput().contains("Updating the configuration and installing your custom providers, if any. Please wait."));
+        cliResult.assertStartedDevMode();
+    }
 }