Merge pull request quarkusio#35412 from patriot1burke/opt-in-dev-serv…

…ices Launch mock event server even if devservices.enabled=false
gsmet · Aug 18, 2023 · bb28c1a · bb28c1a
2 parents dfc0169 + 3067804
commit bb28c1a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/docs/src/main/asciidoc/aws-lambda-http.adoc b/docs/src/main/asciidoc/aws-lambda-http.adoc
@@ -170,6 +170,13 @@ quarkus.lambda.mock-event-server.test-port=8083
 
 A port value of zero will result in a randomly assigned port.
 
+To turn off the mock event server:
+[source, subs=attributes+]
+----
+quarkus.lambda.mock-event-server.enabled=false
+----
+
+
 == Simulate AWS Lambda Deployment with SAM CLI
 
 The AWS SAM CLI allows you to run your lambda's locally on your laptop in a simulated Lambda environment.  This requires Docker to be installed.

diff --git a/docs/src/main/asciidoc/aws-lambda.adoc b/docs/src/main/asciidoc/aws-lambda.adoc
@@ -362,6 +362,13 @@ quarkus.lambda.mock-event-server.test-port=8083
 
 A port value of zero will result in a randomly assigned port.
 
+To turn off the mock event server:
+[source, subs=attributes+]
+----
+quarkus.lambda.mock-event-server.enabled=false
+----
+
+
 == Testing with the SAM CLI
 If you do not want to use the mock event server, you can test your lambdas with SAM CLI.
 

diff --git a/...loyment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java b/...loyment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java
@@ -22,7 +22,6 @@
 import io.quarkus.deployment.builditem.DevServicesResultBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
-import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
 import io.quarkus.runtime.LaunchMode;
 
 public class DevServicesLambdaProcessor {
@@ -53,7 +52,7 @@ private boolean legacyTestingEnabled() {
     }
 
     @Produce(ServiceStartBuildItem.class)
-    @BuildStep(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class)
+    @BuildStep(onlyIfNot = IsNormal.class) // This is required for testing so run it even if devservices.enabled=false
     public void startEventServer(LaunchModeBuildItem launchMode,
             LambdaConfig config,
             Optional<EventServerOverrideBuildItem> override,
@@ -64,6 +63,9 @@ public void startEventServer(LaunchModeBuildItem launchMode,
             return;
         if (legacyTestingEnabled())
             return;
+        if (!config.mockEventServer.enabled) {
+            return;
+        }
         if (server != null) {
             return;
         }

diff --git a/...n-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java b/...n-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java
@@ -9,6 +9,12 @@
  */
 @ConfigGroup
 public class MockEventServerConfig {
+    /**
+     * Setting to true will start event server even if quarkus.devservices.enabled=false
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+
     /**
      * Port to access mock event server in dev mode
      */