You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/09/02 11:19:50 UTC
[camel] branch main updated (7a83611 -> 22e37f3)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7a83611 Regen bot build should use JDK 11
new 798a6f8 Upgrade Localstack to version 0.12.17.4
new 22e37f3 Regen
The 2 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:
.../support/processor/DefaultMaskingFormatterTest.java | 13 +++++++++----
.../camel/support/processor/DefaultMaskingFormatter.java | 4 ++--
.../apache/camel/test/infra/aws2/services/AWSContainer.java | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
[camel] 02/02: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 22e37f38ead54b57f639de4edfeead1913f72e92
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 2 13:19:13 2021 +0200
Regen
---
.../support/processor/DefaultMaskingFormatterTest.java | 13 +++++++++----
.../camel/support/processor/DefaultMaskingFormatter.java | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/processor/DefaultMaskingFormatterTest.java b/core/camel-core/src/test/java/org/apache/camel/support/processor/DefaultMaskingFormatterTest.java
index ab250ad..fe51812 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/processor/DefaultMaskingFormatterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/processor/DefaultMaskingFormatterTest.java
@@ -131,11 +131,16 @@ public class DefaultMaskingFormatterTest {
formatter.addKeyword("cheese");
formatter.setMaskString("**********");
String answer
- = formatter.format("key=value, Cheese=gauda, myPassword=foo,\n myPassphrase=\"foo bar\", secretKey='!@#$%^&*() -+[]{};:'");
- assertEquals("key=value, Cheese=\"**********\", myPassword=\"**********\",\n myPassphrase=\"**********\", secretKey=\"**********\"", answer);
+ = formatter.format(
+ "key=value, Cheese=gauda, myPassword=foo,\n myPassphrase=\"foo bar\", secretKey='!@#$%^&*() -+[]{};:'");
+ assertEquals(
+ "key=value, Cheese=\"**********\", myPassword=\"**********\",\n myPassphrase=\"**********\", secretKey=\"**********\"",
+ answer);
- answer = formatter.format("<chEEse>Gauda</chEEse><xmlPassword>\n foo bar \n</xmlPassword>\n<user password=\"asdf qwert\"/>");
- assertEquals("<chEEse>**********</chEEse><xmlPassword>\n ********** \n</xmlPassword>\n<user password=\"**********\"/>", answer);
+ answer = formatter
+ .format("<chEEse>Gauda</chEEse><xmlPassword>\n foo bar \n</xmlPassword>\n<user password=\"asdf qwert\"/>");
+ assertEquals("<chEEse>**********</chEEse><xmlPassword>\n ********** \n</xmlPassword>\n<user password=\"**********\"/>",
+ answer);
answer = formatter.format(
"{\"key\" : \"value\", \"Cheese\": \"gauda\", \"Password\":\"foo\", \"Passphrase\" : \"foo bar\", \"SecretKey\" : \"!@#$%^&*() -+[]{};:'\"}");
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultMaskingFormatter.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultMaskingFormatter.java
index e66f454..d1de9bc 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultMaskingFormatter.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultMaskingFormatter.java
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
* The {@link MaskingFormatter} that searches the specified keywords in the source and replace its value with mask
* string.
* <p>
- * By default all the known secret keys from {@link SensitiveUtils#getSensitiveKeys()} are used.
- * Custom keywords can be added with the {@link #addKeyword(String)} method.
+ * By default all the known secret keys from {@link SensitiveUtils#getSensitiveKeys()} are used. Custom keywords can be
+ * added with the {@link #addKeyword(String)} method.
*/
public class DefaultMaskingFormatter implements MaskingFormatter {
[camel] 01/02: Upgrade Localstack to version 0.12.17.4
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 798a6f889b7d5331a21e4d5abbec465dd62c9a67
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 2 13:04:36 2021 +0200
Upgrade Localstack to version 0.12.17.4
---
.../java/org/apache/camel/test/infra/aws2/services/AWSContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
index 84f6f5b..1425b39 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
+++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
@@ -36,7 +36,7 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
behave as in runtime.
*/
public class AWSContainer extends GenericContainer<AWSContainer> {
- public static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.12.17";
+ public static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.12.17.4";
private static final Logger LOG = LoggerFactory.getLogger(AWSLocalContainerService.class);
private static final int SERVICE_PORT = 4566;