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

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


The following commit(s) were added to refs/heads/main by this push:
     new 33c46a27c Fix #2959: mark 13 credential properties format: password 
and stop duplicating the Databricks token into the JDBC URL (#2963)
33c46a27c is described below

commit 33c46a27c914d0046eeb183cb4794ed68419c1aa
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Aug 24 18:39:29 2026 +0200

    Fix #2959: mark 13 credential properties format: password and stop 
duplicating the Databricks token into the JDBC URL (#2963)
    
    Thirteen credential declarations (8 google serviceAccountKey, 5 jira
    personal-token) carried x-descriptors: urn:camel:group:credentials but not
    format: password, so tooling keying off format did not mask them. Sibling
    password properties in the same files were already marked.
    
    The databricks Kamelets carried accessToken twice: once in the
    BasicDataSource password property and again inside the url string. Move
    UID=token to a username property and drop the credentials from the URL.
    
    Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
---
 kamelets/databricks-sink.kamelet.yaml                   | 3 ++-
 kamelets/databricks-source.kamelet.yaml                 | 3 ++-
 kamelets/google-bigquery-sink.kamelet.yaml              | 1 +
 kamelets/google-functions-sink.kamelet.yaml             | 1 +
 kamelets/google-pubsub-sink.kamelet.yaml                | 1 +
 kamelets/google-pubsub-source.kamelet.yaml              | 1 +
 kamelets/google-storage-event-based-source.kamelet.yaml | 1 +
 kamelets/google-storage-sink.kamelet.yaml               | 1 +
 kamelets/google-storage-source.kamelet.yaml             | 1 +
 kamelets/google-vertexai-sink.kamelet.yaml              | 1 +
 kamelets/jira-add-comment-sink.kamelet.yaml             | 1 +
 kamelets/jira-add-issue-sink.kamelet.yaml               | 1 +
 kamelets/jira-source.kamelet.yaml                       | 1 +
 kamelets/jira-transition-issue-sink.kamelet.yaml        | 1 +
 kamelets/jira-update-issue-sink.kamelet.yaml            | 1 +
 15 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/kamelets/databricks-sink.kamelet.yaml 
b/kamelets/databricks-sink.kamelet.yaml
index d88ea4276..a153a22ae 100644
--- a/kamelets/databricks-sink.kamelet.yaml
+++ b/kamelets/databricks-sink.kamelet.yaml
@@ -88,8 +88,9 @@ spec:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
+          username: 'token'
           password: '{{accessToken}}'
-          url: 
'jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1;UID=token;PWD={{accessToken}}{{extraOptions}}'
+          url: 
'jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1{{extraOptions}}'
           driverClassName: 'com.databricks.client.jdbc.Driver'
     from:
       uri: "kamelet:source"
diff --git a/kamelets/databricks-source.kamelet.yaml 
b/kamelets/databricks-source.kamelet.yaml
index 3797d121e..d9ee20a6a 100644
--- a/kamelets/databricks-source.kamelet.yaml
+++ b/kamelets/databricks-source.kamelet.yaml
@@ -98,8 +98,9 @@ spec:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
+          username: 'token'
           password: '{{accessToken}}'
-          url: 
'jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1;UID=token;PWD={{accessToken}}{{extraOptions}}'
+          url: 
'jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1{{extraOptions}}'
           driverClassName: 'com.databricks.client.jdbc.Driver'
     from:
       uri: "{{local-sql-databricks-source}}:{{query}}"
diff --git a/kamelets/google-bigquery-sink.kamelet.yaml 
b/kamelets/google-bigquery-sink.kamelet.yaml
index d3b081173..cb241f425 100644
--- a/kamelets/google-bigquery-sink.kamelet.yaml
+++ b/kamelets/google-bigquery-sink.kamelet.yaml
@@ -54,6 +54,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for the 
BigQuery Service. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   types:
diff --git a/kamelets/google-functions-sink.kamelet.yaml 
b/kamelets/google-functions-sink.kamelet.yaml
index e0d09852c..7c8e50842 100644
--- a/kamelets/google-functions-sink.kamelet.yaml
+++ b/kamelets/google-functions-sink.kamelet.yaml
@@ -54,6 +54,7 @@ spec:
         title: Service Account Key
         description: The path to the service account key file that provides 
credentials for the Google Cloud Functions platform. You must encode this value 
in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   dependencies:
diff --git a/kamelets/google-pubsub-sink.kamelet.yaml 
b/kamelets/google-pubsub-sink.kamelet.yaml
index b334b6be3..aa6e29f43 100644
--- a/kamelets/google-pubsub-sink.kamelet.yaml
+++ b/kamelets/google-pubsub-sink.kamelet.yaml
@@ -48,6 +48,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for the 
Pub/Sub publisher/subscriber. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   dependencies:
diff --git a/kamelets/google-pubsub-source.kamelet.yaml 
b/kamelets/google-pubsub-source.kamelet.yaml
index 8c66a2aa3..f29ae4d24 100644
--- a/kamelets/google-pubsub-source.kamelet.yaml
+++ b/kamelets/google-pubsub-source.kamelet.yaml
@@ -48,6 +48,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for the 
Pub/Sub publisher/subscriber. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       synchronousPull:
diff --git a/kamelets/google-storage-event-based-source.kamelet.yaml 
b/kamelets/google-storage-event-based-source.kamelet.yaml
index 6b04c4912..f7d0b0cd4 100644
--- a/kamelets/google-storage-event-based-source.kamelet.yaml
+++ b/kamelets/google-storage-event-based-source.kamelet.yaml
@@ -50,6 +50,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for the 
Pub/Sub publisher/subscriber. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       synchronousPull:
diff --git a/kamelets/google-storage-sink.kamelet.yaml 
b/kamelets/google-storage-sink.kamelet.yaml
index f662db346..259268cde 100644
--- a/kamelets/google-storage-sink.kamelet.yaml
+++ b/kamelets/google-storage-sink.kamelet.yaml
@@ -43,6 +43,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for Google 
Cloud Storage access. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       autoCreateBucket:
diff --git a/kamelets/google-storage-source.kamelet.yaml 
b/kamelets/google-storage-source.kamelet.yaml
index 5c1cdf4c0..1eadca172 100644
--- a/kamelets/google-storage-source.kamelet.yaml
+++ b/kamelets/google-storage-source.kamelet.yaml
@@ -43,6 +43,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for Google 
Cloud Storage access. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       deleteAfterRead:
diff --git a/kamelets/google-vertexai-sink.kamelet.yaml 
b/kamelets/google-vertexai-sink.kamelet.yaml
index 0ac599934..9673d89e5 100644
--- a/kamelets/google-vertexai-sink.kamelet.yaml
+++ b/kamelets/google-vertexai-sink.kamelet.yaml
@@ -53,6 +53,7 @@ spec:
         title: Service Account Key
         description: The service account key to use as credentials for the 
Vertex AI client. You must encode this value in base64.
         type: binary
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       operation:
diff --git a/kamelets/jira-add-comment-sink.kamelet.yaml 
b/kamelets/jira-add-comment-sink.kamelet.yaml
index 0be9a8d2a..187d3db70 100644
--- a/kamelets/jira-add-comment-sink.kamelet.yaml
+++ b/kamelets/jira-add-comment-sink.kamelet.yaml
@@ -58,6 +58,7 @@ spec:
         title: Personal Token
         description: Personal Token
         type: string
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   types:
diff --git a/kamelets/jira-add-issue-sink.kamelet.yaml 
b/kamelets/jira-add-issue-sink.kamelet.yaml
index 2e279f072..f1a9678d1 100644
--- a/kamelets/jira-add-issue-sink.kamelet.yaml
+++ b/kamelets/jira-add-issue-sink.kamelet.yaml
@@ -58,6 +58,7 @@ spec:
         title: Personal Token
         description: Personal Token
         type: string
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   types:
diff --git a/kamelets/jira-source.kamelet.yaml 
b/kamelets/jira-source.kamelet.yaml
index 0622a34a1..bea128f6e 100644
--- a/kamelets/jira-source.kamelet.yaml
+++ b/kamelets/jira-source.kamelet.yaml
@@ -58,6 +58,7 @@ spec:
         title: Personal Token
         description: Personal Token
         type: string
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
       jql:
diff --git a/kamelets/jira-transition-issue-sink.kamelet.yaml 
b/kamelets/jira-transition-issue-sink.kamelet.yaml
index bf955a4da..3cff8418b 100644
--- a/kamelets/jira-transition-issue-sink.kamelet.yaml
+++ b/kamelets/jira-transition-issue-sink.kamelet.yaml
@@ -58,6 +58,7 @@ spec:
         title: Personal Token
         description: Personal Token
         type: string
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   types:
diff --git a/kamelets/jira-update-issue-sink.kamelet.yaml 
b/kamelets/jira-update-issue-sink.kamelet.yaml
index ce7dcf146..98d147b7e 100644
--- a/kamelets/jira-update-issue-sink.kamelet.yaml
+++ b/kamelets/jira-update-issue-sink.kamelet.yaml
@@ -58,6 +58,7 @@ spec:
         title: Personal Token
         description: Personal Token
         type: string
+        format: password
         x-descriptors:
         - urn:camel:group:credentials
   types:

Reply via email to