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 e99c81d30e68ca4a293a7c6d4f63edf590ef97b5 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jun 22 17:02:38 2026 +0200 Fix #2868: Align kamelet headers to CamelXXX style and remove broken optional accessToken Update old-style setHeader names to the new CamelXXX convention across Jira, DNS, Elasticsearch, OpenSearch, and Salesforce kamelets. Remove accessToken optional parameter from Jira sink kamelets that silently prevented endpoint creation (#2869). Remove deprecated username property from Slack sink kamelet. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- kamelets/dns-dig-action.kamelet.yaml | 12 ++++++------ kamelets/dns-ip-action.kamelet.yaml | 6 +++--- kamelets/dns-lookup-action.kamelet.yaml | 6 +++--- kamelets/elasticsearch-index-sink.kamelet.yaml | 8 ++++---- kamelets/jira-add-comment-sink.kamelet.yaml | 3 +-- kamelets/jira-add-issue-sink.kamelet.yaml | 15 +++++++-------- kamelets/jira-transition-issue-sink.kamelet.yaml | 5 ++--- kamelets/jira-update-issue-sink.kamelet.yaml | 15 +++++++-------- kamelets/opensearch-index-sink.kamelet.yaml | 8 ++++---- kamelets/salesforce-delete-sink.kamelet.yaml | 8 ++++---- kamelets/salesforce-update-sink.kamelet.yaml | 4 ++-- kamelets/slack-sink.kamelet.yaml | 5 ----- .../resources/kamelets/jira-add-comment-sink.kamelet.yaml | 3 +-- .../resources/kamelets/jira-add-issue-sink.kamelet.yaml | 15 +++++++-------- .../src/main/resources/kamelets/slack-sink.kamelet.yaml | 5 ----- .../test/resources/jira/jira-add-comment-sink-pipe.yaml | 2 +- .../src/test/resources/jira/jira-add-issue-sink-pipe.yaml | 8 ++++---- .../test/resources/slack/slack-sink-pipe.citrus.it.yaml | 2 +- 18 files changed, 57 insertions(+), 73 deletions(-) diff --git a/kamelets/dns-dig-action.kamelet.yaml b/kamelets/dns-dig-action.kamelet.yaml index e8d179316..7686863c0 100644 --- a/kamelets/dns-dig-action.kamelet.yaml +++ b/kamelets/dns-dig-action.kamelet.yaml @@ -45,34 +45,34 @@ spec: - simple: "${header[domain-name]}" steps: - setHeader: - name: dns.name + name: CamelDnsName simple: "${header[domain-name]}" - simple: "${header[ce-domainname]}" steps: - setHeader: - name: dns.name + name: CamelDnsName simple: "${header[ce-domainname]}" otherwise: steps: - setHeader: - name: dns.name + name: CamelDnsName simple: "${body}" - choice: when: - simple: "${header[dns-type]}" steps: - setHeader: - name: dns.type + name: CamelDnsType simple: "${header[dns-type]}" - simple: "${header[ce-dnstype]}" steps: - setHeader: - name: dns.type + name: CamelDnsType simple: "${header[ce-dnstype]}" otherwise: steps: - setHeader: - name: dns.type + name: CamelDnsType constant: "A" - to: uri: "dns:dig" diff --git a/kamelets/dns-ip-action.kamelet.yaml b/kamelets/dns-ip-action.kamelet.yaml index e29ea5b9d..db1651c0a 100644 --- a/kamelets/dns-ip-action.kamelet.yaml +++ b/kamelets/dns-ip-action.kamelet.yaml @@ -45,17 +45,17 @@ spec: - simple: "${header[domain]}" steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${header[domain]}" - simple: "${header[ce-domain]}" steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${header[ce-domain]}" otherwise: steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${body}" - to: uri: "dns:ip" diff --git a/kamelets/dns-lookup-action.kamelet.yaml b/kamelets/dns-lookup-action.kamelet.yaml index 819664fb6..44d9fb49a 100644 --- a/kamelets/dns-lookup-action.kamelet.yaml +++ b/kamelets/dns-lookup-action.kamelet.yaml @@ -49,17 +49,17 @@ spec: - simple: "${header[domain-name]}" steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${header[domain-name]}" - simple: "${header[ce-domainname]}" steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${header[ce-domainname]}" otherwise: steps: - setHeader: - name: dns.domain + name: CamelDnsDomain simple: "${body}" - to: uri: "dns:lookup" diff --git a/kamelets/elasticsearch-index-sink.kamelet.yaml b/kamelets/elasticsearch-index-sink.kamelet.yaml index 6e96e80be..578db44d5 100644 --- a/kamelets/elasticsearch-index-sink.kamelet.yaml +++ b/kamelets/elasticsearch-index-sink.kamelet.yaml @@ -100,24 +100,24 @@ spec: - simple: "${header[indexId]}" steps: - setHeader: - name: "indexId" + name: "CamelElasticsearchIndexId" simple: "${header[indexId]}" - simple: "${header[ce-indexid]}" steps: - setHeader: - name: "indexId" + name: "CamelElasticsearchIndexId" simple: "${header[ce-indexid]}" - choice: when: - simple: "${header[indexName]}" steps: - setHeader: - name: "indexName" + name: "CamelElasticsearchIndexName" simple: "${header[indexName]}" - simple: "${header[ce-indexname]}" steps: - setHeader: - name: "indexName" + name: "CamelElasticsearchIndexName" simple: "${header[ce-indexname]}" - unmarshal: json: {} diff --git a/kamelets/jira-add-comment-sink.kamelet.yaml b/kamelets/jira-add-comment-sink.kamelet.yaml index e4a4ac874..2bfbce71e 100644 --- a/kamelets/jira-add-comment-sink.kamelet.yaml +++ b/kamelets/jira-add-comment-sink.kamelet.yaml @@ -78,7 +78,7 @@ spec: - simple: "${header[ce-issueKey]}" steps: - setHeader: - name: issueKey + name: CamelJiraIssueKey simple: "${header[ce-issueKey]}" - to: uri: "jira:AddComment" @@ -86,4 +86,3 @@ 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 8101a4c99..5852c3f83 100644 --- a/kamelets/jira-add-issue-sink.kamelet.yaml +++ b/kamelets/jira-add-issue-sink.kamelet.yaml @@ -78,49 +78,49 @@ spec: - simple: "${header[ce-projectKey]}" steps: - setHeader: - name: projectKey + name: CamelJiraIssueProjectKey simple: "${header[ce-projectKey]}" - choice: when: - simple: "${header[ce-issueTypeName]}" steps: - setHeader: - name: issueTypeName + name: CamelJiraIssueTypeName simple: "${header[ce-issueTypeName]}" - choice: when: - simple: "${header[ce-issueSummary]}" steps: - setHeader: - name: issueSummary + name: CamelJiraIssueSummary simple: "${header[ce-issueSummary]}" - choice: when: - simple: "${header[ce-issueAssignee]}" steps: - setHeader: - name: issueAssignee + name: CamelJiraIssueAssignee simple: "${header[ce-issueAssignee]}" - choice: when: - simple: "${header[ce-issuePriorityName]}" steps: - setHeader: - name: issuePriorityName + name: CamelJiraIssuePriorityName simple: "${header[ce-issuePriorityName]}" - choice: when: - simple: "${header[ce-issueComponents]}" steps: - setHeader: - name: issueComponents + name: CamelJiraIssueComponents simple: "${header[ce-issueComponents]}" - choice: when: - simple: "${header[ce-issueDescription]}" steps: - setHeader: - name: issueDescription + name: CamelJiraIssueDescription simple: "${header[ce-issueDescription]}" - to: uri: "jira:AddIssue" @@ -128,4 +128,3 @@ 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 63f68dcdc..19bcfb275 100644 --- a/kamelets/jira-transition-issue-sink.kamelet.yaml +++ b/kamelets/jira-transition-issue-sink.kamelet.yaml @@ -78,14 +78,14 @@ spec: - simple: "${header[ce-issueKey]}" steps: - setHeader: - name: issueKey + name: CamelJiraIssueKey simple: "${header[ce-issueKey]}" - choice: when: - simple: "${header[ce-issueTransitionId]}" steps: - setHeader: - name: issueTransitionId + name: CamelJiraIssueTransitionId simple: "${header[ce-issueTransitionId]}" - to: uri: "jira:transitionIssue" @@ -93,4 +93,3 @@ 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 4db6dfc1d..7153df43b 100644 --- a/kamelets/jira-update-issue-sink.kamelet.yaml +++ b/kamelets/jira-update-issue-sink.kamelet.yaml @@ -78,49 +78,49 @@ spec: - simple: "${header[ce-issueKey]}" steps: - setHeader: - name: issueKey + name: CamelJiraIssueKey simple: "${header[ce-issueKey]}" - choice: when: - simple: "${header[ce-issueTypeName]}" steps: - setHeader: - name: issueTypeName + name: CamelJiraIssueTypeName simple: "${header[ce-issueTypeName]}" - choice: when: - simple: "${header[ce-issueSummary]}" steps: - setHeader: - name: issueSummary + name: CamelJiraIssueSummary simple: "${header[ce-issueSummary]}" - choice: when: - simple: "${header[ce-issueAssignee]}" steps: - setHeader: - name: issueAssignee + name: CamelJiraIssueAssignee simple: "${header[ce-issueAssignee]}" - choice: when: - simple: "${header[ce-issuePriorityName]}" steps: - setHeader: - name: issuePriorityName + name: CamelJiraIssuePriorityName simple: "${header[ce-issuePriorityName]}" - choice: when: - simple: "${header[ce-issueComponents]}" steps: - setHeader: - name: issueComponents + name: CamelJiraIssueComponents simple: "${header[ce-issueComponents]}" - choice: when: - simple: "${header[ce-issueDescription]}" steps: - setHeader: - name: issueDescription + name: CamelJiraIssueDescription simple: "${header[ce-issueDescription]}" - to: uri: "jira:UpdateIssue" @@ -128,4 +128,3 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" - accessToken: "{{?personal-token}}" diff --git a/kamelets/opensearch-index-sink.kamelet.yaml b/kamelets/opensearch-index-sink.kamelet.yaml index 0faa7df44..f44943994 100644 --- a/kamelets/opensearch-index-sink.kamelet.yaml +++ b/kamelets/opensearch-index-sink.kamelet.yaml @@ -100,24 +100,24 @@ spec: - simple: "${header[indexId]}" steps: - setHeader: - name: "indexId" + name: "CamelOpensearchIndexId" simple: "${header[indexId]}" - simple: "${header[ce-indexid]}" steps: - setHeader: - name: "indexId" + name: "CamelOpensearchIndexId" simple: "${header[ce-indexid]}" - choice: when: - simple: "${header[indexName]}" steps: - setHeader: - name: "indexName" + name: "CamelOpensearchIndexName" simple: "${header[indexName]}" - simple: "${header[ce-indexname]}" steps: - setHeader: - name: "indexName" + name: "CamelOpensearchIndexName" simple: "${header[ce-indexname]}" - unmarshal: json: {} diff --git a/kamelets/salesforce-delete-sink.kamelet.yaml b/kamelets/salesforce-delete-sink.kamelet.yaml index 96b3cab51..039906015 100644 --- a/kamelets/salesforce-delete-sink.kamelet.yaml +++ b/kamelets/salesforce-delete-sink.kamelet.yaml @@ -99,16 +99,16 @@ spec: uri: kamelet:source steps: - setHeader: - name: sObjectId + name: CamelSalesforceId jsonpath: "$['sObjectId']" - setHeader: - name: sObjectName + name: CamelSalesforceSObjectName jsonpath: "$['sObjectName']" - setBody: simple: "${null}" - to: uri: "{{local-delete-salesforce}}:deleteSObject" - removeHeader: - name: sObjectId + name: CamelSalesforceId - removeHeader: - name: sObjectName + name: CamelSalesforceSObjectName diff --git a/kamelets/salesforce-update-sink.kamelet.yaml b/kamelets/salesforce-update-sink.kamelet.yaml index 62c53aa8b..498a10721 100644 --- a/kamelets/salesforce-update-sink.kamelet.yaml +++ b/kamelets/salesforce-update-sink.kamelet.yaml @@ -93,10 +93,10 @@ spec: uri: kamelet:source steps: - setHeader: - name: sObjectId + name: CamelSalesforceId jsonpath: "$.sObjectId" - setHeader: - name: sObjectName + name: CamelSalesforceSObjectName jsonpath: "$.sObjectName" - transform: jsonpath: "$.payload" diff --git a/kamelets/slack-sink.kamelet.yaml b/kamelets/slack-sink.kamelet.yaml index 3b09c16a1..bf4d52927 100644 --- a/kamelets/slack-sink.kamelet.yaml +++ b/kamelets/slack-sink.kamelet.yaml @@ -56,10 +56,6 @@ spec: title: Icon URL description: The avatar to use when sending a message to a channel or user. type: string - username: - title: Username - description: The username for the bot when it sends messages to a channel or user. - type: string types: out: mediaType: application/json @@ -77,4 +73,3 @@ spec: webhookUrl: "{{webhookUrl}}" iconEmoji: "{{?iconEmoji}}" iconUrl: "{{?iconUrl}}" - username: "{{?username}}" 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 e4a4ac874..2bfbce71e 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 @@ -78,7 +78,7 @@ spec: - simple: "${header[ce-issueKey]}" steps: - setHeader: - name: issueKey + name: CamelJiraIssueKey simple: "${header[ce-issueKey]}" - to: uri: "jira:AddComment" @@ -86,4 +86,3 @@ 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 8101a4c99..5852c3f83 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 @@ -78,49 +78,49 @@ spec: - simple: "${header[ce-projectKey]}" steps: - setHeader: - name: projectKey + name: CamelJiraIssueProjectKey simple: "${header[ce-projectKey]}" - choice: when: - simple: "${header[ce-issueTypeName]}" steps: - setHeader: - name: issueTypeName + name: CamelJiraIssueTypeName simple: "${header[ce-issueTypeName]}" - choice: when: - simple: "${header[ce-issueSummary]}" steps: - setHeader: - name: issueSummary + name: CamelJiraIssueSummary simple: "${header[ce-issueSummary]}" - choice: when: - simple: "${header[ce-issueAssignee]}" steps: - setHeader: - name: issueAssignee + name: CamelJiraIssueAssignee simple: "${header[ce-issueAssignee]}" - choice: when: - simple: "${header[ce-issuePriorityName]}" steps: - setHeader: - name: issuePriorityName + name: CamelJiraIssuePriorityName simple: "${header[ce-issuePriorityName]}" - choice: when: - simple: "${header[ce-issueComponents]}" steps: - setHeader: - name: issueComponents + name: CamelJiraIssueComponents simple: "${header[ce-issueComponents]}" - choice: when: - simple: "${header[ce-issueDescription]}" steps: - setHeader: - name: issueDescription + name: CamelJiraIssueDescription simple: "${header[ce-issueDescription]}" - to: uri: "jira:AddIssue" @@ -128,4 +128,3 @@ spec: jiraUrl: "{{jiraUrl}}" username: "{{?username}}" password: "{{?password}}" - accessToken: "{{?personal-token}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml index 3b09c16a1..bf4d52927 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml @@ -56,10 +56,6 @@ spec: title: Icon URL description: The avatar to use when sending a message to a channel or user. type: string - username: - title: Username - description: The username for the bot when it sends messages to a channel or user. - type: string types: out: mediaType: application/json @@ -77,4 +73,3 @@ spec: webhookUrl: "{{webhookUrl}}" iconEmoji: "{{?iconEmoji}}" iconUrl: "{{?iconUrl}}" - username: "{{?username}}" diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml index c5682dcd3..553954eb8 100644 --- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml @@ -34,7 +34,7 @@ spec: apiVersion: camel.apache.org/v1 name: insert-header-action properties: - name: issueKey + name: CamelJiraIssueKey value: "{{jira.issue.key}}" - ref: kind: Kamelet diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml index 8503b801f..c3ac06c18 100644 --- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml @@ -34,28 +34,28 @@ spec: apiVersion: camel.apache.org/v1 name: insert-header-action properties: - name: projectKey + name: CamelJiraIssueProjectKey value: "{{jira.project.key}}" - ref: kind: Kamelet apiVersion: camel.apache.org/v1 name: insert-header-action properties: - name: issueTypeName + name: CamelJiraIssueTypeName value: "{{jira.issue.type}}" - ref: kind: Kamelet apiVersion: camel.apache.org/v1 name: insert-header-action properties: - name: issueSummary + name: CamelJiraIssueSummary value: "{{jira.issue.summary}}" - ref: kind: Kamelet apiVersion: camel.apache.org/v1 name: insert-header-action properties: - name: issueAssignee + name: CamelJiraIssueAssignee value: "{{jira.issue.assignee}}" - ref: kind: Kamelet diff --git a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml index 399b199de..751812b6b 100644 --- a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml @@ -61,7 +61,7 @@ actions: data: | { "channel": "${slack.channel}", - "text": "${slack.message}", + "text": "${slack.message}" } - http:
