This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new ef042e3ef8 Upgrade Floci container image to 2.2.0
ef042e3ef8 is described below
commit ef042e3ef886fae597074755c1e165477b1c2b29
Author: James Netherton <[email protected]>
AuthorDate: Thu Oct 8 08:15:42 2026 +0100
Upgrade Floci container image to 2.2.0
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
.../component/aws2/eks/it/Aws2EksTestEnvCustomizer.java | 6 ++++++
.../component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java | 11 +++--------
.../camel/quarkus/test/support/aws2/Aws2TestResource.java | 5 +++--
pom.xml | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/integration-test-groups/aws2/aws2-eks/src/test/java/org/apache/camel/quarkus/component/aws2/eks/it/Aws2EksTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-eks/src/test/java/org/apache/camel/quarkus/component/aws2/eks/it/Aws2EksTestEnvCustomizer.java
index 1f2f8a015b..8ff35468e2 100644
---
a/integration-test-groups/aws2/aws2-eks/src/test/java/org/apache/camel/quarkus/component/aws2/eks/it/Aws2EksTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-eks/src/test/java/org/apache/camel/quarkus/component/aws2/eks/it/Aws2EksTestEnvCustomizer.java
@@ -29,5 +29,11 @@ public class Aws2EksTestEnvCustomizer implements
Aws2TestEnvCustomizer {
@Override
public void customize(Aws2TestEnvContext envContext) {
+ if (envContext.isMockBackend()) {
+ // Floci validates that subnets exist, so use those from its
default VPC
+ String region = envContext.getRegion();
+ envContext.property("aws.eks.subnets",
+ String.format("subnet-default-%s-a,subnet-default-%s-b",
region, region));
+ }
}
}
diff --git
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
index 19d81a23f5..47414457df 100644
---
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
+++
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
@@ -96,14 +96,9 @@ class Aws2KinesisFirehoseTest extends BaseAWs2TestSupport {
LOG.info("Checking object " + obj.key() + " of size "
+ obj.size());
try (ResponseInputStream<GetObjectResponse> o = client
.getObject(GetObjectRequest.builder().bucket(bucketName).key(obj.key()).build()))
{
- final StringBuilder sb = new
StringBuilder(msg.length());
- final byte[] buf = new byte[1024];
- int len;
- while ((len = o.read(buf)) >= 0 && sb.length() <
msgPrefix.length()) {
- sb.append(new String(buf, 0, len,
StandardCharsets.UTF_8));
- }
- final String foundContent = sb.toString();
- if (foundContent.startsWith(msgPrefix)) {
+ // Firehose may batch other records sent to the
stream into the same object
+ final String foundContent = new
String(o.readAllBytes(), StandardCharsets.UTF_8);
+ if (foundContent.contains(msgPrefix)) {
/* Yes, this is what we have sent */
LOG.info("Found the expected content in object
" + obj.key());
return true;
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 70171414bb..29f6302ebd 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
@@ -74,10 +74,11 @@ public final class Aws2TestResource implements
QuarkusTestResourceLifecycleManag
.distinct()
.toArray(Service[]::new);
+ // EKS CreateCluster attaches to the VPC Docker network and stalls
on retries without the socket
boolean needsDockerSocket = customizers.stream()
.map(Aws2TestEnvCustomizer::awsServices)
.flatMap(Stream::of)
- .anyMatch(s -> s == Service.LAMBDA);
+ .anyMatch(s -> s == Service.LAMBDA || s == Service.EKS);
boolean needsEksMock = customizers.stream()
.map(Aws2TestEnvCustomizer::awsServices)
@@ -105,7 +106,7 @@ public final class Aws2TestResource implements
QuarkusTestResourceLifecycleManag
floci.withFileSystemBind(dockerSocket.toString(),
"/var/run/docker.sock", BindMode.READ_WRITE)
.withPrivilegedMode(true);
} else {
- LOG.warn("Docker socket not found at {}. Lambda container
execution will not be available.",
+ LOG.warn("Docker socket not found at {}. Lambda and EKS
tests may fail or time out.",
dockerSocket);
}
}
diff --git a/pom.xml b/pom.xml
index 7c78388f46..1c5f45c39a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
<fhir.container.image.base>mirror.gcr.io/hapiproject/hapi</fhir.container.image.base>
<fhir.container.image>${fhir.container.image.base}:v8.10.0-3</fhir.container.image>
<fhir-dstu.container.image>${fhir.container.image.base}:v4.2.0</fhir-dstu.container.image>
-
<floci.container.image>mirror.gcr.io/floci/floci:1.6.0</floci.container.image>
+
<floci.container.image>mirror.gcr.io/floci/floci:2.2.0</floci.container.image>
<google-cloud-sdk.container.image>gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators</google-cloud-sdk.container.image>
<google-storage.container.image>mirror.gcr.io/fsouza/fake-gcs-server:1.52.3</google-storage.container.image>
<greenmail.container.image>mirror.gcr.io/greenmail/standalone:2.1.8</greenmail.container.image>
