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 2023/07/26 20:36:04 UTC

[camel-karavan] branch main updated: Build git url along the lines of `https://user:password@gitserver.com` (#831)

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 e106d5eb Build git url along the lines of `https://user:password@gitserver.com` (#831)
e106d5eb is described below

commit e106d5eb510da2081cfb30ad95b47ba74b1f1982
Author: thomas-gantenbein-tga <32...@users.noreply.github.com>
AuthorDate: Wed Jul 26 22:35:56 2023 +0200

    Build git url along the lines of `https://user:password@gitserver.com` (#831)
    
    Used to be `https://password@gitserver.com` before.
    
    Co-authored-by: Thomas Gantenbein <no...@none.ch>
---
 docs/AWS/karavan-quarkus-task-aws.yaml                                  | 2 +-
 docs/AWS/karavan-spring-boot-task-aws.yaml                              | 2 +-
 .../src/main/resources/pipelines/karavan-task-dev-quarkus.yaml          | 2 +-
 .../src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml      | 2 +-
 .../karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh | 2 +-
 .../karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh  | 2 +-
 .../src/main/resources/spring-boot-builder-script-kubernetes.sh         | 2 +-
 .../src/main/resources/spring-boot-builder-script-openshift.sh          | 2 +-
 .../src/main/resources/quarkus-builder-script-kubernetes.sh             | 2 +-
 .../src/main/resources/quarkus-builder-script-openshift.sh              | 2 +-
 .../src/main/resources/spring-boot-builder-script-kubernetes.sh         | 2 +-
 .../src/main/resources/spring-boot-builder-script-openshift.sh          | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/AWS/karavan-quarkus-task-aws.yaml b/docs/AWS/karavan-quarkus-task-aws.yaml
index 3b756680..d71a991a 100644
--- a/docs/AWS/karavan-quarkus-task-aws.yaml
+++ b/docs/AWS/karavan-quarkus-task-aws.yaml
@@ -69,7 +69,7 @@ spec:
         
         if  [[ $GIT_REPOSITORY == https* ]] ;
         then
-            replacer=https://$GIT_PASSWORD@
+            replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
             prefix=https://
             url="${GIT_REPOSITORY/$prefix/$replacer}"
             git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/docs/AWS/karavan-spring-boot-task-aws.yaml b/docs/AWS/karavan-spring-boot-task-aws.yaml
index fd7db832..38c50446 100644
--- a/docs/AWS/karavan-spring-boot-task-aws.yaml
+++ b/docs/AWS/karavan-spring-boot-task-aws.yaml
@@ -69,7 +69,7 @@ spec:
 
           if  [[ $GIT_REPOSITORY == https* ]] ;
           then
-              replacer=https://$GIT_PASSWORD@
+              replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
               prefix=https://
               url="${GIT_REPOSITORY/$prefix/$replacer}"
               git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml b/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
index 19940ac7..e8a5936c 100644
--- a/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
+++ b/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
@@ -44,7 +44,7 @@ spec:
 
         if  [[ $GIT_REPOSITORY == https* ]] ;
         then
-            replacer=https://$GIT_PASSWORD@
+            replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
             prefix=https://
             url="${GIT_REPOSITORY/$prefix/$replacer}"
             git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml b/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
index cf57e23e..bf19af82 100644
--- a/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
+++ b/karavan-web/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
@@ -44,7 +44,7 @@ spec:
 
         if  [[ $GIT_REPOSITORY == https* ]] ;
         then
-            replacer=https://$GIT_PASSWORD@
+            replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
             prefix=https://
             url="${GIT_REPOSITORY/$prefix/$replacer}"
             git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
index 02620cb3..bcbd3630 100644
--- a/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
index 3955735c..8cfc517c 100644
--- a/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-web/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh b/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
index 029ca26c..2e175498 100644
--- a/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++ b/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh b/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
index 2e904a6c..8b81f918 100644
--- a/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
+++ b/karavan-web/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index 8df65507..074c3b99 100644
--- a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index d3c3b559..9d437abb 100644
--- a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
index 6d52f005..387922bf 100644
--- a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++ b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
diff --git a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
index f08a43ee..57fc3080 100644
--- a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
+++ b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -4,7 +4,7 @@ KAMELETS_DIR="/scripts/kamelets"
 
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
-    replacer=https://$GIT_PASSWORD@
+    replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
     prefix=https://
     url="${GIT_REPOSITORY/$prefix/$replacer}"
     git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}