You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2025/04/24 10:40:21 UTC
(camel-quarkus) branch 3.20.x updated (6c5545cc1b -> 846389ff6c)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch 3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 6c5545cc1b Drop Camel http from Knative consumers list Fixes #7272
new 50f77c654c Add missing QuarkusTestResource annotations to k8s ConfigMap & Secret reload tests
new 14875a165d Fixes #7286: aws2-s3 tests fail on FIPS
new 846389ff6c Fix #7280 to check defualt bean only with @Default qualifier
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:
.../java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java | 2 +-
.../org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java | 5 +++--
.../org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java | 2 ++
.../kubernetes/it/KubernetesConfigMapContextReloadTest.java | 2 ++
.../component/kubernetes/it/KubernetesSecretContextReloadTest.java | 2 ++
5 files changed, 10 insertions(+), 3 deletions(-)
(camel-quarkus) 01/03: Add missing QuarkusTestResource annotations to k8s ConfigMap & Secret reload tests
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 50f77c654c0d8bf6a3dcfda155ac7342995c9f90
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Apr 22 15:23:02 2025 +0100
Add missing QuarkusTestResource annotations to k8s ConfigMap & Secret reload tests
---
.../component/kubernetes/it/KubernetesConfigMapContextReloadTest.java | 2 ++
.../component/kubernetes/it/KubernetesSecretContextReloadTest.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesConfigMapContextReloadTest.java b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesConfigMapContextReloadTest.java
index 54f39c10f5..845ff607c0 100644
--- a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesConfigMapContextReloadTest.java
+++ b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesConfigMapContextReloadTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.kubernetes.it;
import java.time.Duration;
import java.util.Map;
+import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.QuarkusTestProfile;
import io.quarkus.test.junit.TestProfile;
@@ -30,6 +31,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
+@QuarkusTestResource(CamelQuarkusKubernetesServerTestResource.class)
@TestProfile(KubernetesConfigMapContextReloadTest.KubernetesConfigMapContextReloadTestProfile.class)
@QuarkusTest
class KubernetesConfigMapContextReloadTest {
diff --git a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesSecretContextReloadTest.java b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesSecretContextReloadTest.java
index 71f062b1a6..1ff23b7163 100644
--- a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesSecretContextReloadTest.java
+++ b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesSecretContextReloadTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.QuarkusTestProfile;
import io.quarkus.test.junit.TestProfile;
@@ -34,6 +35,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
+@QuarkusTestResource(CamelQuarkusKubernetesServerTestResource.class)
@TestProfile(KubernetesSecretContextReloadTest.KubernetesSecretContextReloadTestProfile.class)
@QuarkusTest
class KubernetesSecretContextReloadTest {
(camel-quarkus) 02/03: Fixes #7286: aws2-s3 tests fail on FIPS
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 14875a165de1ea7eb0d92f8c8df7075a66b40071
Author: Jiri Ondrusek <on...@gmail.com>
AuthorDate: Tue Apr 22 13:55:41 2025 +0200
Fixes #7286: aws2-s3 tests fail on FIPS
---
.../org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java | 5 +++--
.../org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
index 248e5e769d..67a83d37c4 100644
--- a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
+++ b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
@@ -20,6 +20,7 @@ import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
+import java.util.Random;
import java.util.UUID;
import java.util.stream.Stream;
@@ -195,8 +196,8 @@ class Aws2S3Test extends BaseAWs2TestSupport {
@Test
public void upload() throws Exception {
final String oid = UUID.randomUUID().toString();
- final String content = RandomStringUtils.randomAlphabetic(8 * 1024 * 1024);
-
+ //pseudo random data are fine -> if secureRandom is used in FIPS -> sun.security.pkcs11.wrapper.PKCS11Exception: CKR_DEVICE_ERROR
+ final String content = RandomStringUtils.random(8 * 1024 * 1024, 0, 0, true, true, null, new Random());
try {
RestAssured.given()
.contentType(ContentType.TEXT)
diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
index 10abd9e2c9..b7d929a66d 100644
--- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
+++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
@@ -89,6 +89,8 @@ public final class Aws2TestResource implements QuarkusTestResourceLifecycleManag
.withServices(services);
localstack.withEnv("LS_LOG", localstackLogLevel);
localstack.withEnv("PROVIDER_OVERRIDE_CLOUDWATCH", "v1");
+ localstack.withEnv("AWS_ACCESS_KEY_ID", "testAccessKeyId"); //has to be longer then `test`, to work on FIPS systems
+ localstack.withEnv("AWS_SECRET_ACCESS_KEY", "testSecretKeyId");
localstack.withLogConsumer(new Slf4jLogConsumer(LOG));
localstack.start();
(camel-quarkus) 03/03: Fix #7280 to check defualt bean only with @Default qualifier
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 846389ff6c8cc7ef828db65701c1b89e73edac63
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Wed Apr 23 14:26:40 2025 +0800
Fix #7280 to check defualt bean only with @Default qualifier
---
.../main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
index 2b860c15b9..6382cd7b0c 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
@@ -216,6 +216,6 @@ public final class RuntimeBeanRepository implements BeanRepository {
}
private boolean isDefaultBean(InjectableBean<?> bean) {
- return bean.isDefaultBean() || bean.getQualifiers().stream().anyMatch(q -> q.annotationType().equals(Default.class));
+ return bean.getQualifiers().stream().anyMatch(q -> q.annotationType().equals(Default.class));
}
}