You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/10/17 15:39:46 UTC
[camel-karavan] branch main updated: Git service log
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 b704f83 Git service log
b704f83 is described below
commit b704f8379d7a9f4ca684626d307883964eb8ba26
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Mon Oct 17 11:39:35 2022 -0400
Git service log
---
.../main/java/org/apache/camel/karavan/model/GitConfig.java | 10 ++++++++++
.../main/java/org/apache/camel/karavan/service/GitService.java | 3 +++
2 files changed, 13 insertions(+)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java b/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
index 580c645..343bc3c 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
@@ -44,4 +44,14 @@ public class GitConfig {
public void setBranch(String branch) {
this.branch = branch;
}
+
+ @Override
+ public String toString() {
+ return "GitConfig{" +
+ "uri='" + uri + '\'' +
+ ", username='" + username + '\'' +
+ ", password='" + password + '\'' +
+ ", branch='" + branch + '\'' +
+ '}';
+ }
}
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index 94321c0..20f3dec 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -76,6 +76,7 @@ public class GitService {
String propertiesPrefix = "karavan." + name + "-";
String branch = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-branch", String.class);
if (kubernetesService.inKubernetes()){
+ LOGGER.info("inKubernetes " + kubernetesService.currentNamespace);
String kubernetesPrefix = name + "-";
Secret secret = kubernetesService.getKaravanSecret();
String uri = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-repository").getBytes(StandardCharsets.UTF_8)));
@@ -118,6 +119,7 @@ public class GitService {
public List<Tuple2<String, String>> readKameletsFromRepository() {
LOGGER.info("Read kamelets from repository");
GitConfig gitConfig = getGitConfig(KAMELETS);
+ LOGGER.info("gitConfig " + gitConfig);
CredentialsProvider cred = new UsernamePasswordCredentialsProvider(gitConfig.getUsername(), gitConfig.getPassword());
String uuid = UUID.randomUUID().toString();
String folder = vertx.fileSystem().createTempDirectoryBlocking(uuid);
@@ -138,6 +140,7 @@ public class GitService {
public List<Tuple2<String, Map<String, String>>> readProjectsFromRepository() {
LOGGER.info("Read projects from repository");
GitConfig gitConfig = getGitConfig(PROJECTS);
+ LOGGER.info("gitConfig " + gitConfig);
CredentialsProvider cred = new UsernamePasswordCredentialsProvider(gitConfig.getUsername(), gitConfig.getPassword());
String uuid = UUID.randomUUID().toString();
String folder = vertx.fileSystem().createTempDirectoryBlocking(uuid);