This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 1a07e473a75a10c626f0202dcd8868e9440627a6 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jun 22 20:50:55 2026 +0200 Fix #2868: Restore optional parameters removed as workaround for CAMEL-23814 Now that the Camel core bug (RAW() wrapping preventing optional placeholder stripping) is fixed, restore the optional {{?xxx}} parameters that were previously removed from kafka-sink and jira sink kamelets. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- kamelets/jira-add-comment-sink.kamelet.yaml | 1 + kamelets/jira-add-issue-sink.kamelet.yaml | 1 + kamelets/jira-transition-issue-sink.kamelet.yaml | 1 + kamelets/jira-update-issue-sink.kamelet.yaml | 1 + kamelets/kafka-sink.kamelet.yaml | 12 ++++++++++++ .../resources/kamelets/jira-add-comment-sink.kamelet.yaml | 1 + .../main/resources/kamelets/jira-add-issue-sink.kamelet.yaml | 1 + .../kamelets/jira-transition-issue-sink.kamelet.yaml | 1 + .../resources/kamelets/jira-update-issue-sink.kamelet.yaml | 1 + .../src/main/resources/kamelets/kafka-sink.kamelet.yaml | 12 ++++++++++++ 10 files changed, 32 insertions(+) diff --git a/kamelets/jira-add-comment-sink.kamelet.yaml b/kamelets/jira-add-comment-sink.kamelet.yaml index 2bfbce71e..6ed928a10 100644 --- a/kamelets/jira-add-comment-sink.kamelet.yaml +++ b/kamelets/jira-add-comment-sink.kamelet.yaml @@ -86,3 +86,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/kamelets/jira-add-issue-sink.kamelet.yaml b/kamelets/jira-add-issue-sink.kamelet.yaml index 5852c3f83..357ffe83f 100644 --- a/kamelets/jira-add-issue-sink.kamelet.yaml +++ b/kamelets/jira-add-issue-sink.kamelet.yaml @@ -128,3 +128,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/kamelets/jira-transition-issue-sink.kamelet.yaml b/kamelets/jira-transition-issue-sink.kamelet.yaml index 19bcfb275..2f7b0ec11 100644 --- a/kamelets/jira-transition-issue-sink.kamelet.yaml +++ b/kamelets/jira-transition-issue-sink.kamelet.yaml @@ -93,3 +93,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/kamelets/jira-update-issue-sink.kamelet.yaml b/kamelets/jira-update-issue-sink.kamelet.yaml index 7153df43b..d76ac78eb 100644 --- a/kamelets/jira-update-issue-sink.kamelet.yaml +++ b/kamelets/jira-update-issue-sink.kamelet.yaml @@ -128,3 +128,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/kamelets/kafka-sink.kamelet.yaml b/kamelets/kafka-sink.kamelet.yaml index 4a3124413..2371c5bf8 100644 --- a/kamelets/kafka-sink.kamelet.yaml +++ b/kamelets/kafka-sink.kamelet.yaml @@ -147,3 +147,15 @@ spec: uri: "kafka:{{topic}}" parameters: brokers: "{{bootstrapServers}}" + saslAuthType: "{{saslAuthType}}" + saslUsername: "{{?saslUsername}}" + saslPassword: "{{?saslPassword}}" + oauthClientId: "{{?oauthClientId}}" + oauthClientSecret: "{{?oauthClientSecret}}" + oauthTokenEndpointUri: "{{?oauthTokenEndpointUri}}" + oauthScope: "{{?oauthScope}}" + sslTruststoreLocation: "{{?sslTruststoreLocation}}" + sslTruststorePassword: "{{?sslTruststorePassword}}" + sslKeystoreLocation: "{{?sslKeystoreLocation}}" + sslKeystorePassword: "{{?sslKeystorePassword}}" + sslKeyPassword: "{{?sslKeyPassword}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/jira-add-comment-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jira-add-comment-sink.kamelet.yaml index 2bfbce71e..6ed928a10 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jira-add-comment-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jira-add-comment-sink.kamelet.yaml @@ -86,3 +86,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml index 5852c3f83..357ffe83f 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml @@ -128,3 +128,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/jira-transition-issue-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jira-transition-issue-sink.kamelet.yaml index 19bcfb275..2f7b0ec11 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jira-transition-issue-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jira-transition-issue-sink.kamelet.yaml @@ -93,3 +93,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml index 7153df43b..d76ac78eb 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml @@ -128,3 +128,4 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" + accessToken: "{{?personal-token}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml index 4a3124413..2371c5bf8 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml @@ -147,3 +147,15 @@ spec: uri: "kafka:{{topic}}" parameters: brokers: "{{bootstrapServers}}" + saslAuthType: "{{saslAuthType}}" + saslUsername: "{{?saslUsername}}" + saslPassword: "{{?saslPassword}}" + oauthClientId: "{{?oauthClientId}}" + oauthClientSecret: "{{?oauthClientSecret}}" + oauthTokenEndpointUri: "{{?oauthTokenEndpointUri}}" + oauthScope: "{{?oauthScope}}" + sslTruststoreLocation: "{{?sslTruststoreLocation}}" + sslTruststorePassword: "{{?sslTruststorePassword}}" + sslKeystoreLocation: "{{?sslKeystoreLocation}}" + sslKeystorePassword: "{{?sslKeystorePassword}}" + sslKeyPassword: "{{?sslKeyPassword}}"
