You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/04/07 08:45:10 UTC

[camel-kamelets] branch main updated (40dfa643 -> 72b333a1)

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

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


    from 40dfa643 Upgrade Classgraph to version 4.8.143
     new fae6677b [ISSUE-724] kafka-ssl kamelet
     new 308665cc Add password specific markers
     new 24da7d64 Move required properties to the top to align with other kamelets
     new d56b10f7 Change URI position to align with other kamelets
     new 72b333a1 Add format:password field

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/modules/ROOT/nav.adoc                         |   1 +
 ...nk.kamelet.yaml => kafka-ssl-sink.kamelet.yaml} | 172 ++++++++++++++-------
 2 files changed, 115 insertions(+), 58 deletions(-)
 copy kamelets/{kafka-sink.kamelet.yaml => kafka-ssl-sink.kamelet.yaml} (54%)


[camel-kamelets] 02/05: Add password specific markers

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 308665cc1b820e1fab3629a29036a1c042e4e95d
Author: Anton Giertli <ag...@redhat.com>
AuthorDate: Thu Apr 7 08:08:51 2022 +0200

    Add password specific markers
---
 kamelets/kafka-ssl-sink.kamelet.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kamelets/kafka-ssl-sink.kamelet.yaml b/kamelets/kafka-ssl-sink.kamelet.yaml
index 007b5451..7b1957c4 100644
--- a/kamelets/kafka-ssl-sink.kamelet.yaml
+++ b/kamelets/kafka-ssl-sink.kamelet.yaml
@@ -77,6 +77,10 @@ spec:
           and only needed if ssl.keystore.location is configured.
         title: SSL Keystore Password
         type: string
+        format: password
+        x-descriptors:
+          - urn:alm:descriptor:com.tectonic.ui:password
+          - urn:camel:group:credentials
       sslTruststoreLocation:
         description: The location of the trust store file.
         title: SSL Truststore Location
@@ -85,6 +89,9 @@ spec:
         description: The password of the private key in the key store file.
         title: SSL Key Password
         type: string
+        x-descriptors:
+          - urn:alm:descriptor:com.tectonic.ui:password
+          - urn:camel:group:credentials
       topic:
         description: Comma separated list of Kafka topic names
         title: Topic Names


[camel-kamelets] 01/05: [ISSUE-724] kafka-ssl kamelet

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fae6677bc0e36c024da71e683f23f96001014d3e
Author: Anton Giertli <ag...@redhat.com>
AuthorDate: Wed Apr 6 20:34:05 2022 +0200

    [ISSUE-724] kafka-ssl kamelet
---
 docs/modules/ROOT/nav.adoc           |   1 +
 kamelets/kafka-ssl-sink.kamelet.yaml | 167 +++++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index ea00388f..5e36e317 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -104,6 +104,7 @@
 * xref:kafka-not-secured-source.adoc[]
 * xref:kafka-sink.adoc[]
 * xref:kafka-source.adoc[]
+* xref:kafka-ssl-sink.adoc[]
 * xref:kubernetes-namespaces-source.adoc[]
 * xref:kubernetes-nodes-source.adoc[]
 * xref:kubernetes-pods-source.adoc[]
diff --git a/kamelets/kafka-ssl-sink.kamelet.yaml b/kamelets/kafka-ssl-sink.kamelet.yaml
new file mode 100644
index 00000000..007b5451
--- /dev/null
+++ b/kamelets/kafka-ssl-sink.kamelet.yaml
@@ -0,0 +1,167 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+  name: kafka-ssl-sink
+  annotations:
+    camel.apache.org/kamelet.support.level: "Preview"
+    camel.apache.org/catalog.version: "main-SNAPSHOT"
+    camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCA1MDAgNTAwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MD [...]
+    camel.apache.org/provider: "Apache Software Foundation"
+    camel.apache.org/kamelet.group: "Kafka"
+  labels:
+    camel.apache.org/kamelet.type: "sink"
+spec:
+  definition:
+    description: |-
+      Send data to Kafka topics wit TLS/SSL support.
+
+      The Kamelet is able to understand the following headers to be set:
+
+      - `key` / `ce-key`: as message key
+
+      - `partition-key` / `ce-partitionkey`: as message partition key
+
+      Both the headers are optional.
+    properties:
+      bootstrapServers:
+        description: Comma separated list of Kafka Broker URLs
+        title: Brokers
+        type: string
+      sslKeystoreLocation:
+        description: >-
+          The location of the key store file. This is optional for client and
+          can be used for two-way authentication for client.
+        title: SSL Keystore Location
+        type: string
+      sslProtocol:
+        default: TLSv1.2
+        description: >-
+          The SSL protocol used to generate the SSLContext. Default setting is
+          TLS, which is fine for most cases. Allowed values in recent JVMs are
+          TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in
+          older JVMs, but their usage is discouraged due to known security
+          vulnerabilities.
+        title: SSL Protocol
+        type: string
+      saslMechanism:
+        title: SASL Mechanism
+        description: The Simple Authentication and Security Layer (SASL) Mechanism used.
+        type: string
+        default: GSSAPI
+      sslEnabledProtocols:
+        default: TLSv1.2,TLSv1.1,TLSv1
+        description: >-
+          The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1
+          and TLSv1 are enabled by default.
+        title: SSL Enabled Protocols
+        type: string
+      sslKeystorePassword:
+        description: >-
+          The store password for the key store file.This is optional for client
+          and only needed if ssl.keystore.location is configured.
+        title: SSL Keystore Password
+        type: string
+      sslTruststoreLocation:
+        description: The location of the trust store file.
+        title: SSL Truststore Location
+        type: string
+      sslKeyPassword:
+        description: The password of the private key in the key store file.
+        title: SSL Key Password
+        type: string
+      topic:
+        description: Comma separated list of Kafka topic names
+        title: Topic Names
+        type: string
+      securityProtocol:
+        default: SSL
+        description: >-
+          Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT,
+          SASL_SSL and SSL are supported
+        title: Security Protocol
+        type: string
+    required:
+      - topic
+      - bootstrapServers
+      - sslKeystoreLocation
+      - sslKeystorePassword
+      - sslTruststoreLocation
+      - sslKeyPassword
+    title: Kafka SSL Sink
+    type: object
+  dependencies:
+    - "camel:core"
+    - "camel:kafka"
+    - "camel:kamelet"
+  template:
+    beans:
+      - name: kafka-ssl-sink-local
+        type: '#class:org.apache.camel.component.kafka.KafkaComponent'
+      - name: kafka-ssl-sink-configuration-local
+        property:
+          - key: brokers
+            value: '{{bootstrapServers}}'
+          - key: securityProtocol
+            value: '{{securityProtocol}}'
+          - key: sslKeystoreLocation
+            value: '{{sslKeystoreLocation}}'
+          - key: sslKeyPassword
+            value: '{{sslKeyPassword}}'
+          - key: sslKeystorePassword
+            value: '{{sslKeystorePassword}}'
+          - key: sslTruststoreLocation
+            value: '{{sslTruststoreLocation}}'
+          - key: sslProtocol
+            value: '{{sslProtocol}}'
+          - key: sslEnabledProtocols
+            value: '{{sslEnabledProtocols}}'
+          - key: saslMechanism
+            value: '{{saslMechanism}}'
+        type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
+    from:
+      uri: "kamelet:source"
+      steps:
+        - choice:
+            when:
+              - simple: ${header[key]}
+                steps:
+                  - set-header:
+                      name: kafka.KEY
+                      simple: ${header[key]}
+              - simple: ${header[ce-key]}
+                steps:
+                  - set-header:
+                      name: kafka.KEY
+                      simple: ${header[ce-key]}
+        - choice:
+            when:
+              - simple: ${header[partition-key]}
+                steps:
+                  - set-header:
+                      name: kafka.PARTITION_KEY
+                      simple: ${header[partition-key]}
+              - simple: ${header[ce-partitionkey]}
+                steps:
+                  - set-header:
+                      name: kafka.PARTITION_KEY
+                      simple: ${header[ce-partitionkey]}
+        - to:
+            parameters:
+              configuration: '#bean:{{kafka-ssl-sink-configuration-local}}'
+            uri: '{{kafka-ssl-sink-local}}:{{topic}}'


[camel-kamelets] 03/05: Move required properties to the top to align with other kamelets

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 24da7d64655ed18b6dafbe40b20dc4dce074c7d9
Author: Anton Giertli <ag...@redhat.com>
AuthorDate: Thu Apr 7 08:09:28 2022 +0200

    Move required properties to the top to align with other kamelets
---
 kamelets/kafka-ssl-sink.kamelet.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kamelets/kafka-ssl-sink.kamelet.yaml b/kamelets/kafka-ssl-sink.kamelet.yaml
index 7b1957c4..32022bcb 100644
--- a/kamelets/kafka-ssl-sink.kamelet.yaml
+++ b/kamelets/kafka-ssl-sink.kamelet.yaml
@@ -38,6 +38,13 @@ spec:
       - `partition-key` / `ce-partitionkey`: as message partition key
 
       Both the headers are optional.
+    required:
+      - topic
+      - bootstrapServers
+      - sslKeystoreLocation
+      - sslKeystorePassword
+      - sslTruststoreLocation
+      - sslKeyPassword
     properties:
       bootstrapServers:
         description: Comma separated list of Kafka Broker URLs
@@ -103,13 +110,6 @@ spec:
           SASL_SSL and SSL are supported
         title: Security Protocol
         type: string
-    required:
-      - topic
-      - bootstrapServers
-      - sslKeystoreLocation
-      - sslKeystorePassword
-      - sslTruststoreLocation
-      - sslKeyPassword
     title: Kafka SSL Sink
     type: object
   dependencies:


[camel-kamelets] 04/05: Change URI position to align with other kamelets

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d56b10f71f01cf73542ee2bd90b83ad9585dac58
Author: Anton Giertli <ag...@redhat.com>
AuthorDate: Thu Apr 7 08:15:45 2022 +0200

    Change URI position to align with other kamelets
---
 kamelets/kafka-ssl-sink.kamelet.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kamelets/kafka-ssl-sink.kamelet.yaml b/kamelets/kafka-ssl-sink.kamelet.yaml
index 32022bcb..e82eb5e3 100644
--- a/kamelets/kafka-ssl-sink.kamelet.yaml
+++ b/kamelets/kafka-ssl-sink.kamelet.yaml
@@ -169,6 +169,6 @@ spec:
                       name: kafka.PARTITION_KEY
                       simple: ${header[ce-partitionkey]}
         - to:
-            parameters:
-              configuration: '#bean:{{kafka-ssl-sink-configuration-local}}'
             uri: '{{kafka-ssl-sink-local}}:{{topic}}'
+            parameters:
+              configuration: '#bean:{{kafka-ssl-sink-configuration-local}}'
\ No newline at end of file


[camel-kamelets] 05/05: Add format:password field

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 72b333a1194a35c897ca9dc9e9d92104632d3d10
Author: Anton Giertli <ag...@redhat.com>
AuthorDate: Thu Apr 7 08:17:14 2022 +0200

    Add format:password field
---
 kamelets/kafka-ssl-sink.kamelet.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kamelets/kafka-ssl-sink.kamelet.yaml b/kamelets/kafka-ssl-sink.kamelet.yaml
index e82eb5e3..099142bf 100644
--- a/kamelets/kafka-ssl-sink.kamelet.yaml
+++ b/kamelets/kafka-ssl-sink.kamelet.yaml
@@ -96,6 +96,7 @@ spec:
         description: The password of the private key in the key store file.
         title: SSL Key Password
         type: string
+        format: password
         x-descriptors:
           - urn:alm:descriptor:com.tectonic.ui:password
           - urn:camel:group:credentials