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 3be4108a0c7 Move aws-bedrock tests to integration-test-groups/aws2
3be4108a0c7 is described below

commit 3be4108a0c7a6d815efaf178f562e63bf5df3e7a
Author: James Netherton <[email protected]>
AuthorDate: Tue Nov 17 17:24:34 2026 +0000

    Move aws-bedrock tests to integration-test-groups/aws2
    
    Replace the integration-tests/aws2 timer route smoke test with real
    converse, converseStream and invokeTextModel tests in a new
    integration-test-groups/aws2/aws-bedrock module. They run against the
    Floci Bedrock Runtime stub by default, or real AWS when credentials are
    provided (with the model configurable via AWS_BEDROCK_MODEL_ID).
    
    The new tests revealed that aws-bedrock endpoints failed to start in
    native mode, because BedrockEndpoint always creates an async client and
    no SdkAsyncHttpService was registered. Register NettySdkAsyncHttpService
    as a service provider to fix it.
    
    Co-authored-by: Claude Opus 5.5 <[email protected]>
---
 .../bedrock/deployment/AwsBedrockProcessor.java    |   9 ++
 .../aws2/aws-bedrock/README.adoc                   |  19 ++++
 .../aws2/aws-bedrock}/pom.xml                      |  60 ++++-------
 .../aws/bedrock/it/AwsBedrockResource.java         | 120 +++++++++++++++++++++
 .../src/main/resources/application.properties      |  23 ++++
 .../component/aws/bedrock/it/AwsBedrockIT.java     |  17 +--
 .../component/aws/bedrock/it/AwsBedrockTest.java   |  87 +++++++++++++++
 .../bedrock/it/AwsBedrockTestEnvCustomizer.java    |  19 ++--
 ...quarkus.test.support.aws2.Aws2TestEnvCustomizer |   1 +
 integration-test-groups/aws2/pom.xml               |   1 +
 .../test/support/aws2/Aws2TestEnvContext.java      |   2 +
 .../camel/quarkus/test/support/aws2/Service.java   |   1 +
 integration-tests/aws2-grouped/pom.xml             |  17 +++
 integration-tests/pom.xml                          |   1 -
 tooling/scripts/test-categories.yaml               |   1 -
 15 files changed, 316 insertions(+), 62 deletions(-)

diff --git 
a/extensions/aws-bedrock/deployment/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/deployment/AwsBedrockProcessor.java
 
b/extensions/aws-bedrock/deployment/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/deployment/AwsBedrockProcessor.java
index 1375d06b755..d8ba68c86ce 100644
--- 
a/extensions/aws-bedrock/deployment/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/deployment/AwsBedrockProcessor.java
+++ 
b/extensions/aws-bedrock/deployment/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/deployment/AwsBedrockProcessor.java
@@ -18,6 +18,7 @@ package 
org.apache.camel.quarkus.component.aws.bedrock.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 
 class AwsBedrockProcessor {
 
@@ -27,4 +28,12 @@ class AwsBedrockProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
+
+    @BuildStep
+    ServiceProviderBuildItem asyncHttpService() {
+        // BedrockEndpoint always creates an async client, which needs an 
SdkAsyncHttpService in native mode
+        return new ServiceProviderBuildItem(
+                "software.amazon.awssdk.http.async.SdkAsyncHttpService",
+                
"software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService");
+    }
 }
diff --git a/integration-test-groups/aws2/aws-bedrock/README.adoc 
b/integration-test-groups/aws2/aws-bedrock/README.adoc
new file mode 100644
index 00000000000..76ba4be2232
--- /dev/null
+++ b/integration-test-groups/aws2/aws-bedrock/README.adoc
@@ -0,0 +1,19 @@
+== Camel Quarkus AWS Bedrock Integration Tests
+
+Integration tests for Camel Quarkus AWS Bedrock extension.
+
+By default the tests run against the Floci Bedrock Runtime stub, which returns 
canned responses.
+
+=== Running against real AWS
+
+Export the credentials described in the parent `README.adoc` 
(`AWS_ACCESS_KEY`, `AWS_SECRET_KEY` & `AWS_REGION`, or 
`AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=true` & `AWS_REGION`).
+
+The tests use the `amazon.nova-micro-v1:0` model by default. The model must be 
enabled for your account in the chosen region.
+To use a different model, or a cross-region inference profile (required in 
some regions), export `AWS_BEDROCK_MODEL_ID`:
+
+[source,shell]
+----
+export AWS_BEDROCK_MODEL_ID=eu.amazon.nova-micro-v1:0
+----
+
+The `invokeTextModel` test sends a request body in the Amazon Nova 
`messages-v1` format, so `AWS_BEDROCK_MODEL_ID` must reference an Amazon Nova 
text model.
diff --git a/integration-tests/aws2/pom.xml 
b/integration-test-groups/aws2/aws-bedrock/pom.xml
similarity index 72%
rename from integration-tests/aws2/pom.xml
rename to integration-test-groups/aws2/aws-bedrock/pom.xml
index 368ac452fcf..781d0c9cea2 100644
--- a/integration-tests/aws2/pom.xml
+++ b/integration-test-groups/aws2/aws-bedrock/pom.xml
@@ -17,18 +17,18 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://www.apache.org/xsd/maven-4.0.0.xsd";>
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent-it</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
+        <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-integration-test-aws2</artifactId>
-    <name>Camel Quarkus :: Integration Tests :: AWS2</name>
-    <description>The camel integration tests</description>
+    <artifactId>camel-quarkus-integration-test-aws-bedrock</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: AWS Bedrock</name>
+    <description>Integration tests for Camel Quarkus AWS Bedrock 
extension</description>
 
     <dependencies>
         <dependency>
@@ -36,12 +36,8 @@
             <artifactId>camel-quarkus-aws-bedrock</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-log</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-timer</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
 
         <!-- test dependencies -->
@@ -50,9 +46,23 @@
             <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            
<artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            
<artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
-
     <profiles>
         <profile>
             <id>native</id>
@@ -103,32 +113,6 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-                    <groupId>org.apache.camel.quarkus</groupId>
-                    <artifactId>camel-quarkus-log-deployment</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.camel.quarkus</groupId>
-                    <artifactId>camel-quarkus-timer-deployment</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
             </dependencies>
         </profile>
         <profile>
diff --git 
a/integration-test-groups/aws2/aws-bedrock/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockResource.java
 
b/integration-test-groups/aws2/aws-bedrock/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockResource.java
new file mode 100644
index 00000000000..f2a9ab0b6bb
--- /dev/null
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockResource.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.aws.bedrock.it;
+
+import java.util.List;
+import java.util.Map;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants;
+import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
+import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
+import 
software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
+import software.amazon.awssdk.services.bedrockruntime.model.Message;
+import software.amazon.awssdk.services.bedrockruntime.model.TokenUsage;
+import tools.jackson.databind.json.JsonMapper;
+
+@Path("/aws-bedrock")
+@ApplicationScoped
+public class AwsBedrockResource {
+    private static final int MAX_TOKENS = 50;
+    private static final String ENDPOINT_URI = 
"aws-bedrock:%s?operation=%s&modelId={{aws-bedrock.model-id}}";
+
+    @Inject
+    ProducerTemplate producerTemplate;
+
+    @Inject
+    JsonMapper jsonMapper;
+
+    @Path("/converse")
+    @POST
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> converse(String prompt) {
+        return converseResult(converse("converse", prompt));
+    }
+
+    @Path("/converse-stream")
+    @POST
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> converseStream(String prompt) {
+        return converseResult(converse("converseStream", prompt));
+    }
+
+    @Path("/invoke-text-model")
+    @POST
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String invokeTextModel(String prompt) {
+        // Amazon Nova messages-v1 request schema
+        String body = """
+                {
+                  "schemaVersion": "messages-v1",
+                  "messages": [{"role": "user", "content": [{"text": %s}]}],
+                  "inferenceConfig": {"maxTokens": %d}
+                }
+                """.formatted(jsonMapper.writeValueAsString(prompt), 
MAX_TOKENS);
+
+        Exchange exchange = 
producerTemplate.request(ENDPOINT_URI.formatted("invoke", "invokeTextModel"), e 
-> {
+            e.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, 
MediaType.APPLICATION_JSON);
+            
e.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, 
MediaType.APPLICATION_JSON);
+            e.getMessage().setBody(body);
+        });
+        return checkResult(exchange).getMessage().getBody().toString();
+    }
+
+    private Exchange converse(String operation, String prompt) {
+        Message userMessage = Message.builder()
+                .role(ConversationRole.USER)
+                .content(ContentBlock.fromText(prompt))
+                .build();
+
+        Exchange exchange = 
producerTemplate.request(ENDPOINT_URI.formatted(operation, operation), e -> {
+            e.getMessage().setHeader(BedrockConstants.CONVERSE_MESSAGES, 
List.of(userMessage));
+            
e.getMessage().setHeader(BedrockConstants.CONVERSE_INFERENCE_CONFIG,
+                    
InferenceConfiguration.builder().maxTokens(MAX_TOKENS).build());
+        });
+        return checkResult(exchange);
+    }
+
+    private static Map<String, Object> converseResult(Exchange exchange) {
+        org.apache.camel.Message message = exchange.getMessage();
+        TokenUsage usage = message.getHeader(BedrockConstants.CONVERSE_USAGE, 
TokenUsage.class);
+        return Map.of(
+                "text", message.getBody(String.class),
+                "stopReason", 
message.getHeader(BedrockConstants.CONVERSE_STOP_REASON, String.class),
+                "inputTokens", usage.inputTokens(),
+                "outputTokens", usage.outputTokens());
+    }
+
+    private static Exchange checkResult(Exchange exchange) {
+        if (exchange.getException() != null) {
+            throw 
RuntimeCamelException.wrapRuntimeException(exchange.getException());
+        }
+        return exchange;
+    }
+}
diff --git 
a/integration-test-groups/aws2/aws-bedrock/src/main/resources/application.properties
 
b/integration-test-groups/aws2/aws-bedrock/src/main/resources/application.properties
new file mode 100644
index 00000000000..a1677bed633
--- /dev/null
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/main/resources/application.properties
@@ -0,0 +1,23 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+camel.component.aws-bedrock.access-key=${AWS_ACCESS_KEY}
+camel.component.aws-bedrock.secret-key=${AWS_SECRET_KEY}
+camel.component.aws-bedrock.useDefaultCredentialsProvider=${AWS_USE_DEFAULT_CREDENTIALS_PROVIDER}
+camel.component.aws-bedrock.region=${AWS_REGION:us-east-1}
+
+# The model must be enabled in the AWS account. Outside us-east-1 a 
cross-region inference profile ID may be needed, e.g. eu.amazon.nova-micro-v1:0
+aws-bedrock.model-id=${AWS_BEDROCK_MODEL_ID:amazon.nova-micro-v1:0}
diff --git 
a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockIT.java
similarity index 68%
copy from 
integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
copy to 
integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockIT.java
index 468fd7e332b..888b5e0c161 100644
--- 
a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockIT.java
@@ -14,19 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.aws2;
+package org.apache.camel.quarkus.component.aws.bedrock.it;
 
-import org.apache.camel.builder.RouteBuilder;
-
-public class CamelRoute extends RouteBuilder {
-
-    @Override
-    public void configure() {
-
-        from("timer:quarkus-bedrock?repeatCount=1")
-                .to("aws-bedrock://myaccount?operation=invokeTextModel")
-                .to("log:sf?showAll=true");
-
-    }
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
+@QuarkusIntegrationTest
+class AwsBedrockIT extends AwsBedrockTest {
 }
diff --git 
a/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTest.java
 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTest.java
new file mode 100644
index 00000000000..9e7eaf33de9
--- /dev/null
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTest.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.aws.bedrock.it;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.http.ContentType;
+import org.apache.camel.quarkus.test.support.aws2.Aws2MockBackend;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.emptyOrNullString;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.oneOf;
+
+@QuarkusTest
+@QuarkusTestResource(Aws2TestResource.class)
+class AwsBedrockTest {
+    private static final String PROMPT = "Reply with the single word: Hello";
+    private static final String FLOCI_STUB_RESPONSE = "Floci stub response";
+
+    @Aws2MockBackend
+    boolean mockBackend;
+
+    @Test
+    void converse() {
+        assertConverseResponse("/aws-bedrock/converse");
+    }
+
+    @Test
+    void converseStream() {
+        assertConverseResponse("/aws-bedrock/converse-stream");
+    }
+
+    @Test
+    void invokeTextModel() {
+        if (mockBackend) {
+            given()
+                    .contentType(ContentType.TEXT)
+                    .body(PROMPT)
+                    .post("/aws-bedrock/invoke-text-model")
+                    .then()
+                    .statusCode(200)
+                    .body("outputs[0].text", is(FLOCI_STUB_RESPONSE));
+        } else {
+            given()
+                    .contentType(ContentType.TEXT)
+                    .body(PROMPT)
+                    .post("/aws-bedrock/invoke-text-model")
+                    .then()
+                    .statusCode(200)
+                    .body("output.message.content[0].text", 
not(emptyOrNullString()));
+        }
+    }
+
+    private void assertConverseResponse(String path) {
+        given()
+                .contentType(ContentType.TEXT)
+                .body(PROMPT)
+                .post(path)
+                .then()
+                .statusCode(200)
+                .body(
+                        "text", mockBackend ? 
containsString(FLOCI_STUB_RESPONSE) : not(emptyOrNullString()),
+                        "stopReason", oneOf("end_turn", "max_tokens"),
+                        "inputTokens", greaterThan(0),
+                        "outputTokens", greaterThan(0));
+    }
+}
diff --git 
a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTestEnvCustomizer.java
similarity index 61%
rename from 
integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
rename to 
integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTestEnvCustomizer.java
index 468fd7e332b..db40907040b 100644
--- 
a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/test/java/org/apache/camel/quarkus/component/aws/bedrock/it/AwsBedrockTestEnvCustomizer.java
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.component.aws2;
+package org.apache.camel.quarkus.component.aws.bedrock.it;
 
-import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer;
+import org.apache.camel.quarkus.test.support.aws2.Service;
 
-public class CamelRoute extends RouteBuilder {
+public class AwsBedrockTestEnvCustomizer implements Aws2TestEnvCustomizer {
 
     @Override
-    public void configure() {
-
-        from("timer:quarkus-bedrock?repeatCount=1")
-                .to("aws-bedrock://myaccount?operation=invokeTextModel")
-                .to("log:sf?showAll=true");
-
+    public Service[] awsServices() {
+        return new Service[] { Service.BEDROCK_RUNTIME };
     }
 
+    @Override
+    public void customize(Aws2TestEnvContext envContext) {
+    }
 }
diff --git 
a/integration-test-groups/aws2/aws-bedrock/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
 
b/integration-test-groups/aws2/aws-bedrock/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
new file mode 100644
index 00000000000..dfc444f3655
--- /dev/null
+++ 
b/integration-test-groups/aws2/aws-bedrock/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
@@ -0,0 +1 @@
+org.apache.camel.quarkus.component.aws.bedrock.it.AwsBedrockTestEnvCustomizer
diff --git a/integration-test-groups/aws2/pom.xml 
b/integration-test-groups/aws2/pom.xml
index 63adb95d7bb..5b91b00f96e 100644
--- a/integration-test-groups/aws2/pom.xml
+++ b/integration-test-groups/aws2/pom.xml
@@ -37,6 +37,7 @@
 
     <modules>
         <!-- extensions a..z; do not remove this comment, it is important when 
sorting via  mvn process-resources -Pformat -->
+        <module>aws-bedrock</module>
         <module>aws-cloudtrail</module>
         <module>aws-secrets-manager</module>
         <module>aws2-athena</module>
diff --git 
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
 
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
index 6f792b2133b..725c8fb58dc 100644
--- 
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
+++ 
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
@@ -234,6 +234,8 @@ public class Aws2TestEnvContext {
 
     private static String camelServiceComponentName(Service service) {
         switch (service) {
+        case BEDROCK_RUNTIME:
+            return "camel.component.aws-bedrock";
         case DYNAMODB:
             return "camel.component.aws2-ddb";
         case DYNAMODB_STREAMS:
diff --git 
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java
 
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java
index 17d1ec3adda..4a71fdb2c27 100644
--- 
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java
+++ 
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.test.support.aws2;
 
 public enum Service {
     API_GATEWAY("apigateway"),
+    BEDROCK_RUNTIME("bedrock-runtime"),
     EC2("ec2"),
     EKS("eks"),
     KINESIS("kinesis"),
diff --git a/integration-tests/aws2-grouped/pom.xml 
b/integration-tests/aws2-grouped/pom.xml
index 418f6bfcda4..500240dabcb 100644
--- a/integration-tests/aws2-grouped/pom.xml
+++ b/integration-tests/aws2-grouped/pom.xml
@@ -56,6 +56,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-multipart</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-aws-bedrock</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-aws-cloudtrail</artifactId>
@@ -317,6 +321,19 @@
             </activation>
             <dependencies>
                 <!-- The following dependencies guarantee that this module is 
built after them. You can update them by running `mvn process-resources 
-Pformat -N` from the source tree root directory -->
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    
<artifactId>camel-quarkus-aws-bedrock-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.camel.quarkus</groupId>
                     
<artifactId>camel-quarkus-aws-cloudtrail-deployment</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2b7d86fb229..4d86a2f4241 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -56,7 +56,6 @@
         <module>arangodb</module>
         <module>as2</module>
         <module>avro</module>
-        <module>aws2</module>
         <module>aws2-grouped</module>
         <module>azure-grouped</module>
         <module>base64</module>
diff --git a/tooling/scripts/test-categories.yaml 
b/tooling/scripts/test-categories.yaml
index 1c2d1607309..80706177ce4 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -37,7 +37,6 @@ group-01:
   - mllp
   - qdrant
 group-02:
-  - aws2
   - beanio
   - cyberark-vault
   - google-pubsub

Reply via email to