(camel-karavan) branch main updated: Fix

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new 97ec3474 Fix
97ec3474 is described below

commit 97ec3474705b31e2e8a8da0c39281c2b405b81c5
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Jul 5 11:25:06 2024 -0400

    Fix
---
 karavan-app/pom.xml                                            |  7 ++-----
 .../java/org/apache/camel/karavan/api/DevModeResource.java     |  6 ++----
 .../java/org/apache/camel/karavan/service/ConfigService.java   | 10 +++++++---
 karavan-app/src/main/resources/application.properties          |  1 -
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index c7b88689..26c0318f 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -19,12 +19,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0";
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.camel.karavan</groupId>
-        <artifactId>karavan-parent</artifactId>
-        <version>4.7.0</version>
-    </parent>
+    <groupId>org.apache.camel.karavan</groupId>
     <artifactId>karavan</artifactId>
+    <version>4.7.0</version>
 
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
index 4655b211..69eb7bfe 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
@@ -28,6 +28,7 @@ import org.apache.camel.karavan.service.ProjectService;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
+import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
 import static org.apache.camel.karavan.KaravanEvents.CMD_DELETE_CONTAINER;
 import static org.apache.camel.karavan.KaravanEvents.CMD_RELOAD_PROJECT_CODE;
 
@@ -36,9 +37,6 @@ public class DevModeResource {
 
     private static final Logger LOGGER = 
Logger.getLogger(DevModeResource.class.getName());
 
-    @ConfigProperty(name = "karavan.environment")
-    String environment;
-
     @Inject
     KaravanCache karavanCache;
 
@@ -94,7 +92,7 @@ public class DevModeResource {
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/container/{projectId}")
     public Response getPodStatus(@PathParam("projectId") String projectId) 
throws RuntimeException {
-        PodContainerStatus cs = 
karavanCache.getDevModePodContainerStatus(projectId, environment);
+        PodContainerStatus cs = 
karavanCache.getDevModePodContainerStatus(projectId, DEV_ENVIRONMENT);
         if (cs != null) {
             return Response.ok(cs).build();
         } else {
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ConfigService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ConfigService.java
index 81fbb466..58cd1bc3 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ConfigService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ConfigService.java
@@ -54,7 +54,7 @@ public class ConfigService {
     String environment;
 
     @ConfigProperty(name = "karavan.environments")
-    List<String> environments;
+    Optional<List<String>> environments;
 
     @ConfigProperty(name = "karavan.shared.folder")
     Optional<String> sharedFolder;
@@ -79,7 +79,7 @@ public class ConfigService {
                 version,
                 inKubernetes() ? "kubernetes" : "docker",
                 environment,
-                environments,
+                getEnvs(),
                 configFilenames
         );
     }
@@ -131,7 +131,7 @@ public class ConfigService {
         var filename = f.getName();
         var parts = filename.split("\\.");
         var prefix = parts[0];
-        if (environment.equals(DEV_ENVIRONMENT) && 
!environments.contains(prefix)) { // no prefix AND dev env
+        if (environment.equals(DEV_ENVIRONMENT) && 
!getEnvs().contains(prefix)) { // no prefix AND dev env
             storeFile(f);
         } else if (Objects.equals(prefix, environment)){ // with prefix == env
             storeFile(f);
@@ -150,6 +150,10 @@ public class ConfigService {
         }
     }
 
+    private List<String> getEnvs() {
+        return environments.orElse(List.of(DEV_ENVIRONMENT));
+    }
+
     private void createConfigMapFromFile(String filename, String content) {
         kubernetesService.createConfigmap(filename, Map.of(filename, content));
     }
diff --git a/karavan-app/src/main/resources/application.properties 
b/karavan-app/src/main/resources/application.properties
index 9295c78b..98cf2804 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -17,7 +17,6 @@
 karavan.title=Apache Camel Karavan
 karavan.version=4.7.0
 karavan.environment=dev
-karavan.environments=dev
 
 karavan.camel.status.interval=2s
 karavan.container.status.interval=2s