This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 983a3430a chore: solr-source uses the SEARCH operation, the Redshift
Kamelets take connectionProperties (#3170) (#3181)
983a3430a is described below
commit 983a3430a8328940854315e59e6cafd0509ee5a6
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Nov 18 09:58:47 2026 +0100
chore: solr-source uses the SEARCH operation, the Redshift Kamelets take
connectionProperties (#3170) (#3181)
solr-source set CamelSolrOperation=QUERY, which Camel 4.24 warns about on
every poll; SEARCH gives the same result. aws-redshift-sink and
aws-redshift-source get the optional connectionProperties of the other SQL
Kamelets, passed to the Amazon Redshift JDBC driver.
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
kamelets/aws-redshift-sink.kamelet.yaml | 8 +++++++-
kamelets/aws-redshift-source.kamelet.yaml | 8 +++++++-
kamelets/solr-source.kamelet.yaml | 2 +-
.../src/main/resources/META-INF/kamelets-index.json | 4 ++--
.../src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml | 8 +++++++-
.../src/main/resources/kamelets/aws-redshift-source.kamelet.yaml | 8 +++++++-
.../src/main/resources/kamelets/solr-source.kamelet.yaml | 2 +-
7 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/kamelets/aws-redshift-sink.kamelet.yaml
b/kamelets/aws-redshift-sink.kamelet.yaml
index 4b420ab52..9a65f89ac 100644
--- a/kamelets/aws-redshift-sink.kamelet.yaml
+++ b/kamelets/aws-redshift-sink.kamelet.yaml
@@ -39,7 +39,7 @@ spec:
Output: when it is used inside a route, the body afterwards is the JSON
object parsed as a Map, and the `CamelSqlUpdateCount` header holds the number
of rows changed.
- Good to know: a body that is not a JSON object fails, and so does a body
that lacks a field named in `query` when no header has that name either. It
logs in with a database user and password, not with AWS keys, and connects with
the Amazon Redshift JDBC driver, which uses TLS by default.
+ Good to know: a body that is not a JSON object fails, and so does a body
that lacks a field named in `query` when no header has that name either. It
logs in with a database user and password, not with AWS keys, and connects with
the Amazon Redshift JDBC driver, which uses TLS by default. Other settings of
the driver go in `connectionProperties`.
required:
- serverName
- username
@@ -81,6 +81,11 @@ spec:
description: The name of the database in the cluster, such as `dev`,
the database a new cluster has.
type: string
example: dev
+ connectionProperties:
+ title: Connection Properties
+ description: "Extra settings for the Amazon Redshift JDBC driver, as
`name=value` pairs separated by `;`, such as `loginTimeout=30`. When it is not
set, the driver connects with TLS, as it does by default. The value is not
hidden like a password, and it can show in the log when the integration starts,
so do not put a password in it."
+ type: string
+ example: loginTimeout=30
types:
in:
mediaType: application/json
@@ -110,6 +115,7 @@ spec:
password: "{{password}}"
url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
driverClassName: com.amazon.redshift.jdbc.Driver
+ connectionProperties: "{{?connectionProperties}}"
from:
uri: kamelet:source
steps:
diff --git a/kamelets/aws-redshift-source.kamelet.yaml
b/kamelets/aws-redshift-source.kamelet.yaml
index 9d53e5740..84015f1f1 100644
--- a/kamelets/aws-redshift-source.kamelet.yaml
+++ b/kamelets/aws-redshift-source.kamelet.yaml
@@ -37,7 +37,7 @@ spec:
Output: one message per row. The body is the row as a JSON object, in
JSON text, with the column names as field names, such as
`{"id":1,"username":"alice","city":"Rome"}`. The `Content-Type` header is
`application/json`.
- Good to know: the query runs again every `delay` milliseconds, and
returns the same rows each time unless they change; set `consumedQuery` to mark
or delete each row once it has been sent. It logs in with a database user and
password, not with AWS keys, and connects with the Amazon Redshift JDBC driver,
which uses TLS by default.
+ Good to know: the query runs again every `delay` milliseconds, and
returns the same rows each time unless they change; set `consumedQuery` to mark
or delete each row once it has been sent. It logs in with a database user and
password, not with AWS keys, and connects with the Amazon Redshift JDBC driver,
which uses TLS by default. Other settings of the driver go in
`connectionProperties`.
required:
- serverName
- username
@@ -89,6 +89,11 @@ spec:
description: How long to wait between two runs of the query, in
milliseconds.
type: integer
default: 500
+ connectionProperties:
+ title: Connection Properties
+ description: "Extra settings for the Amazon Redshift JDBC driver, as
`name=value` pairs separated by `;`, such as `loginTimeout=30`. When it is not
set, the driver connects with TLS, as it does by default. The value is not
hidden like a password, and it can show in the log when the integration starts,
so do not put a password in it."
+ type: string
+ example: loginTimeout=30
types:
out:
mediaType: application/json
@@ -111,6 +116,7 @@ spec:
password: "{{password}}"
url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
driverClassName: com.amazon.redshift.jdbc.Driver
+ connectionProperties: "{{?connectionProperties}}"
from:
uri:
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
steps:
diff --git a/kamelets/solr-source.kamelet.yaml
b/kamelets/solr-source.kamelet.yaml
index 0d7101329..54ad71049 100644
--- a/kamelets/solr-source.kamelet.yaml
+++ b/kamelets/solr-source.kamelet.yaml
@@ -112,7 +112,7 @@ spec:
name: CamelSolrOperation
expression:
constant:
- expression: QUERY
+ expression: SEARCH
- setHeader:
name: CamelSolrQueryString
expression:
diff --git
a/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
b/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
index be81cbd1d..259870169 100644
--- a/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
+++ b/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
@@ -175,7 +175,7 @@
"supportLevel" : "Stable",
"title" : "AWS Redshift Sink",
"summary" : "Runs an SQL statement, such as an INSERT, on an Amazon
Redshift database for each message, with the values taken from the JSON body.",
- "description" : "Runs an SQL statement, such as an INSERT, on an Amazon
Redshift database for each message, with the values taken from the JSON
body.\n\nUse it to load events or records, such as orders or page views, into a
table of a Redshift data warehouse, or to update rows when something changes.
To read rows from Redshift, use `aws-redshift-source`.\n\nInput: the body is a
JSON object, as JSON text, such as
`{\"username\":\"alice\",\"city\":\"Rome\"}`. Each `:#name` in `query` t [...]
+ "description" : "Runs an SQL statement, such as an INSERT, on an Amazon
Redshift database for each message, with the values taken from the JSON
body.\n\nUse it to load events or records, such as orders or page views, into a
table of a Redshift data warehouse, or to update rows when something changes.
To read rows from Redshift, use `aws-redshift-source`.\n\nInput: the body is a
JSON object, as JSON text, such as
`{\"username\":\"alice\",\"city\":\"Rome\"}`. Each `:#name` in `query` t [...]
"group" : "AWS Redshift",
"namespace" : "AWS",
"provider" : "Apache Software Foundation"
@@ -185,7 +185,7 @@
"supportLevel" : "Stable",
"title" : "AWS Redshift Source",
"summary" : "Runs an SQL query on an Amazon Redshift database at regular
intervals, and sends each row of the result as a message.",
- "description" : "Runs an SQL query on an Amazon Redshift database at
regular intervals, and sends each row of the result as a message.\n\nUse it to
pick up records from a Redshift data warehouse, such as new orders or daily
figures, and pass them on to another system. To write to Redshift, use
`aws-redshift-sink`.\n\nOutput: one message per row. The body is the row as a
JSON object, in JSON text, with the column names as field names, such as
`{\"id\":1,\"username\":\"alice\",\"city\" [...]
+ "description" : "Runs an SQL query on an Amazon Redshift database at
regular intervals, and sends each row of the result as a message.\n\nUse it to
pick up records from a Redshift data warehouse, such as new orders or daily
figures, and pass them on to another system. To write to Redshift, use
`aws-redshift-sink`.\n\nOutput: one message per row. The body is the row as a
JSON object, in JSON text, with the column names as field names, such as
`{\"id\":1,\"username\":\"alice\",\"city\" [...]
"group" : "AWS Redshift",
"namespace" : "AWS",
"provider" : "Apache Software Foundation"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
index 4b420ab52..9a65f89ac 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
@@ -39,7 +39,7 @@ spec:
Output: when it is used inside a route, the body afterwards is the JSON
object parsed as a Map, and the `CamelSqlUpdateCount` header holds the number
of rows changed.
- Good to know: a body that is not a JSON object fails, and so does a body
that lacks a field named in `query` when no header has that name either. It
logs in with a database user and password, not with AWS keys, and connects with
the Amazon Redshift JDBC driver, which uses TLS by default.
+ Good to know: a body that is not a JSON object fails, and so does a body
that lacks a field named in `query` when no header has that name either. It
logs in with a database user and password, not with AWS keys, and connects with
the Amazon Redshift JDBC driver, which uses TLS by default. Other settings of
the driver go in `connectionProperties`.
required:
- serverName
- username
@@ -81,6 +81,11 @@ spec:
description: The name of the database in the cluster, such as `dev`,
the database a new cluster has.
type: string
example: dev
+ connectionProperties:
+ title: Connection Properties
+ description: "Extra settings for the Amazon Redshift JDBC driver, as
`name=value` pairs separated by `;`, such as `loginTimeout=30`. When it is not
set, the driver connects with TLS, as it does by default. The value is not
hidden like a password, and it can show in the log when the integration starts,
so do not put a password in it."
+ type: string
+ example: loginTimeout=30
types:
in:
mediaType: application/json
@@ -110,6 +115,7 @@ spec:
password: "{{password}}"
url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
driverClassName: com.amazon.redshift.jdbc.Driver
+ connectionProperties: "{{?connectionProperties}}"
from:
uri: kamelet:source
steps:
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
index 9d53e5740..84015f1f1 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
@@ -37,7 +37,7 @@ spec:
Output: one message per row. The body is the row as a JSON object, in
JSON text, with the column names as field names, such as
`{"id":1,"username":"alice","city":"Rome"}`. The `Content-Type` header is
`application/json`.
- Good to know: the query runs again every `delay` milliseconds, and
returns the same rows each time unless they change; set `consumedQuery` to mark
or delete each row once it has been sent. It logs in with a database user and
password, not with AWS keys, and connects with the Amazon Redshift JDBC driver,
which uses TLS by default.
+ Good to know: the query runs again every `delay` milliseconds, and
returns the same rows each time unless they change; set `consumedQuery` to mark
or delete each row once it has been sent. It logs in with a database user and
password, not with AWS keys, and connects with the Amazon Redshift JDBC driver,
which uses TLS by default. Other settings of the driver go in
`connectionProperties`.
required:
- serverName
- username
@@ -89,6 +89,11 @@ spec:
description: How long to wait between two runs of the query, in
milliseconds.
type: integer
default: 500
+ connectionProperties:
+ title: Connection Properties
+ description: "Extra settings for the Amazon Redshift JDBC driver, as
`name=value` pairs separated by `;`, such as `loginTimeout=30`. When it is not
set, the driver connects with TLS, as it does by default. The value is not
hidden like a password, and it can show in the log when the integration starts,
so do not put a password in it."
+ type: string
+ example: loginTimeout=30
types:
out:
mediaType: application/json
@@ -111,6 +116,7 @@ spec:
password: "{{password}}"
url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
driverClassName: com.amazon.redshift.jdbc.Driver
+ connectionProperties: "{{?connectionProperties}}"
from:
uri:
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
steps:
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
index 0d7101329..54ad71049 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/solr-source.kamelet.yaml
@@ -112,7 +112,7 @@ spec:
name: CamelSolrOperation
expression:
constant:
- expression: QUERY
+ expression: SEARCH
- setHeader:
name: CamelSolrQueryString
expression: