Kafka Sink/source Kamelets: Changing some parameters name

docs/modules/ROOT/pages/kafka-sink.adoc

@@ -21,10 +21,10 @@ The following table summarizes the configuration options available for the `kafk
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *brokers {empty}* *| Brokers| Comma separated list of Kafka Broker URLs| string| | 
+| *bootstrapServers {empty}* *| Brokers| Comma separated list of Kafka Broker URLs| string| | 
 | *password {empty}* *| Password| Password to authenticate to kafka| string| | 
 | *topic {empty}* *| Topic Names| Comma separated list of Kafka topic names| string| | 
-| *username {empty}* *| Username| Username to authenticate to Kafka| string| | 
+| *user {empty}* *| Username| Username to authenticate to Kafka| string| | 
 | saslMechanism| SASL Mechanism| The Simple Authentication and Security Layer (SASL) Mechanism used.| string| `"PLAIN"`| 
 | securityProtocol| Security Protocol| Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SASL_SSL and SSL are supported| string| `"SASL_SSL"`| 
 |===
@@ -58,10 +58,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: kafka-sink
     properties:
-      brokers: "The Brokers"
+      bootstrapServers: "The Brokers"
       password: "The Password"
       topic: "The Topic Names"
-      username: "The Username"
+      user: "The Username"
 
 ----
 
@@ -82,7 +82,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind channel/mychannel kafka-sink -p "sink.brokers=The Brokers" -p "sink.password=The Password" -p "sink.topic=The Topic Names" -p "sink.username=The Username"
+kamel bind channel/mychannel kafka-sink -p "sink.bootstrapServers=The Brokers" -p "sink.password=The Password" -p "sink.topic=The Topic Names" -p "sink.user=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -110,10 +110,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: kafka-sink
     properties:
-      brokers: "The Brokers"
+      bootstrapServers: "The Brokers"
       password: "The Password"
       topic: "The Topic Names"
-      username: "The Username"
+      user: "The Username"
 
 ----
 
@@ -135,7 +135,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic kafka-sink -p "sink.brokers=The Brokers" -p "sink.password=The Password" -p "sink.topic=The Topic Names" -p "sink.username=The Username"
+kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic kafka-sink -p "sink.bootstrapServers=The Brokers" -p "sink.password=The Password" -p "sink.topic=The Topic Names" -p "sink.user=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.

docs/modules/ROOT/pages/kafka-source.adoc

@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `kafk
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *brokers {empty}* *| Brokers| Comma separated list of Kafka Broker URLs| string| | 
+| *bootstrapServers {empty}* *| Brokers| Comma separated list of Kafka Broker URLs| string| | 
 | *password {empty}* *| Password| Password to authenticate to kafka| string| | 
 | *topic {empty}* *| Topic Names| Comma separated list of Kafka topic names| string| | 
-| *username {empty}* *| Username| Username to authenticate to Kafka| string| | 
+| *user {empty}* *| Username| Username to authenticate to Kafka| string| | 
 | allowManualCommit| Allow Manual Commit| Whether to allow doing manual commits| boolean| `false`| 
 | autoCommitEnable| Auto Commit Enable| If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer| boolean| `true`| 
 | autoOffsetReset| Auto Offset Reset| What to do when there is no initial offset. There are 3 enums and the value can be one of latest, earliest, none| string| `"latest"`| 
@@ -49,10 +49,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: kafka-source
     properties:
-      brokers: "The Brokers"
+      bootstrapServers: "The Brokers"
       password: "The Password"
       topic: "The Topic Names"
-      username: "The Username"
+      user: "The Username"
   sink:
     ref:
       kind: InMemoryChannel
@@ -78,7 +78,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind kafka-source -p "source.brokers=The Brokers" -p "source.password=The Password" -p "source.topic=The Topic Names" -p "source.username=The Username" channel/mychannel
+kamel bind kafka-source -p "source.bootstrapServers=The Brokers" -p "source.password=The Password" -p "source.topic=The Topic Names" -p "source.user=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -101,10 +101,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: kafka-source
     properties:
-      brokers: "The Brokers"
+      bootstrapServers: "The Brokers"
       password: "The Password"
       topic: "The Topic Names"
-      username: "The Username"
+      user: "The Username"
   sink:
     ref:
       kind: KafkaTopic
@@ -131,7 +131,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind kafka-source -p "source.brokers=The Brokers" -p "source.password=The Password" -p "source.topic=The Topic Names" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind kafka-source -p "source.bootstrapServers=The Brokers" -p "source.password=The Password" -p "source.topic=The Topic Names" -p "source.user=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.

kafka-sink.kamelet.yaml

@@ -25,16 +25,16 @@ spec:
       Both the headers are optional.
     required:
       - topic
-      - brokers
-      - username
+      - bootstrapServers
+      - user
       - password
     type: object
     properties:
       topic:
         title: Topic Names
         description: Comma separated list of Kafka topic names
         type: string
-      brokers:
+      bootstrapServers:
         title: Brokers
         description: Comma separated list of Kafka Broker URLs
         type: string
@@ -48,7 +48,7 @@ spec:
         description: The Simple Authentication and Security Layer (SASL) Mechanism used. 
         type: string
         default: PLAIN
-      username:
+      user:
         title: Username
         description: Username to authenticate to Kafka 
         type: string
@@ -93,7 +93,7 @@ spec:
       - to:
           uri: "kafka:{{topic}}"
           parameters:
-            brokers: "{{brokers}}"
+            brokers: "{{bootstrapServers}}"
             securityProtocol: "{{securityProtocol}}"
             saslMechanism: "{{saslMechanism}}"
-            saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{username}}' password='{{password}}';"
+            saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{user}}' password='{{password}}';"

kafka-source.kamelet.yaml

@@ -17,16 +17,16 @@ spec:
       Receive data from Kafka topics.
     required:
       - topic
-      - brokers
-      - username
+      - bootstrapServers
+      - user
       - password
     type: object
     properties:
       topic:
         title: Topic Names
         description: Comma separated list of Kafka topic names
         type: string
-      brokers:
+      bootstrapServers:
         title: Brokers
         description: Comma separated list of Kafka Broker URLs
         type: string
@@ -40,7 +40,7 @@ spec:
         description: The Simple Authentication and Security Layer (SASL) Mechanism used. 
         type: string
         default: PLAIN
-      username:
+      user:
         title: Username
         description: Username to authenticate to Kafka 
         type: string
@@ -82,10 +82,10 @@ spec:
     from:
       uri: "kafka:{{topic}}"
       parameters:
-        brokers: "{{brokers}}"
+        brokers: "{{?bootstrapServers}}"
         securityProtocol: "{{securityProtocol}}"
         saslMechanism: "{{saslMechanism}}"
-        saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{username}}' password='{{password}}';"
+        saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{user}}' password='{{password}}';"
         autoCommitEnable: "{{autoCommitEnable}}"
         allowManualCommit: "{{allowManualCommit}}"
         pollOnError: "{{pollOnError}}"

library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml

@@ -25,16 +25,16 @@ spec:
       Both the headers are optional.
     required:
       - topic
-      - brokers
-      - username
+      - bootstrapServers
+      - user
       - password
     type: object
     properties:
       topic:
         title: Topic Names
         description: Comma separated list of Kafka topic names
         type: string
-      brokers:
+      bootstrapServers:
         title: Brokers
         description: Comma separated list of Kafka Broker URLs
         type: string
@@ -48,7 +48,7 @@ spec:
         description: The Simple Authentication and Security Layer (SASL) Mechanism used. 
         type: string
         default: PLAIN
-      username:
+      user:
         title: Username
         description: Username to authenticate to Kafka 
         type: string
@@ -93,7 +93,7 @@ spec:
       - to:
           uri: "kafka:{{topic}}"
           parameters:
-            brokers: "{{brokers}}"
+            brokers: "{{bootstrapServers}}"
             securityProtocol: "{{securityProtocol}}"
             saslMechanism: "{{saslMechanism}}"
-            saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{username}}' password='{{password}}';"
+            saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{user}}' password='{{password}}';"

library/camel-kamelets/src/main/resources/kamelets/kafka-source.kamelet.yaml

@@ -17,16 +17,16 @@ spec:
       Receive data from Kafka topics.
     required:
       - topic
-      - brokers
-      - username
+      - bootstrapServers
+      - user
       - password
     type: object
     properties:
       topic:
         title: Topic Names
         description: Comma separated list of Kafka topic names
         type: string
-      brokers:
+      bootstrapServers:
         title: Brokers
         description: Comma separated list of Kafka Broker URLs
         type: string
@@ -40,7 +40,7 @@ spec:
         description: The Simple Authentication and Security Layer (SASL) Mechanism used. 
         type: string
         default: PLAIN
-      username:
+      user:
         title: Username
         description: Username to authenticate to Kafka 
         type: string
@@ -82,10 +82,10 @@ spec:
     from:
       uri: "kafka:{{topic}}"
       parameters:
-        brokers: "{{brokers}}"
+        brokers: "{{?bootstrapServers}}"
         securityProtocol: "{{securityProtocol}}"
         saslMechanism: "{{saslMechanism}}"
-        saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{username}}' password='{{password}}';"
+        saslJaasConfig: "org.apache.kafka.common.security.plain.PlainLoginModule required username='{{user}}' password='{{password}}';"
         autoCommitEnable: "{{autoCommitEnable}}"
         allowManualCommit: "{{allowManualCommit}}"
         pollOnError: "{{pollOnError}}"