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 1b365d9f Fixed #1351
1b365d9f is described below
commit 1b365d9fe17634f085be312a74fa6040a1ff38e0
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Aug 12 11:22:11 2024 -0400
Fixed #1351
---
.../main/java/org/apache/camel/karavan/KaravanCache.java | 16 ++++++++--------
.../java/org/apache/camel/karavan/KaravanConstants.java | 2 +-
.../org/apache/camel/karavan/KaravanStartupLoader.java | 6 +++---
.../org/apache/camel/karavan/api/ContainerResource.java | 3 ++-
.../org/apache/camel/karavan/api/DevModeResource.java | 3 ++-
.../apache/camel/karavan/api/InfrastructureResource.java | 4 ++--
.../karavan/kubernetes/KubernetesStatusService.java | 3 ++-
.../camel/karavan/listener/CamelReloadListener.java | 3 ++-
.../camel/karavan/listener/CamelStatusListener.java | 3 ++-
.../camel/karavan/listener/DockerStatusListener.java | 3 ++-
.../karavan/listener/PodContainerCommandListener.java | 3 ++-
.../camel/karavan/scheduler/CamelStatusScheduler.java | 2 +-
.../camel/karavan/scheduler/DockerStatusScheduler.java | 3 ++-
.../org/apache/camel/karavan/service/CodeService.java | 5 +++--
.../org/apache/camel/karavan/service/ConfigService.java | 11 ++++++-----
.../org/apache/camel/karavan/service/ProjectService.java | 7 ++++---
karavan-app/src/main/resources/application.properties | 1 -
karavan-app/src/main/webui/package-lock.json | 2 +-
.../src/main/webui/src/designer/route/DslConnections.tsx | 9 ++++++++-
19 files changed, 53 insertions(+), 36 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
index c3e149b8..f60877d5 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
@@ -28,7 +28,7 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV;
@Default
@Singleton
@@ -94,7 +94,7 @@ public class KaravanCache {
}
public void saveProject(Project project) {
- var key = GroupedKey.create(project.getProjectId(), DEV_ENVIRONMENT,
project.getProjectId());
+ var key = GroupedKey.create(project.getProjectId(), DEV,
project.getProjectId());
projects.put(key, project);
}
@@ -118,9 +118,9 @@ public class KaravanCache {
}
public void saveProjectFile(ProjectFile file, boolean commited) {
- files.put(GroupedKey.create(file.getProjectId(), DEV_ENVIRONMENT,
file.getName()), file);
+ files.put(GroupedKey.create(file.getProjectId(), DEV, file.getName()),
file);
if (commited) {
- filesCommited.put(GroupedKey.create(file.getProjectId(),
DEV_ENVIRONMENT, file.getName()), file);
+ filesCommited.put(GroupedKey.create(file.getProjectId(), DEV,
file.getName()), file);
}
}
@@ -143,7 +143,7 @@ public class KaravanCache {
}
public void deleteProjectFile(String projectId, String filename) {
- files.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT, filename));
+ files.remove(GroupedKey.create(projectId, DEV, filename));
}
public List<ProjectFile> getProjectFilesCommited(String projectId) {
@@ -156,15 +156,15 @@ public class KaravanCache {
}
public void deleteProjectFileCommited(String projectId, String filename) {
- filesCommited.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT,
filename));
+ filesCommited.remove(GroupedKey.create(projectId, DEV, filename));
}
public void deleteProject(String projectId) {
- projects.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT,
projectId));
+ projects.remove(GroupedKey.create(projectId, DEV, projectId));
}
public Project getProject(String projectId) {
- return projects.get(GroupedKey.create(projectId, DEV_ENVIRONMENT,
projectId));
+ return projects.get(GroupedKey.create(projectId, DEV, projectId));
}
public DeploymentStatus getDeploymentStatus(String projectId, String
environment) {
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
index 561a3e81..f3ffb86e 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
@@ -18,7 +18,7 @@ package org.apache.camel.karavan;
public class KaravanConstants {
- public static final String DEV_ENVIRONMENT = "dev";
+ public static final String DEV = "dev";
public static final String DEVMODE_IMAGE = "karavan.devmode.image";
public static final String DEVMODE_IMAGE_PULL_POLICY =
"karavan.devmode.withImagePullPolicy";
public static final String ENV_VAR_JBANG_OPTIONS = "JBANG_OPTIONS";
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
index 747a118f..7e38894b 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
@@ -42,7 +42,7 @@ import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV;
import static
org.apache.camel.karavan.KaravanEvents.NOTIFICATION_PROJECTS_STARTED;
@Default
@@ -52,7 +52,7 @@ public class KaravanStartupLoader implements HealthCheck {
private static final Logger LOGGER =
Logger.getLogger(KaravanStartupLoader.class.getName());
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
@@ -103,7 +103,7 @@ public class KaravanStartupLoader implements HealthCheck {
if (karavanCache.getProjects().isEmpty()) {
importAllProjects();
}
- if (Objects.equals(environment, DEV_ENVIRONMENT)) {
+ if (Objects.equals(environment, DEV)) {
addKameletsProject();
addTemplatesProject();
addConfigurationProject();
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index adf945a4..af7b6533 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -25,6 +25,7 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerComposeConverter;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
@@ -59,7 +60,7 @@ public class ContainerResource {
@Inject
ProjectService projectService;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
private static final Logger LOGGER =
Logger.getLogger(ContainerResource.class.getName());
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..0f894c4b 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
@@ -22,6 +22,7 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.model.PodContainerStatus;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.service.ProjectService;
@@ -36,7 +37,7 @@ public class DevModeResource {
private static final Logger LOGGER =
Logger.getLogger(DevModeResource.class.getName());
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
index f15dbaee..9b89294c 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
@@ -50,7 +50,7 @@ public class InfrastructureResource {
@Inject
KubernetesStatusService kubernetesStatusService;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
private static final Logger LOGGER =
Logger.getLogger(InfrastructureResource.class.getName());
@@ -85,7 +85,7 @@ public class InfrastructureResource {
@Produces(MediaType.APPLICATION_JSON)
@Path("/deployment/start/{env}/{projectId}")
public Response start(@PathParam("env") String env,
@PathParam("projectId") String projectId) throws Exception {
- var name = Objects.equals(environment,
KaravanConstants.DEV_ENVIRONMENT) ? KUBERNETES_YAML_FILENAME : environment +
"." + KUBERNETES_YAML_FILENAME;
+ var name = Objects.equals(environment, KaravanConstants.DEV) ?
KUBERNETES_YAML_FILENAME : environment + "." + KUBERNETES_YAML_FILENAME;
ProjectFile resources = karavanCache.getProjectFile(projectId, name);
if (resources == null) {
return Response.status(Response.Status.NOT_FOUND).entity("Resource
file " + KUBERNETES_YAML_FILENAME + " not found").build();
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java
index d7b6f0d3..166acae4 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java
@@ -30,6 +30,7 @@ import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.health.HealthCheck;
@@ -60,7 +61,7 @@ public class KubernetesStatusService implements HealthCheck {
return new KubernetesClientBuilder().build();
}
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
public String environment;
@ConfigProperty(name = "karavan.openshift")
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelReloadListener.java
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelReloadListener.java
index 279dfcb8..ebf16525 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelReloadListener.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelReloadListener.java
@@ -26,6 +26,7 @@ import io.vertx.mutiny.ext.web.client.WebClient;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.model.PodContainerStatus;
import org.apache.camel.karavan.service.CodeService;
@@ -54,7 +55,7 @@ public class CamelReloadListener {
@Inject
KubernetesService kubernetesService;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelStatusListener.java
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelStatusListener.java
index c22a27da..354ee6bd 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelStatusListener.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/CamelStatusListener.java
@@ -25,6 +25,7 @@ import io.vertx.mutiny.ext.web.client.WebClient;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.model.CamelStatus;
import org.apache.camel.karavan.model.CamelStatusRequest;
import org.apache.camel.karavan.model.CamelStatusValue;
@@ -48,7 +49,7 @@ public class CamelStatusListener {
@Inject
KaravanCache karavanCache;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/DockerStatusListener.java
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/DockerStatusListener.java
index ad9182cc..f4b1b669 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/DockerStatusListener.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/DockerStatusListener.java
@@ -26,6 +26,7 @@ import io.vertx.mutiny.core.eventbus.EventBus;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.docker.DockerUtils;
import org.apache.camel.karavan.model.PodContainerStatus;
@@ -42,7 +43,7 @@ import static org.apache.camel.karavan.KaravanEvents.*;
@ApplicationScoped
public class DockerStatusListener {
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/PodContainerCommandListener.java
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/PodContainerCommandListener.java
index a9183310..1c7873b9 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/listener/PodContainerCommandListener.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/listener/PodContainerCommandListener.java
@@ -23,6 +23,7 @@ import io.vertx.mutiny.core.eventbus.EventBus;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.model.PodContainerStatus;
@@ -35,7 +36,7 @@ import static
org.apache.camel.karavan.KaravanEvents.POD_CONTAINER_UPDATED;
@ApplicationScoped
public class PodContainerCommandListener {
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
index 962c757b..2f0b6ff6 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
@@ -41,7 +41,7 @@ public class CamelStatusScheduler {
@Inject
KaravanCache karavanCache;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/DockerStatusScheduler.java
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/DockerStatusScheduler.java
index 32c2857a..2de5ed0a 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/DockerStatusScheduler.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/DockerStatusScheduler.java
@@ -22,6 +22,7 @@ import io.vertx.core.json.JsonObject;
import io.vertx.mutiny.core.eventbus.EventBus;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.docker.DockerUtils;
import org.apache.camel.karavan.model.PodContainerStatus;
@@ -36,7 +37,7 @@ import static org.apache.camel.karavan.KaravanEvents.*;
@ApplicationScoped
public class DockerStatusScheduler {
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
index f4fd13f7..75539cf1 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
@@ -23,6 +23,7 @@ import io.vertx.core.buffer.Buffer;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerComposeConverter;
import org.apache.camel.karavan.model.*;
import org.apache.commons.text.StringSubstitutor;
@@ -68,7 +69,7 @@ public class CodeService {
private static final String BUILDER_COMPOSE_FILENAME =
"builder.docker-compose.yaml";
public static final String BUILD_SCRIPT_FILENAME = "build.sh";
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@ConfigProperty(name = "karavan.gav")
@@ -339,7 +340,7 @@ public class CodeService {
public String getDockerComposeFileForProject(String projectId) {
String composeFileName = PROJECT_COMPOSE_FILENAME;
- if (!Objects.equals(environment, DEV_ENVIRONMENT)) {
+ if (!Objects.equals(environment, DEV)) {
composeFileName = environment + "." + PROJECT_COMPOSE_FILENAME;
}
ProjectFile compose = karavanCache.getProjectFile(projectId,
composeFileName);
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 87212c68..165c0728 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
@@ -22,6 +22,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.model.Configuration;
import org.apache.camel.karavan.model.Project;
@@ -37,7 +38,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV;
import static
org.apache.camel.karavan.service.CodeService.BUILD_SCRIPT_FILENAME;
@ApplicationScoped
@@ -51,7 +52,7 @@ public class ConfigService {
@ConfigProperty(name = "karavan.version")
String version;
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@ConfigProperty(name = "karavan.environments")
@@ -108,7 +109,7 @@ public class ConfigService {
}
public void shareOnStartup() {
- if (ConfigService.inKubernetes() &&
environment.equals(DEV_ENVIRONMENT)) {
+ if (ConfigService.inKubernetes() && environment.equals(DEV)) {
LOGGER.info("Creating Configmap for " + BUILD_SCRIPT_FILENAME);
try {
share(BUILD_SCRIPT_FILENAME);
@@ -136,7 +137,7 @@ public class ConfigService {
var filename = f.getName();
var parts = filename.split("\\.");
var prefix = parts[0];
- if (environment.equals(DEV_ENVIRONMENT) &&
!getEnvs().contains(prefix)) { // no prefix AND dev env
+ if (environment.equals(DEV) && !getEnvs().contains(prefix)) { // no
prefix AND dev env
storeFile(f.getName(), f.getCode());
} else if (Objects.equals(prefix, environment)) { // with prefix == env
filename = f.getName().substring(environment.length() + 1);
@@ -157,7 +158,7 @@ public class ConfigService {
}
private List<String> getEnvs() {
- return environments.orElse(List.of(DEV_ENVIRONMENT));
+ return environments.orElse(List.of(DEV));
}
private void createConfigMapFromFile(String filename, String content) {
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index e2954b68..f1ab9a25 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -23,6 +23,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import org.apache.camel.karavan.KaravanCache;
+import org.apache.camel.karavan.KaravanConstants;
import org.apache.camel.karavan.docker.DockerComposeConverter;
import org.apache.camel.karavan.docker.DockerForKaravan;
import org.apache.camel.karavan.kubernetes.KubernetesService;
@@ -47,7 +48,7 @@ public class ProjectService {
private static final Logger LOGGER =
Logger.getLogger(ProjectService.class.getName());
- @ConfigProperty(name = "karavan.environment")
+ @ConfigProperty(name = "karavan.environment", defaultValue =
KaravanConstants.DEV)
String environment;
@Inject
@@ -69,7 +70,7 @@ public class ProjectService {
EventBus eventBus;
public Project commitAndPushProject(String projectId, String message)
throws Exception {
- if (Objects.equals(environment, DEV_ENVIRONMENT)) {
+ if (Objects.equals(environment, DEV)) {
LOGGER.info("Commit project: " + projectId);
Project p = karavanCache.getProject(projectId);
List<ProjectFile> files = karavanCache.getProjectFiles(projectId);
@@ -259,7 +260,7 @@ public class ProjectService {
!Objects.equals(e.getValue().getName(),
PROJECT_DEPLOYMENT_JKUBE_FILENAME)
)
.collect(Collectors.toMap(
- e -> GroupedKey.create(project.getProjectId(),
DEV_ENVIRONMENT, e.getValue().getName()),
+ e -> GroupedKey.create(project.getProjectId(),
DEV, e.getValue().getName()),
e -> {
ProjectFile file = e.getValue();
file.setProjectId(project.getProjectId());
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 7fc21984..b9ca4435 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -16,7 +16,6 @@
#
karavan.title=Apache Camel Karavan
karavan.version=4.7.1
-karavan.environment=dev
karavan.camel.status.interval=2s
karavan.container.status.interval=2s
diff --git a/karavan-app/src/main/webui/package-lock.json
b/karavan-app/src/main/webui/package-lock.json
index 7f528263..0f3834a0 100644
--- a/karavan-app/src/main/webui/package-lock.json
+++ b/karavan-app/src/main/webui/package-lock.json
@@ -50,7 +50,7 @@
}
},
"../../../../karavan-core": {
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.9",
diff --git a/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
b/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
index b5a779dc..8c96ff4e 100644
--- a/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
+++ b/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
@@ -271,7 +271,14 @@ export function DslConnections() {
{CamelUi.getConnectionIcon(pos.step)}
{name !== undefined &&
<Tooltip content={`Go to ${uri}:${name}`}
position={"left"}>
- <Button style={{position: 'absolute', right:
27, top: -12, whiteSpace: 'nowrap', zIndex: 300, padding: 0}}
+ <Button style={{
+ position: 'absolute',
+ right: 27,
+ top: -12,
+ whiteSpace: 'nowrap',
+ zIndex: 300,
+ padding: 0
+ }}
variant={'link'}
aria-label="Goto"
onClick={_ =>
InfrastructureAPI.onInternalConsumerClick(uri, name, undefined)}>
