You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/01/12 01:57:27 UTC
[camel-kafka-connector] branch camel-master updated (d2d064c ->
b6d8129)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
discard d2d064c Avoid slashes on RabbitMQ component
omit 18b0fd4 Avoid slashes in sjms2 URLs
omit a2185b7 Fix issue #159: camel components secret options are showed in logs
omit 360df65 Bump camel dependency to use the latest 3.8.0-SNAPSHOT
add 13ddc0c Removed download page
add d5527c5 Added a JDBC test case that does not use a custom test data source
add 072b2e2 Update try-it-out-on-kubernetes procedure
add ed26a8b Ensure the DLQ configuration from Kafka Connect is correctly handled (issue #835)
add 9f95613 Create timeout when creating Cassandra's test table
add 4610966 Added docs for idempotency first draft
add 2156b78 Fix idempotency link in nav
add 43147a7 Fix idempotency link on index
add 438fc51 Disable couchbase tests by default because they are too unreliable
add d5161c7 Use relative link
add c0b01cc Fix xref link
new a1e629b Bump camel dependency to use the latest 3.8.0-SNAPSHOT
new 5394a24 Fix issue #159: camel components secret options are showed in logs
new 553fb13 Avoid slashes in sjms2 URLs
new b6d8129 Avoid slashes on RabbitMQ component
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d2d064c)
\
N -- N -- N refs/heads/camel-master (b6d8129)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 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:
.../apache/camel/kafkaconnector/CamelSinkTask.java | 14 ++-
.../ROOT/assets/images/ckc-idempotency-sink.png | Bin 0 -> 364925 bytes
.../ROOT/assets/images/ckc-idempotency-source.png | Bin 0 -> 290094 bytes
docs/modules/ROOT/nav.adoc | 2 +-
docs/modules/ROOT/pages/download.adoc | 10 --
docs/modules/ROOT/pages/idempotency.adoc | 61 ++++++++++
docs/modules/ROOT/pages/index.adoc | 2 +-
.../ROOT/pages/try-it-out-on-kubernetes.adoc | 54 +++++----
.../cassandra/clients/dao/TestDataDao.java | 8 +-
.../common/BasicConnectorPropertyFactory.java | 19 +++
...figBuilder.java => ComponentConfigBuilder.java} | 19 ++-
.../couchbase/sink/CamelSinkCouchbaseITCase.java | 7 +-
...e.java => CamelSinkJDBCNoDataSourceITCase.java} | 13 ++-
.../sjms2/sink/CamelSinkWithDLQJMSITCase.java | 127 +++++++++++++++++++++
14 files changed, 274 insertions(+), 62 deletions(-)
create mode 100644 docs/modules/ROOT/assets/images/ckc-idempotency-sink.png
create mode 100644 docs/modules/ROOT/assets/images/ckc-idempotency-source.png
delete mode 100644 docs/modules/ROOT/pages/download.adoc
create mode 100644 docs/modules/ROOT/pages/idempotency.adoc
copy tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/{TransformsConfigBuilder.java => ComponentConfigBuilder.java} (66%)
copy tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/sink/{CamelSinkJDBCITCase.java => CamelSinkJDBCNoDataSourceITCase.java} (93%)
create mode 100644 tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelSinkWithDLQJMSITCase.java
[camel-kafka-connector] 02/04: Fix issue #159: camel components
secret options are showed in logs
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 5394a24b2de919ce06c1e30ed044171e5fb09408
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Jan 7 11:06:19 2021 +0100
Fix issue #159: camel components secret options are showed in logs
---
.../kafkaconnector/utils/CamelKafkaConnectMain.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 5eb0df5..d031b20 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -17,8 +17,10 @@
package org.apache.camel.kafkaconnector.utils;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.stream.Collectors;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.CamelContext;
@@ -33,6 +35,7 @@ import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.SensitiveUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -203,6 +206,15 @@ public class CamelKafkaConnectMain extends SimpleMain {
return this;
}
+ private String filterSensitive(Map.Entry<Object, Object> entry) {
+
+ if (SensitiveUtils.containsSensitive((String) entry.getKey())) {
+ return entry.getKey() + "=xxxxxxx";
+ }
+ return entry.getKey() + "=" + entry.getValue();
+ }
+
+
public CamelKafkaConnectMain build(CamelContext camelContext) {
CamelKafkaConnectMain camelMain = new CamelKafkaConnectMain(camelContext);
camelMain.configure().setAutoConfigurationLogSummary(false);
@@ -210,7 +222,9 @@ public class CamelKafkaConnectMain extends SimpleMain {
Properties camelProperties = new Properties();
camelProperties.putAll(props);
- LOG.info("Setting initial properties in Camel context: [{}]", camelProperties);
+ List<String> filteredProps = camelProperties.entrySet().stream().map(this::filterSensitive).collect(Collectors.toList());
+
+ LOG.info("Setting initial properties in Camel context: [{}]", filteredProps);
camelMain.setInitialProperties(camelProperties);
// Instantianting the idempotent Repository here and inject it in registry to be referenced
[camel-kafka-connector] 04/04: Avoid slashes on RabbitMQ component
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit b6d81299384d80ade2693de51256c24228e5bf54
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Mon Jan 11 14:35:07 2021 +0100
Avoid slashes on RabbitMQ component
---
.../kafkaconnector/rabbitmq/sink/CamelRabbitMQPropertyFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/CamelRabbitMQPropertyFactory.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/CamelRabbitMQPropertyFactory.java
index 0c8e467..16c667b 100644
--- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/CamelRabbitMQPropertyFactory.java
+++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/CamelRabbitMQPropertyFactory.java
@@ -58,7 +58,7 @@ public class CamelRabbitMQPropertyFactory extends SinkConnectorPropertyFactory<C
}
public EndpointUrlBuilder<CamelRabbitMQPropertyFactory> withUrl(String exchangeName) {
- String sourceUrl = String.format("rabbitmq://%s", exchangeName);
+ String sourceUrl = String.format("rabbitmq:%s", exchangeName);
return new EndpointUrlBuilder<>(this::withSinkUrl, sourceUrl);
}
[camel-kafka-connector] 01/04: Bump camel dependency to use the
latest 3.8.0-SNAPSHOT
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit a1e629bc5609e6473e86cc7a265dd8565660491d
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Jan 7 11:18:38 2021 +0100
Bump camel dependency to use the latest 3.8.0-SNAPSHOT
---
parent/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e9f7e2..863440f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kafka.version>2.6.0</kafka.version>
- <camel.version>3.7.0</camel.version>
+ <camel.version>3.8.0-SNAPSHOT</camel.version>
<apicurio.registry.version>1.3.1.Final</apicurio.registry.version>
<resteasy.version>4.5.6.Final</resteasy.version>
<version.java>1.8</version.java>
diff --git a/pom.xml b/pom.xml
index c561d21..63a729c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
[camel-kafka-connector] 03/04: Avoid slashes in sjms2 URLs
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 553fb135812972c9a31a2dca2b78828605179b8f
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Mon Jan 11 13:08:52 2021 +0100
Avoid slashes in sjms2 URLs
---
.../apache/camel/kafkaconnector/sjms2/sink/CamelJMSPropertyFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelJMSPropertyFactory.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelJMSPropertyFactory.java
index 6e44f10..20394f2 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelJMSPropertyFactory.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/sink/CamelJMSPropertyFactory.java
@@ -40,7 +40,7 @@ final class CamelJMSPropertyFactory extends SinkConnectorPropertyFactory<CamelJM
}
public EndpointUrlBuilder<CamelJMSPropertyFactory> withUrl(String destinationName) {
- String queueUrl = String.format("sjms2://%s", destinationName);
+ String queueUrl = String.format("sjms2:%s", destinationName);
return new EndpointUrlBuilder<>(this::withSinkUrl, queueUrl);
}