You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by nf...@apache.org on 2021/07/06 12:52:17 UTC

[camel-kamelets] branch main updated (64e53c6 -> 99f24cf)

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

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


    from 64e53c6  Restore Kamelets for development
     new 1e3e504  CAMEL-16788: workaround to prevent override from system env variables
     new f85a413  CAMEL-16788: regen
     new 99f24cf  CAMEL-16788: regen docs

The 3 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:
 cassandra-sink.kamelet.yaml                              | 14 +++++++-------
 cassandra-source.kamelet.yaml                            | 14 +++++++-------
 docs/modules/ROOT/pages/cassandra-sink.adoc              | 16 ++++++++--------
 docs/modules/ROOT/pages/cassandra-source.adoc            | 16 ++++++++--------
 docs/modules/ROOT/pages/file-watch-source.adoc           | 10 +++++-----
 docs/modules/ROOT/pages/ftp-sink.adoc                    | 12 ++++++------
 docs/modules/ROOT/pages/ftp-source.adoc                  | 12 ++++++------
 docs/modules/ROOT/pages/ftps-sink.adoc                   | 12 ++++++------
 docs/modules/ROOT/pages/ftps-source.adoc                 | 12 ++++++------
 docs/modules/ROOT/pages/mail-imap-source.adoc            | 12 ++++++------
 docs/modules/ROOT/pages/mariadb-sink.adoc                |  2 +-
 docs/modules/ROOT/pages/mariadb-source.adoc              |  2 +-
 docs/modules/ROOT/pages/mysql-sink.adoc                  |  2 +-
 docs/modules/ROOT/pages/mysql-source.adoc                |  2 +-
 docs/modules/ROOT/pages/postgresql-sink.adoc             |  2 +-
 docs/modules/ROOT/pages/postgresql-source.adoc           |  2 +-
 docs/modules/ROOT/pages/rabbitmq-source.adoc             |  2 +-
 docs/modules/ROOT/pages/sftp-sink.adoc                   | 12 ++++++------
 docs/modules/ROOT/pages/sftp-source.adoc                 | 12 ++++++------
 docs/modules/ROOT/pages/sqlserver-sink.adoc              |  2 +-
 docs/modules/ROOT/pages/sqlserver-source.adoc            |  2 +-
 docs/modules/ROOT/pages/ssh-source.adoc                  | 12 ++++++------
 file-watch-source.kamelet.yaml                           |  6 +++---
 ftp-sink.kamelet.yaml                                    | 14 +++++++-------
 ftp-source.kamelet.yaml                                  | 14 +++++++-------
 ftps-sink.kamelet.yaml                                   | 14 +++++++-------
 ftps-source.kamelet.yaml                                 | 14 +++++++-------
 .../main/resources/kamelets/cassandra-sink.kamelet.yaml  | 14 +++++++-------
 .../resources/kamelets/cassandra-source.kamelet.yaml     | 14 +++++++-------
 .../resources/kamelets/file-watch-source.kamelet.yaml    |  6 +++---
 .../src/main/resources/kamelets/ftp-sink.kamelet.yaml    | 14 +++++++-------
 .../src/main/resources/kamelets/ftp-source.kamelet.yaml  | 14 +++++++-------
 .../src/main/resources/kamelets/ftps-sink.kamelet.yaml   | 14 +++++++-------
 .../src/main/resources/kamelets/ftps-source.kamelet.yaml | 14 +++++++-------
 .../resources/kamelets/mail-imap-source.kamelet.yaml     | 14 +++++++-------
 .../main/resources/kamelets/mariadb-sink.kamelet.yaml    |  6 +++---
 .../main/resources/kamelets/mariadb-source.kamelet.yaml  |  6 +++---
 .../src/main/resources/kamelets/mysql-sink.kamelet.yaml  |  6 +++---
 .../main/resources/kamelets/mysql-source.kamelet.yaml    |  6 +++---
 .../main/resources/kamelets/postgresql-sink.kamelet.yaml |  6 +++---
 .../resources/kamelets/postgresql-source.kamelet.yaml    |  6 +++---
 .../main/resources/kamelets/rabbitmq-source.kamelet.yaml |  5 +++--
 .../src/main/resources/kamelets/sftp-sink.kamelet.yaml   | 14 +++++++-------
 .../src/main/resources/kamelets/sftp-source.kamelet.yaml | 14 +++++++-------
 .../main/resources/kamelets/sqlserver-sink.kamelet.yaml  |  6 +++---
 .../resources/kamelets/sqlserver-source.kamelet.yaml     |  6 +++---
 .../src/main/resources/kamelets/ssh-source.kamelet.yaml  | 14 +++++++-------
 mail-imap-source.kamelet.yaml                            | 14 +++++++-------
 mariadb-sink.kamelet.yaml                                |  6 +++---
 mariadb-source.kamelet.yaml                              |  6 +++---
 mysql-sink.kamelet.yaml                                  |  6 +++---
 mysql-source.kamelet.yaml                                |  6 +++---
 postgresql-sink.kamelet.yaml                             |  6 +++---
 postgresql-source.kamelet.yaml                           |  6 +++---
 rabbitmq-source.kamelet.yaml                             |  5 +++--
 script/validator/validator.go                            | 12 +++++++++++-
 sftp-sink.kamelet.yaml                                   | 14 +++++++-------
 sftp-source.kamelet.yaml                                 | 14 +++++++-------
 sqlserver-sink.kamelet.yaml                              |  6 +++---
 sqlserver-source.kamelet.yaml                            |  6 +++---
 ssh-source.kamelet.yaml                                  | 14 +++++++-------
 61 files changed, 289 insertions(+), 277 deletions(-)

[camel-kamelets] 03/03: CAMEL-16788: regen docs

Posted by nf...@apache.org.

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

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

commit 99f24cfe64fda1a547493558e7ff7c740e8c3bb2
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Tue Jul 6 13:22:04 2021 +0200

    CAMEL-16788: regen docs
---
 docs/modules/ROOT/pages/cassandra-sink.adoc    | 16 ++++++++--------
 docs/modules/ROOT/pages/cassandra-source.adoc  | 16 ++++++++--------
 docs/modules/ROOT/pages/file-watch-source.adoc | 10 +++++-----
 docs/modules/ROOT/pages/ftp-sink.adoc          | 12 ++++++------
 docs/modules/ROOT/pages/ftp-source.adoc        | 12 ++++++------
 docs/modules/ROOT/pages/ftps-sink.adoc         | 12 ++++++------
 docs/modules/ROOT/pages/ftps-source.adoc       | 12 ++++++------
 docs/modules/ROOT/pages/mail-imap-source.adoc  | 12 ++++++------
 docs/modules/ROOT/pages/mariadb-sink.adoc      |  2 +-
 docs/modules/ROOT/pages/mariadb-source.adoc    |  2 +-
 docs/modules/ROOT/pages/mysql-sink.adoc        |  2 +-
 docs/modules/ROOT/pages/mysql-source.adoc      |  2 +-
 docs/modules/ROOT/pages/postgresql-sink.adoc   |  2 +-
 docs/modules/ROOT/pages/postgresql-source.adoc |  2 +-
 docs/modules/ROOT/pages/rabbitmq-source.adoc   |  2 +-
 docs/modules/ROOT/pages/sftp-sink.adoc         | 12 ++++++------
 docs/modules/ROOT/pages/sftp-source.adoc       | 12 ++++++------
 docs/modules/ROOT/pages/sqlserver-sink.adoc    |  2 +-
 docs/modules/ROOT/pages/sqlserver-source.adoc  |  2 +-
 docs/modules/ROOT/pages/ssh-source.adoc        | 12 ++++++------
 20 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/docs/modules/ROOT/pages/cassandra-sink.adoc b/docs/modules/ROOT/pages/cassandra-sink.adoc
index 7e95f78..c35b9e4 100644
--- a/docs/modules/ROOT/pages/cassandra-sink.adoc
+++ b/docs/modules/ROOT/pages/cassandra-sink.adoc
@@ -15,10 +15,10 @@ The following table summarizes the configuration options available for the `cass
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *host {empty}* *| Host| Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.| string| | `"localhost"`
+| *connectionHost {empty}* *| Connection Host| Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.| string| | `"localhost"`
+| *connectionPort {empty}* *| Connection Port| Port number of cassandra server(s)| string| | `9042`
 | *keyspace {empty}* *| Keyspace| Keyspace to use| string| | `"customers"`
 | *password {empty}* *| Password| The password to use for accessing a secured Cassandra Cluster| string| | 
-| *port {empty}* *| Port| Port number of cassandra server(s)| string| | `9042`
 | *preparedStatement {empty}* *| Prepared Statement| The Prepared statement to execute against the Cassandra cluster table| string| | 
 | *username {empty}* *| Username| The username to use for accessing a secured Cassandra Cluster| string| | 
 | consistencyLevel| Consistency Level| Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE| string| `"ANY"`| 
@@ -53,10 +53,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: cassandra-sink
     properties:
-      host: "localhost"
+      connectionHost: "localhost"
+      connectionPort: 9042
       keyspace: "customers"
       password: "The Password"
-      port: 9042
       preparedStatement: "The Prepared Statement"
       username: "The Username"
 
@@ -79,7 +79,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind channel/mychannel cassandra-sink -p "sink.host=localhost" -p "sink.keyspace=customers" -p "sink.password=The Password" -p sink.port=9042 -p "sink.preparedStatement=The Prepared Statement" -p "sink.username=The Username"
+kamel bind channel/mychannel cassandra-sink -p "sink.connectionHost=localhost" -p sink.connectionPort=9042 -p "sink.keyspace=customers" -p "sink.password=The Password" -p "sink.preparedStatement=The Prepared Statement" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -107,10 +107,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: cassandra-sink
     properties:
-      host: "localhost"
+      connectionHost: "localhost"
+      connectionPort: 9042
       keyspace: "customers"
       password: "The Password"
-      port: 9042
       preparedStatement: "The Prepared Statement"
       username: "The Username"
 
@@ -134,7 +134,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 cassandra-sink -p "sink.host=localhost" -p "sink.keyspace=customers" -p "sink.password=The Password" -p sink.port=9042 -p "sink.preparedStatement=The Prepared Statement" -p "sink.username=The Username"
+kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic cassandra-sink -p "sink.connectionHost=localhost" -p sink.connectionPort=9042 -p "sink.keyspace=customers" -p "sink.password=The Password" -p "sink.preparedStatement=The Prepared Statement" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
diff --git a/docs/modules/ROOT/pages/cassandra-source.adoc b/docs/modules/ROOT/pages/cassandra-source.adoc
index 4009f46..0449488 100644
--- a/docs/modules/ROOT/pages/cassandra-source.adoc
+++ b/docs/modules/ROOT/pages/cassandra-source.adoc
@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `cass
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *host {empty}* *| Host| Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.| string| | `"localhost"`
+| *connectionHost {empty}* *| Connection Host| Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.| string| | `"localhost"`
+| *connectionPort {empty}* *| Connection Port| Port number of cassandra server(s)| string| | `9042`
 | *keyspace {empty}* *| Keyspace| Keyspace to use| string| | `"customers"`
 | *password {empty}* *| Password| The password to use for accessing a secured Cassandra Cluster| string| | 
-| *port {empty}* *| Port| Port number of cassandra server(s)| string| | `9042`
 | *query {empty}* *| Query| The query to execute against the Cassandra cluster table| string| | 
 | *username {empty}* *| Username| The username to use for accessing a secured Cassandra Cluster| string| | 
 | consistencyLevel| Consistency Level| Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE| string| `"ANY"`| 
@@ -47,10 +47,10 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: cassandra-source
     properties:
-      host: "localhost"
+      connectionHost: "localhost"
+      connectionPort: 9042
       keyspace: "customers"
       password: "The Password"
-      port: 9042
       query: "The Query"
       username: "The Username"
   sink:
@@ -78,7 +78,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind cassandra-source -p "source.host=localhost" -p "source.keyspace=customers" -p "source.password=The Password" -p source.port=9042 -p "source.query=The Query" -p "source.username=The Username" channel/mychannel
+kamel bind cassandra-source -p "source.connectionHost=localhost" -p source.connectionPort=9042 -p "source.keyspace=customers" -p "source.password=The Password" -p "source.query=The Query" -p "source.username=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: cassandra-source
     properties:
-      host: "localhost"
+      connectionHost: "localhost"
+      connectionPort: 9042
       keyspace: "customers"
       password: "The Password"
-      port: 9042
       query: "The Query"
       username: "The Username"
   sink:
@@ -133,7 +133,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind cassandra-source -p "source.host=localhost" -p "source.keyspace=customers" -p "source.password=The Password" -p source.port=9042 -p "source.query=The Query" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind cassandra-source -p "source.connectionHost=localhost" -p source.connectionPort=9042 -p "source.keyspace=customers" -p "source.password=The Password" -p "source.query=The Query" -p "source.username=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.
diff --git a/docs/modules/ROOT/pages/file-watch-source.adoc b/docs/modules/ROOT/pages/file-watch-source.adoc
index 805cabe..ec643dd 100644
--- a/docs/modules/ROOT/pages/file-watch-source.adoc
+++ b/docs/modules/ROOT/pages/file-watch-source.adoc
@@ -14,7 +14,7 @@ The following table summarizes the configuration options available for the `file
 |===
 | Property| Name| Description| Type| Default| Example
 | *events {empty}* *| Events| The type of events to consume| string| `"CREATE,MODIFY,DELETE"`| 
-| *path {empty}* *| Path to Watch| Path of file or folder to watch| string| | 
+| *filePath {empty}* *| Path to Watch| Path of file or folder to watch| string| | 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
@@ -41,7 +41,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: file-watch-source
     properties:
-      path: "The Path to Watch"
+      filePath: "The Path to Watch"
   sink:
     ref:
       kind: InMemoryChannel
@@ -67,7 +67,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind file-watch-source -p "source.path=The Path to Watch" channel/mychannel
+kamel bind file-watch-source -p "source.filePath=The Path to Watch" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -90,7 +90,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: file-watch-source
     properties:
-      path: "The Path to Watch"
+      filePath: "The Path to Watch"
   sink:
     ref:
       kind: KafkaTopic
@@ -117,7 +117,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind file-watch-source -p "source.path=The Path to Watch" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind file-watch-source -p "source.filePath=The Path to Watch" 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.
diff --git a/docs/modules/ROOT/pages/ftp-sink.adoc b/docs/modules/ROOT/pages/ftp-sink.adoc
index 2f49216..dcbb4d2 100644
--- a/docs/modules/ROOT/pages/ftp-sink.adoc
+++ b/docs/modules/ROOT/pages/ftp-sink.adoc
@@ -19,10 +19,10 @@ The following table summarizes the configuration options available for the `ftp-
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the FTP server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTP server| string| `21`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the FTP server| string| | 
 | *password {empty}* *| Password| The password to access the FTP server| string| | 
-| *port {empty}* *| Port| Port of the FTP server| string| `21`| 
 | *username {empty}* *| Username| The username to access the FTP server| string| | 
 | fileExist| File Existence| How to behave in case of file already existent. There are 4 enums and the value can be one of Override, Append, Fail or Ignore| string| `"Override"`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -57,8 +57,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftp-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -81,7 +81,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind channel/mychannel ftp-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind channel/mychannel ftp-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -109,8 +109,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftp-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -134,7 +134,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 ftp-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic ftp-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
diff --git a/docs/modules/ROOT/pages/ftp-source.adoc b/docs/modules/ROOT/pages/ftp-source.adoc
index 65f91cb..e26d5b5 100644
--- a/docs/modules/ROOT/pages/ftp-source.adoc
+++ b/docs/modules/ROOT/pages/ftp-source.adoc
@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `ftp-
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the FTP server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTP server| string| `21`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the FTP server| string| | 
 | *password {empty}* *| Password| The password to access the FTP server| string| | 
-| *port {empty}* *| Port| Port of the FTP server| string| `21`| 
 | *username {empty}* *| Username| The username to access the FTP server| string| | 
 | idempotent| Idempotency| Skip already processed files.| boolean| `true`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -47,8 +47,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftp-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -76,7 +76,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ftp-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
+kamel bind ftp-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -99,8 +99,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftp-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -129,7 +129,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ftp-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind ftp-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=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.
diff --git a/docs/modules/ROOT/pages/ftps-sink.adoc b/docs/modules/ROOT/pages/ftps-sink.adoc
index 11d9293..329869c 100644
--- a/docs/modules/ROOT/pages/ftps-sink.adoc
+++ b/docs/modules/ROOT/pages/ftps-sink.adoc
@@ -19,10 +19,10 @@ The following table summarizes the configuration options available for the `ftps
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the FTP server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTP server| string| `21`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the FTP server| string| | 
 | *password {empty}* *| Password| The password to access the FTP server| string| | 
-| *port {empty}* *| Port| Port of the FTP server| string| `21`| 
 | *username {empty}* *| Username| The username to access the FTP server| string| | 
 | fileExist| File Existence| How to behave in case of file already existent. There are 4 enums and the value can be one of Override, Append, Fail or Ignore| string| `"Override"`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -57,8 +57,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftps-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -81,7 +81,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind channel/mychannel ftps-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind channel/mychannel ftps-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -109,8 +109,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftps-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -134,7 +134,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 ftps-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic ftps-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
diff --git a/docs/modules/ROOT/pages/ftps-source.adoc b/docs/modules/ROOT/pages/ftps-source.adoc
index d16a18c..e7d7dd5 100644
--- a/docs/modules/ROOT/pages/ftps-source.adoc
+++ b/docs/modules/ROOT/pages/ftps-source.adoc
@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `ftps
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the FTPS server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTPS server| string| `21`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the FTPS server| string| | 
 | *password {empty}* *| Password| The password to access the FTPS server| string| | 
-| *port {empty}* *| Port| Port of the FTPS server| string| `21`| 
 | *username {empty}* *| Username| The username to access the FTPS server| string| | 
 | idempotent| Idempotency| Skip already processed files.| boolean| `true`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -47,8 +47,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftps-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -76,7 +76,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ftps-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
+kamel bind ftps-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -99,8 +99,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ftps-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -129,7 +129,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ftps-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind ftps-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=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.
diff --git a/docs/modules/ROOT/pages/mail-imap-source.adoc b/docs/modules/ROOT/pages/mail-imap-source.adoc
index ac8ffbe..34d9509 100644
--- a/docs/modules/ROOT/pages/mail-imap-source.adoc
+++ b/docs/modules/ROOT/pages/mail-imap-source.adoc
@@ -13,9 +13,9 @@ The following table summarizes the configuration options available for the `mail
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *host {empty}* *| Host| The IMAP server host| string| | `"imap.gmail.com"`
+| *connectionHost {empty}* *| Connection Host| The IMAP server host| string| | `"imap.gmail.com"`
+| *connectionPort {empty}* *| Connection Port| The IMAP server port| string| `993`| 
 | *password {empty}* *| Password| The password to access the mail box| string| | 
-| *port {empty}* *| Port| The IMAP server port| string| `993`| 
 | *username {empty}* *| Username| The username to access the mail box| string| | 
 | delay| Delay| The delay between fetches in milliseconds| integer| `60000`| 
 | fetchSize| Fetch Size| The number of messages fetched for each poll (-1 for no limits)| integer| `10`| 
@@ -45,7 +45,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: mail-imap-source
     properties:
-      host: "imap.gmail.com"
+      connectionHost: "imap.gmail.com"
       password: "The Password"
       username: "The Username"
   sink:
@@ -73,7 +73,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind mail-imap-source -p "source.host=imap.gmail.com" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
+kamel bind mail-imap-source -p "source.connectionHost=imap.gmail.com" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -96,7 +96,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: mail-imap-source
     properties:
-      host: "imap.gmail.com"
+      connectionHost: "imap.gmail.com"
       password: "The Password"
       username: "The Username"
   sink:
@@ -125,7 +125,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind mail-imap-source -p "source.host=imap.gmail.com" -p "source.password=The Password" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind mail-imap-source -p "source.connectionHost=imap.gmail.com" -p "source.password=The Password" -p "source.username=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.
diff --git a/docs/modules/ROOT/pages/mariadb-sink.adoc b/docs/modules/ROOT/pages/mariadb-sink.adoc
index f783b64..559804f 100644
--- a/docs/modules/ROOT/pages/mariadb-sink.adoc
+++ b/docs/modules/ROOT/pages/mariadb-sink.adoc
@@ -30,7 +30,7 @@ The following table summarizes the configuration options available for the `mari
 | *query {empty}* *| Query| The Query to execute against the MariaDB Database| string| | `"INSERT INTO accounts (username,city) VALUES (:#username,:#city)"`
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured MariaDB Database| string| | 
-| port| Port| Server Port for the data source| string| `3306`| 
+| serverPort| Server Port| Server Port for the data source| string| `3306`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/mariadb-source.adoc b/docs/modules/ROOT/pages/mariadb-source.adoc
index b5ec849..cedbbe6 100644
--- a/docs/modules/ROOT/pages/mariadb-source.adoc
+++ b/docs/modules/ROOT/pages/mariadb-source.adoc
@@ -23,7 +23,7 @@ The following table summarizes the configuration options available for the `mari
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured MariaDB Database| string| | 
 | consumedQuery| Consumed Query| A query to run on a tuple consumed| string| | `"DELETE FROM accounts where user_id = :#user_id"`
-| port| Port| Server Port for the data source| string| `3306`| 
+| serverPort| Server Port| Server Port for the data source| string| `3306`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/mysql-sink.adoc b/docs/modules/ROOT/pages/mysql-sink.adoc
index a53eba8..6dc5f3e 100644
--- a/docs/modules/ROOT/pages/mysql-sink.adoc
+++ b/docs/modules/ROOT/pages/mysql-sink.adoc
@@ -30,7 +30,7 @@ The following table summarizes the configuration options available for the `mysq
 | *query {empty}* *| Query| The Query to execute against the MySQL Database| string| | `"INSERT INTO accounts (username,city) VALUES (:#username,:#city)"`
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured MySQL Database| string| | 
-| port| Port| Server Port for the data source| string| `3306`| 
+| serverPort| Server Port| Server Port for the data source| string| `3306`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/mysql-source.adoc b/docs/modules/ROOT/pages/mysql-source.adoc
index b13ca70..01e577c 100644
--- a/docs/modules/ROOT/pages/mysql-source.adoc
+++ b/docs/modules/ROOT/pages/mysql-source.adoc
@@ -23,7 +23,7 @@ The following table summarizes the configuration options available for the `mysq
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured MySQL Database| string| | 
 | consumedQuery| Consumed Query| A query to run on a tuple consumed| string| | `"DELETE FROM accounts where user_id = :#user_id"`
-| port| Port| Server Port for the data source| string| `3306`| 
+| serverPort| Server Port| Server Port for the data source| string| `3306`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/postgresql-sink.adoc b/docs/modules/ROOT/pages/postgresql-sink.adoc
index ac34c83..18c828a 100644
--- a/docs/modules/ROOT/pages/postgresql-sink.adoc
+++ b/docs/modules/ROOT/pages/postgresql-sink.adoc
@@ -26,7 +26,7 @@ The following table summarizes the configuration options available for the `post
 | *query {empty}* *| Query| The Query to execute against the PostgreSQL Database| string| | `"INSERT INTO accounts (username,city) VALUES (:#username,:#city)"`
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured PostgreSQL Database| string| | 
-| port| Port| Server Port for the data source| string| `5432`| 
+| serverPort| Server Port| Server Port for the data source| string| `5432`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/postgresql-source.adoc b/docs/modules/ROOT/pages/postgresql-source.adoc
index d1a3da6..c7b2658 100644
--- a/docs/modules/ROOT/pages/postgresql-source.adoc
+++ b/docs/modules/ROOT/pages/postgresql-source.adoc
@@ -19,7 +19,7 @@ The following table summarizes the configuration options available for the `post
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured PostgreSQL Database| string| | 
 | consumedQuery| Consumed Query| A query to run on a tuple consumed| string| | `"DELETE FROM accounts where user_id = :#user_id"`
-| port| Port| Server Port for the data source| string| `5432`| 
+| serverPort| Server Port| Server Port for the data source| string| `5432`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/rabbitmq-source.adoc b/docs/modules/ROOT/pages/rabbitmq-source.adoc
index 7183ac7..b4f1224 100644
--- a/docs/modules/ROOT/pages/rabbitmq-source.adoc
+++ b/docs/modules/ROOT/pages/rabbitmq-source.adoc
@@ -17,7 +17,7 @@ The following table summarizes the configuration options available for the `rabb
 | *exchangeName {empty}* *| Exchange name| The exchange name determines the exchange the queue will be bound to| string| | 
 | *password {empty}* *| Password| The password to access the RabbitMQ server| string| | 
 | *username {empty}* *| Username| The username to access the RabbitMQ server| string| | 
-| port| Port| Port of the RabbitMQ server| string| `5672`| 
+| portNumber| Port Number| Port of the RabbitMQ server| string| `5672`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/sftp-sink.adoc b/docs/modules/ROOT/pages/sftp-sink.adoc
index 57ac113..77993ca 100644
--- a/docs/modules/ROOT/pages/sftp-sink.adoc
+++ b/docs/modules/ROOT/pages/sftp-sink.adoc
@@ -19,10 +19,10 @@ The following table summarizes the configuration options available for the `sftp
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the FTP server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTP server| string| `22`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the FTP server| string| | 
 | *password {empty}* *| Password| The password to access the FTP server| string| | 
-| *port {empty}* *| Port| Port of the FTP server| string| `22`| 
 | *username {empty}* *| Username| The username to access the FTP server| string| | 
 | fileExist| File Existence| How to behave in case of file already existent. There are 4 enums and the value can be one of Override, Append, Fail or Ignore| string| `"Override"`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -57,8 +57,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: sftp-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -81,7 +81,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind channel/mychannel sftp-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind channel/mychannel sftp-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -109,8 +109,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: sftp-sink
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
 
@@ -134,7 +134,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 sftp-sink -p "sink.directoryName=The Directory Name" -p "sink.host=The Host" -p "sink.password=The Password" -p "sink.username=The Username"
+kamel bind kafka.strimzi.io/v1beta1:KafkaTopic:my-topic sftp-sink -p "sink.connectionHost=The Connection Host" -p "sink.directoryName=The Directory Name" -p "sink.password=The Password" -p "sink.username=The Username"
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
diff --git a/docs/modules/ROOT/pages/sftp-source.adoc b/docs/modules/ROOT/pages/sftp-source.adoc
index 6ab94eb..767d4a5 100644
--- a/docs/modules/ROOT/pages/sftp-source.adoc
+++ b/docs/modules/ROOT/pages/sftp-source.adoc
@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `sftp
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
+| *connectionHost {empty}* *| Connection Host| Hostname of the SFTP server| string| | 
+| *connectionPort {empty}* *| Connection Port| Port of the FTP server| string| `22`| 
 | *directoryName {empty}* *| Directory Name| The starting directory| string| | 
-| *host {empty}* *| Host| Hostname of the SFTP server| string| | 
 | *password {empty}* *| Password| The password to access the SFTP server| string| | 
-| *port {empty}* *| Port| Port of the FTP server| string| `22`| 
 | *username {empty}* *| Username| The username to access the SFTP server| string| | 
 | idempotent| Idempotency| Skip already processed files.| boolean| `true`| 
 | passiveMode| Passive Mode| Sets passive mode connection| boolean| `false`| 
@@ -47,8 +47,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: sftp-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -76,7 +76,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind sftp-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
+kamel bind sftp-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -99,8 +99,8 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: sftp-source
     properties:
+      connectionHost: "The Connection Host"
       directoryName: "The Directory Name"
-      host: "The Host"
       password: "The Password"
       username: "The Username"
   sink:
@@ -129,7 +129,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind sftp-source -p "source.directoryName=The Directory Name" -p "source.host=The Host" -p "source.password=The Password" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind sftp-source -p "source.connectionHost=The Connection Host" -p "source.directoryName=The Directory Name" -p "source.password=The Password" -p "source.username=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.
diff --git a/docs/modules/ROOT/pages/sqlserver-sink.adoc b/docs/modules/ROOT/pages/sqlserver-sink.adoc
index 3701bd8..69d7237 100644
--- a/docs/modules/ROOT/pages/sqlserver-sink.adoc
+++ b/docs/modules/ROOT/pages/sqlserver-sink.adoc
@@ -30,7 +30,7 @@ The following table summarizes the configuration options available for the `sqls
 | *query {empty}* *| Query| The Query to execute against the SQL Server Database| string| | `"INSERT INTO accounts (username,city) VALUES (:#username,:#city)"`
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured SQL Server Database| string| | 
-| port| Port| Server Port for the data source| string| `1433`| 
+| serverPort| Server Port| Server Port for the data source| string| `1433`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/sqlserver-source.adoc b/docs/modules/ROOT/pages/sqlserver-source.adoc
index 1227d8d..ec2251f 100644
--- a/docs/modules/ROOT/pages/sqlserver-source.adoc
+++ b/docs/modules/ROOT/pages/sqlserver-source.adoc
@@ -23,7 +23,7 @@ The following table summarizes the configuration options available for the `sqls
 | *serverName {empty}* *| Server Name| Server Name for the data source| string| | `"localhost"`
 | *username {empty}* *| Username| The username to use for accessing a secured SQL Server Database| string| | 
 | consumedQuery| Consumed Query| A query to run on a tuple consumed| string| | `"DELETE FROM accounts where user_id = :#user_id"`
-| port| Port| Server Port for the data source| string| `1433`| 
+| serverPort| Server Port| Server Port for the data source| string| `1433`| 
 |===
 
 NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/ssh-source.adoc b/docs/modules/ROOT/pages/ssh-source.adoc
index 1385aa3..7072fc1 100644
--- a/docs/modules/ROOT/pages/ssh-source.adoc
+++ b/docs/modules/ROOT/pages/ssh-source.adoc
@@ -13,10 +13,10 @@ The following table summarizes the configuration options available for the `ssh-
 [width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
 |===
 | Property| Name| Description| Type| Default| Example
-| *host {empty}* *| Host| The SSH Host| string| | 
+| *connectionHost {empty}* *| Connection Host| The SSH Host| string| | 
+| *connectionPort {empty}* *| Connection Port| The SSH Port| string| `22`| 
 | *password {empty}* *| Password| The SSH password to use| string| | 
 | *pollCommand {empty}* *| Poll Command| The command to run while polling the SSH session| string| | `"date"`
-| *port {empty}* *| Port| The SSH Port| string| `22`| 
 | *username {empty}* *| Username| The SSH username to use| string| | 
 | delay| Delay| Milliseconds before the next poll| integer| `500`| 
 |===
@@ -45,7 +45,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ssh-source
     properties:
-      host: "The Host"
+      connectionHost: "The Connection Host"
       password: "The Password"
       pollCommand: "date"
       username: "The Username"
@@ -74,7 +74,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ssh-source -p "source.host=The Host" -p "source.password=The Password" -p "source.pollCommand=date" -p "source.username=The Username" channel/mychannel
+kamel bind ssh-source -p "source.connectionHost=The Connection Host" -p "source.password=The Password" -p "source.pollCommand=date" -p "source.username=The Username" channel/mychannel
 ----
 
 This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -97,7 +97,7 @@ spec:
       apiVersion: camel.apache.org/v1alpha1
       name: ssh-source
     properties:
-      host: "The Host"
+      connectionHost: "The Connection Host"
       password: "The Password"
       pollCommand: "date"
       username: "The Username"
@@ -127,7 +127,7 @@ The procedure described above can be simplified into a single execution of the `
 
 [source,shell]
 ----
-kamel bind ssh-source -p "source.host=The Host" -p "source.password=The Password" -p "source.pollCommand=date" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind ssh-source -p "source.connectionHost=The Connection Host" -p "source.password=The Password" -p "source.pollCommand=date" -p "source.username=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.

[camel-kamelets] 01/03: CAMEL-16788: workaround to prevent override from system env variables

Posted by nf...@apache.org.

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

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

commit 1e3e504879cdd4da59eab324bc4bf76de41f1120
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Tue Jul 6 13:13:13 2021 +0200

    CAMEL-16788: workaround to prevent override from system env variables
---
 cassandra-sink.kamelet.yaml    | 14 +++++++-------
 cassandra-source.kamelet.yaml  | 14 +++++++-------
 file-watch-source.kamelet.yaml |  6 +++---
 ftp-sink.kamelet.yaml          | 14 +++++++-------
 ftp-source.kamelet.yaml        | 14 +++++++-------
 ftps-sink.kamelet.yaml         | 14 +++++++-------
 ftps-source.kamelet.yaml       | 14 +++++++-------
 mail-imap-source.kamelet.yaml  | 14 +++++++-------
 mariadb-sink.kamelet.yaml      |  6 +++---
 mariadb-source.kamelet.yaml    |  6 +++---
 mysql-sink.kamelet.yaml        |  6 +++---
 mysql-source.kamelet.yaml      |  6 +++---
 postgresql-sink.kamelet.yaml   |  6 +++---
 postgresql-source.kamelet.yaml |  6 +++---
 rabbitmq-source.kamelet.yaml   |  5 +++--
 script/validator/validator.go  | 12 +++++++++++-
 sftp-sink.kamelet.yaml         | 14 +++++++-------
 sftp-source.kamelet.yaml       | 14 +++++++-------
 sqlserver-sink.kamelet.yaml    |  6 +++---
 sqlserver-source.kamelet.yaml  |  6 +++---
 ssh-source.kamelet.yaml        | 14 +++++++-------
 21 files changed, 111 insertions(+), 100 deletions(-)

diff --git a/cassandra-sink.kamelet.yaml b/cassandra-sink.kamelet.yaml
index 38fac30..54bd09c 100644
--- a/cassandra-sink.kamelet.yaml
+++ b/cassandra-sink.kamelet.yaml
@@ -18,21 +18,21 @@ spec:
 
       This Kamelet expects the body as JSON Array. The content of the JSON Array will be used as input for the CQL Prepared Statement set in the query parameter.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - keyspace
       - username
       - password
       - preparedStatement
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.
         type: string
         example: localhost
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port number of cassandra server(s)
         type: string
         example: 9042
@@ -77,7 +77,7 @@ spec:
             library: Jackson
             useList: true
       - to: 
-          uri: "cql://{{host}}:{{port}}/{{keyspace}}"
+          uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
           parameters:
             username: "{{username}}"
             password: "{{password}}"
diff --git a/cassandra-source.kamelet.yaml b/cassandra-source.kamelet.yaml
index 7084945..52645f1 100644
--- a/cassandra-source.kamelet.yaml
+++ b/cassandra-source.kamelet.yaml
@@ -16,21 +16,21 @@ spec:
     description: |-
       Query a Cassandra cluster table.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - keyspace
       - username
       - password
       - query
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.
         type: string
         example: localhost
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port number of cassandra server(s)
         type: string
         example: 9042
@@ -73,7 +73,7 @@ spec:
   - "camel:cassandraql"
   flow:
     from:
-      uri: "cql://{{host}}:{{port}}/{{keyspace}}"
+      uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"
diff --git a/file-watch-source.kamelet.yaml b/file-watch-source.kamelet.yaml
index 7bbf82d..0bd8029 100644
--- a/file-watch-source.kamelet.yaml
+++ b/file-watch-source.kamelet.yaml
@@ -16,11 +16,11 @@ spec:
     description: |-
       Receive events related to a file or folder. It may require a volume mounting on Kubernetes.
     required:
-      - path
+      - filePath
       - events
     type: object
     properties:
-      path:
+      filePath:
         title: Path to Watch
         description: Path of file or folder to watch
         type: string
@@ -34,7 +34,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "file-watch:{{path}}"
+      uri: "file-watch:{{filePath}}"
       parameters:
         events: "{{events}}"
       steps:
diff --git a/ftp-sink.kamelet.yaml b/ftp-sink.kamelet.yaml
index 06e6c0b..9620889 100644
--- a/ftp-sink.kamelet.yaml
+++ b/ftp-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "ftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "ftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/ftp-source.kamelet.yaml b/ftp-source.kamelet.yaml
index 0848b44..4b84170 100644
--- a/ftp-source.kamelet.yaml
+++ b/ftp-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an FTP Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "ftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/ftps-sink.kamelet.yaml b/ftps-sink.kamelet.yaml
index da3965f..0e24a7a 100644
--- a/ftps-sink.kamelet.yaml
+++ b/ftps-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "ftps:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "ftps:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/ftps-source.kamelet.yaml b/ftps-source.kamelet.yaml
index 9452b10..036b92d 100644
--- a/ftps-source.kamelet.yaml
+++ b/ftps-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an FTPS Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTPS server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTPS server
         type: string
         default: 21
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ftps:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "ftps:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/mail-imap-source.kamelet.yaml b/mail-imap-source.kamelet.yaml
index 7ba673b..38897c4 100644
--- a/mail-imap-source.kamelet.yaml
+++ b/mail-imap-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive unread emails from an IMAP mail server, marking them as read once they are received.
     required:
-    - host
-    - port
+    - connectionHost
+    - connectionPort
     - username
     - password
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: The IMAP server host
         type: string
         example: imap.gmail.com
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: The IMAP server port
         type: string
         default: 993
@@ -59,7 +59,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "imaps:{{host}}:{{port}}"
+      uri: "imaps:{{connectionHost}}:{{connectionPort}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"
diff --git a/mariadb-sink.kamelet.yaml b/mariadb-sink.kamelet.yaml
index a20a46d..daf482b 100644
--- a/mariadb-sink.kamelet.yaml
+++ b/mariadb-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.mariadb.jdbc.Driver'
     from:
diff --git a/mariadb-source.kamelet.yaml b/mariadb-source.kamelet.yaml
index cb29890..f136bea 100644
--- a/mariadb-source.kamelet.yaml
+++ b/mariadb-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.mariadb.jdbc.Driver'
     from:
diff --git a/mysql-sink.kamelet.yaml b/mysql-sink.kamelet.yaml
index 81ee38e..e9dcd2e 100644
--- a/mysql-sink.kamelet.yaml
+++ b/mysql-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'com.mysql.cj.jdbc.Driver'
     from:
diff --git a/mysql-source.kamelet.yaml b/mysql-source.kamelet.yaml
index 345f522..6f5b717 100644
--- a/mysql-source.kamelet.yaml
+++ b/mysql-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'com.mysql.cj.jdbc.Driver'
     from:
diff --git a/postgresql-sink.kamelet.yaml b/postgresql-sink.kamelet.yaml
index d435d02..dd3a42c 100644
--- a/postgresql-sink.kamelet.yaml
+++ b/postgresql-sink.kamelet.yaml
@@ -36,8 +36,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 5432
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.postgresql.Driver'
     from:
diff --git a/postgresql-source.kamelet.yaml b/postgresql-source.kamelet.yaml
index 83bf356..d1dd675 100644
--- a/postgresql-source.kamelet.yaml
+++ b/postgresql-source.kamelet.yaml
@@ -28,8 +28,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 5432
@@ -77,7 +77,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.postgresql.Driver'
     from:
diff --git a/rabbitmq-source.kamelet.yaml b/rabbitmq-source.kamelet.yaml
index 20e5d3c..c210cd0 100644
--- a/rabbitmq-source.kamelet.yaml
+++ b/rabbitmq-source.kamelet.yaml
@@ -26,8 +26,8 @@ spec:
         title: Addresses
         description: Comma separated list of RabbitMQ broker addresses
         type: string
-      port:
-        title: Port
+      portNumber:
+        title: Port Number
         description: Port of the RabbitMQ server
         type: string
         default: 5672
@@ -56,5 +56,6 @@ spec:
         password: "{{password}}"
         username: "{{username}}"
         addresses: "{{addresses}}"
+        portNumber: "{{portNumber}}"
       steps:
       - to: "kamelet:sink"
diff --git a/script/validator/validator.go b/script/validator/validator.go
index 6e14b3b..4d6ebcf 100644
--- a/script/validator/validator.go
+++ b/script/validator/validator.go
@@ -26,6 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
 
+var (
+	// Needed until this is fixed: https://issues.apache.org/jira/browse/CAMEL-16788
+	forbiddenParameterNames = []string{"home", "hostname", "language", "lang", "namespace", "path", "podname", "pod-name", "port", "pwd", "shell", "term"}
+)
+
 func main() {
 	if len(os.Args) != 2 {
 		println("usage: validator kamelets-path")
@@ -62,7 +67,7 @@ func verifyMissingDependencies(kamelets []KameletInfo) (errors []error) {
 
 		code := camelapiv1.SourceSpec{
 			DataSpec: camelapiv1.DataSpec{
-				Name: "source.yaml",
+				Name:    "source.yaml",
 				Content: string(yamlDslFlow),
 			},
 			Language: camelapiv1.LanguageYaml,
@@ -216,6 +221,11 @@ func verifyParameters(kamelets []KameletInfo) (errors []error) {
 			errors = append(errors, fmt.Errorf("kamelet %q does not contain a definition of type \"object\"", kamelet.Name))
 		}
 		for k, p := range kamelet.Spec.Definition.Properties {
+			for _, f := range forbiddenParameterNames {
+				if strings.EqualFold(k, f) {
+					errors = append(errors, fmt.Errorf("property name %q is using a reserved keyword in kamelet %q", k, kamelet.Name))
+				}
+			}
 			if p.Type == "" {
 				errors = append(errors, fmt.Errorf("property %q in kamelet %q does not contain type", k, kamelet.Name))
 			}
diff --git a/sftp-sink.kamelet.yaml b/sftp-sink.kamelet.yaml
index 8e88037..f5ccb47 100644
--- a/sftp-sink.kamelet.yaml
+++ b/sftp-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 22
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "sftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "sftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/sftp-source.kamelet.yaml b/sftp-source.kamelet.yaml
index 65e6e52..3db56c3 100644
--- a/sftp-source.kamelet.yaml
+++ b/sftp-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an SFTP Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the SFTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 22
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "sftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "sftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/sqlserver-sink.kamelet.yaml b/sqlserver-sink.kamelet.yaml
index c6aec07..4db5e6b 100644
--- a/sqlserver-sink.kamelet.yaml
+++ b/sqlserver-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 1433
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{port}};databaseName={{databaseName}}'
+            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}}'
           - key: driverClassName
             value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
diff --git a/sqlserver-source.kamelet.yaml b/sqlserver-source.kamelet.yaml
index 2015372..4054976 100644
--- a/sqlserver-source.kamelet.yaml
+++ b/sqlserver-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 1433
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{port}};databaseName={{databaseName}}'
+            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}}'
           - key: driverClassName
             value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
diff --git a/ssh-source.kamelet.yaml b/ssh-source.kamelet.yaml
index b985083..4aaf2d4 100644
--- a/ssh-source.kamelet.yaml
+++ b/ssh-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from SSH session.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - pollCommand
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: The SSH Host
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: The SSH Port
         type: string
         default: 22
@@ -61,7 +61,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ssh://{{host}}:{{port}}"
+      uri: "ssh://{{connectionHost}}:{{connectionPort}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"

[camel-kamelets] 02/03: CAMEL-16788: regen

Posted by nf...@apache.org.

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

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

commit f85a4130db7c33474f3b2aeab3f9d9c8c930d4e5
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Tue Jul 6 13:21:16 2021 +0200

    CAMEL-16788: regen
---
 .../main/resources/kamelets/cassandra-sink.kamelet.yaml    | 14 +++++++-------
 .../main/resources/kamelets/cassandra-source.kamelet.yaml  | 14 +++++++-------
 .../main/resources/kamelets/file-watch-source.kamelet.yaml |  6 +++---
 .../src/main/resources/kamelets/ftp-sink.kamelet.yaml      | 14 +++++++-------
 .../src/main/resources/kamelets/ftp-source.kamelet.yaml    | 14 +++++++-------
 .../src/main/resources/kamelets/ftps-sink.kamelet.yaml     | 14 +++++++-------
 .../src/main/resources/kamelets/ftps-source.kamelet.yaml   | 14 +++++++-------
 .../main/resources/kamelets/mail-imap-source.kamelet.yaml  | 14 +++++++-------
 .../src/main/resources/kamelets/mariadb-sink.kamelet.yaml  |  6 +++---
 .../main/resources/kamelets/mariadb-source.kamelet.yaml    |  6 +++---
 .../src/main/resources/kamelets/mysql-sink.kamelet.yaml    |  6 +++---
 .../src/main/resources/kamelets/mysql-source.kamelet.yaml  |  6 +++---
 .../main/resources/kamelets/postgresql-sink.kamelet.yaml   |  6 +++---
 .../main/resources/kamelets/postgresql-source.kamelet.yaml |  6 +++---
 .../main/resources/kamelets/rabbitmq-source.kamelet.yaml   |  5 +++--
 .../src/main/resources/kamelets/sftp-sink.kamelet.yaml     | 14 +++++++-------
 .../src/main/resources/kamelets/sftp-source.kamelet.yaml   | 14 +++++++-------
 .../main/resources/kamelets/sqlserver-sink.kamelet.yaml    |  6 +++---
 .../main/resources/kamelets/sqlserver-source.kamelet.yaml  |  6 +++---
 .../src/main/resources/kamelets/ssh-source.kamelet.yaml    | 14 +++++++-------
 20 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
index 38fac30..54bd09c 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
@@ -18,21 +18,21 @@ spec:
 
       This Kamelet expects the body as JSON Array. The content of the JSON Array will be used as input for the CQL Prepared Statement set in the query parameter.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - keyspace
       - username
       - password
       - preparedStatement
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.
         type: string
         example: localhost
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port number of cassandra server(s)
         type: string
         example: 9042
@@ -77,7 +77,7 @@ spec:
             library: Jackson
             useList: true
       - to: 
-          uri: "cql://{{host}}:{{port}}/{{keyspace}}"
+          uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
           parameters:
             username: "{{username}}"
             password: "{{password}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-source.kamelet.yaml
index 7084945..52645f1 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/cassandra-source.kamelet.yaml
@@ -16,21 +16,21 @@ spec:
     description: |-
       Query a Cassandra cluster table.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - keyspace
       - username
       - password
       - query
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname(s) cassandra server(s). Multiple hosts can be separated by comma.
         type: string
         example: localhost
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port number of cassandra server(s)
         type: string
         example: 9042
@@ -73,7 +73,7 @@ spec:
   - "camel:cassandraql"
   flow:
     from:
-      uri: "cql://{{host}}:{{port}}/{{keyspace}}"
+      uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/file-watch-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/file-watch-source.kamelet.yaml
index 7bbf82d..0bd8029 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/file-watch-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/file-watch-source.kamelet.yaml
@@ -16,11 +16,11 @@ spec:
     description: |-
       Receive events related to a file or folder. It may require a volume mounting on Kubernetes.
     required:
-      - path
+      - filePath
       - events
     type: object
     properties:
-      path:
+      filePath:
         title: Path to Watch
         description: Path of file or folder to watch
         type: string
@@ -34,7 +34,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "file-watch:{{path}}"
+      uri: "file-watch:{{filePath}}"
       parameters:
         events: "{{events}}"
       steps:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-sink.kamelet.yaml
index 06e6c0b..9620889 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "ftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "ftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-source.kamelet.yaml
index 0848b44..4b84170 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftp-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an FTP Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "ftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-sink.kamelet.yaml
index da3965f..0e24a7a 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 21
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "ftps:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "ftps:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-source.kamelet.yaml
index 9452b10..036b92d 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/ftps-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an FTPS Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTPS server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTPS server
         type: string
         default: 21
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ftps:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "ftps:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/mail-imap-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
index 7ba673b..38897c4 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive unread emails from an IMAP mail server, marking them as read once they are received.
     required:
-    - host
-    - port
+    - connectionHost
+    - connectionPort
     - username
     - password
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: The IMAP server host
         type: string
         example: imap.gmail.com
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: The IMAP server port
         type: string
         default: 993
@@ -59,7 +59,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "imaps:{{host}}:{{port}}"
+      uri: "imaps:{{connectionHost}}:{{connectionPort}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
index a20a46d..daf482b 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.mariadb.jdbc.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-source.kamelet.yaml
index cb29890..f136bea 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/mariadb-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.mariadb.jdbc.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-sink.kamelet.yaml
index 81ee38e..e9dcd2e 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'com.mysql.cj.jdbc.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-source.kamelet.yaml
index 345f522..6f5b717 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/mysql-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 3306
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'com.mysql.cj.jdbc.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
index d435d02..dd3a42c 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
@@ -36,8 +36,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 5432
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.postgresql.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-source.kamelet.yaml
index 83bf356..d1dd675 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/postgresql-source.kamelet.yaml
@@ -28,8 +28,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 5432
@@ -77,7 +77,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{port}}/{{databaseName}}'
+            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           - key: driverClassName
             value: 'org.postgresql.Driver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/rabbitmq-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/rabbitmq-source.kamelet.yaml
index 20e5d3c..c210cd0 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/rabbitmq-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/rabbitmq-source.kamelet.yaml
@@ -26,8 +26,8 @@ spec:
         title: Addresses
         description: Comma separated list of RabbitMQ broker addresses
         type: string
-      port:
-        title: Port
+      portNumber:
+        title: Port Number
         description: Port of the RabbitMQ server
         type: string
         default: 5672
@@ -56,5 +56,6 @@ spec:
         password: "{{password}}"
         username: "{{username}}"
         addresses: "{{addresses}}"
+        portNumber: "{{portNumber}}"
       steps:
       - to: "kamelet:sink"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-sink.kamelet.yaml
index 8e88037..f5ccb47 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-sink.kamelet.yaml
@@ -22,19 +22,19 @@ spec:
 
       If the header won't be set the exchange ID will be used as file name.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the FTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 22
@@ -86,7 +86,7 @@ spec:
                 name: CamelFileName
                 simple: "${header[ce-file]}"
       - to:
-          uri: "sftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+          uri: "sftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
           parameters:
             password: "{{password}}"
             passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-source.kamelet.yaml
index 65e6e52..3db56c3 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/sftp-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from an SFTP Server.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - directoryName
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: Hostname of the SFTP server
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: Port of the FTP server
         type: string
         default: 22
@@ -74,7 +74,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "sftp:{{username}}@{{host}}:{{port}}/{{directoryName}}"
+      uri: "sftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
         password: "{{password}}"
         passiveMode: "{{passiveMode}}"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
index c6aec07..4db5e6b 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
@@ -40,8 +40,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 1433
@@ -83,7 +83,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{port}};databaseName={{databaseName}}'
+            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}}'
           - key: driverClassName
             value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
index 2015372..4054976 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
@@ -32,8 +32,8 @@ spec:
         description: Server Name for the data source
         type: string
         example: localhost
-      port:
-        title: Port
+      serverPort:
+        title: Server Port
         description: Server Port for the data source
         type: string
         default: 1433
@@ -80,7 +80,7 @@ spec:
           - key: password
             value: '{{password}}'
           - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{port}};databaseName={{databaseName}}'
+            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}}'
           - key: driverClassName
             value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/ssh-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/ssh-source.kamelet.yaml
index b985083..4aaf2d4 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/ssh-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/ssh-source.kamelet.yaml
@@ -16,19 +16,19 @@ spec:
     description: |-
       Receive data from SSH session.
     required:
-      - host
-      - port
+      - connectionHost
+      - connectionPort
       - username
       - password
       - pollCommand
     type: object
     properties:
-      host:
-        title: Host
+      connectionHost:
+        title: Connection Host
         description: The SSH Host
         type: string
-      port:
-        title: Port
+      connectionPort:
+        title: Connection Port
         description: The SSH Port
         type: string
         default: 22
@@ -61,7 +61,7 @@ spec:
     - "camel:kamelet"
   flow:
     from:
-      uri: "ssh://{{host}}:{{port}}"
+      uri: "ssh://{{connectionHost}}:{{connectionPort}}"
       parameters:
         username: "{{username}}"
         password: "{{password}}"