Skip to content

Commit 7af9f16

Browse files
committed
test(multitenancy): add gRPC tests and extract shared test infrastructure
- Add gRPC multitenancy integration tests verifying tenant-based executor routing - Extract shared CDI producers into test-common module, reuse across jsonrpc and gRPC - Config-driven TestAuthorizationController with CDI alternative verification test This fixes a2aproject#1102 Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent 7ddf254 commit 7af9f16

13 files changed

Lines changed: 497 additions & 42 deletions

File tree

‎pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,12 @@
389389
<scope>test</scope>
390390
<version>${project.version}</version>
391391
</dependency>
392+
<dependency>
393+
<groupId>${project.groupId}</groupId>
394+
<artifactId>a2a-java-sdk-tests-multitenancy-test-common</artifactId>
395+
<scope>test</scope>
396+
<version>${project.version}</version>
397+
</dependency>
392398
<dependency>
393399
<groupId>org.jspecify</groupId>
394400
<artifactId>jspecify</artifactId>
@@ -632,9 +638,15 @@
632638
<!-- Multitenancy test module (Weld SE unit tests, no Quarkus) -->
633639
<module>tests/multitenancy</module>
634640

641+
<!-- Multitenancy common test infrastructure (shared CDI producers) -->
642+
<module>tests/multitenancy/test-common</module>
643+
635644
<!-- Multitenancy JSON-RPC integration tests (no REST transport on classpath) -->
636645
<module>tests/multitenancy/jsonrpc</module>
637646

647+
<!-- Multitenancy gRPC integration tests (executor routing via gRPC) -->
648+
<module>tests/multitenancy/grpc</module>
649+
638650
<!-- Multi-version test modules -->
639651
<module>tests/multiversion/jsonrpc</module>
640652
<module>tests/multiversion/rest</module>

‎tests/multitenancy/grpc/pom.xml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.a2aproject.sdk</groupId>
9+
<artifactId>a2a-java-sdk-parent</artifactId>
10+
<version>1.3.1.Final-SNAPSHOT</version>
11+
<relativePath>../../../pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>a2a-java-sdk-tests-multitenancy-grpc</artifactId>
15+
16+
<packaging>jar</packaging>
17+
18+
<name>Java A2A SDK Tests Multitenancy gRPC</name>
19+
<description>Integration tests for multi-tenant executor routing on a gRPC server</description>
20+
21+
<properties>
22+
<maven.deploy.skip>true</maven.deploy.skip>
23+
</properties>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>${project.groupId}</groupId>
28+
<artifactId>a2a-java-sdk-reference-grpc</artifactId>
29+
<scope>test</scope>
30+
</dependency>
31+
<dependency>
32+
<groupId>${project.groupId}</groupId>
33+
<artifactId>a2a-java-extras-multitenancy</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>${project.groupId}</groupId>
38+
<artifactId>a2a-java-sdk-tests-multitenancy-test-common</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>${project.groupId}</groupId>
43+
<artifactId>a2a-java-sdk-spec</artifactId>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>${project.groupId}</groupId>
48+
<artifactId>a2a-java-sdk-client</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>${project.groupId}</groupId>
53+
<artifactId>a2a-java-sdk-client-transport-grpc</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.quarkus</groupId>
58+
<artifactId>quarkus-grpc</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>io.quarkus</groupId>
62+
<artifactId>quarkus-junit5</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.junit.jupiter</groupId>
67+
<artifactId>junit-jupiter-api</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<!-- Security must be on the classpath; auth is disabled in application.properties -->
71+
<dependency>
72+
<groupId>io.quarkus</groupId>
73+
<artifactId>quarkus-security</artifactId>
74+
<scope>test</scope>
75+
</dependency>
76+
</dependencies>
77+
78+
<build>
79+
<plugins>
80+
<plugin>
81+
<groupId>io.quarkus</groupId>
82+
<artifactId>quarkus-maven-plugin</artifactId>
83+
<version>${quarkus.platform.version}</version>
84+
<extensions>true</extensions>
85+
</plugin>
86+
</plugins>
87+
</build>
88+
</project>
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package org.a2aproject.sdk.tests.multitenancy.grpc;
2+
3+
import java.util.List;
4+
5+
import jakarta.enterprise.inject.Produces;
6+
import jakarta.inject.Singleton;
7+
8+
import org.a2aproject.sdk.extras.multitenancy.Tenant;
9+
import org.a2aproject.sdk.server.ExtendedAgentCard;
10+
import org.a2aproject.sdk.server.PublicAgentCard;
11+
import org.a2aproject.sdk.spec.AgentCard;
12+
import org.a2aproject.sdk.spec.AgentInterface;
13+
import org.a2aproject.sdk.spec.TransportProtocol;
14+
import org.eclipse.microprofile.config.inject.ConfigProperty;
15+
16+
@Singleton
17+
public class MultiTenantAgentCardProducer extends org.a2aproject.sdk.tests.multitenancy.MultiTenantAgentCardProducer {
18+
19+
@ConfigProperty(name = "quarkus.http.port", defaultValue = "8081")
20+
int serverPort;
21+
22+
@Produces
23+
@PublicAgentCard
24+
public AgentCard publicCard() {
25+
return card("Default Agent", grpcInterfaces());
26+
}
27+
28+
@Produces
29+
@ExtendedAgentCard
30+
public AgentCard defaultExtendedCard() {
31+
return card("Default Agent (extended)", grpcInterfaces());
32+
}
33+
34+
@Produces
35+
@Singleton
36+
@Tenant("acme")
37+
public AgentCard acmePublicCard() {
38+
return card("Acme Agent", grpcInterfaces());
39+
}
40+
41+
@Produces
42+
@Singleton
43+
@Tenant("acme")
44+
@ExtendedAgentCard
45+
public AgentCard acmeExtendedCard() {
46+
return card("Acme Agent (extended)", grpcInterfaces());
47+
}
48+
49+
@Produces
50+
@Singleton
51+
@Tenant("beta")
52+
public AgentCard betaPublicCard() {
53+
return card("Beta Agent", grpcInterfaces());
54+
}
55+
56+
@Produces
57+
@Singleton
58+
@Tenant("beta")
59+
@ExtendedAgentCard
60+
public AgentCard betaExtendedCard() {
61+
return card("Beta Agent (extended)", grpcInterfaces());
62+
}
63+
64+
private List<AgentInterface> grpcInterfaces() {
65+
return List.of(new AgentInterface(TransportProtocol.GRPC.asString(), "localhost:" + serverPort));
66+
}
67+
}
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
package org.a2aproject.sdk.tests.multitenancy.grpc;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
6+
import static org.junit.jupiter.api.Assertions.assertNotNull;
7+
8+
import java.util.ArrayList;
9+
import java.util.List;
10+
import java.util.UUID;
11+
import java.util.concurrent.TimeUnit;
12+
import java.util.function.BiConsumer;
13+
14+
import jakarta.inject.Inject;
15+
16+
import org.a2aproject.sdk.client.Client;
17+
import org.a2aproject.sdk.client.ClientEvent;
18+
import org.a2aproject.sdk.client.TaskEvent;
19+
import org.a2aproject.sdk.client.transport.grpc.GrpcTransport;
20+
import org.a2aproject.sdk.client.transport.grpc.GrpcTransportConfigBuilder;
21+
import org.a2aproject.sdk.spec.AgentCapabilities;
22+
import org.a2aproject.sdk.spec.AgentCard;
23+
import org.a2aproject.sdk.spec.AgentInterface;
24+
import org.a2aproject.sdk.spec.Message;
25+
import org.a2aproject.sdk.spec.MessageSendParams;
26+
import org.a2aproject.sdk.spec.Task;
27+
import org.a2aproject.sdk.spec.TextPart;
28+
import org.a2aproject.sdk.spec.TransportProtocol;
29+
import io.grpc.ManagedChannel;
30+
import io.grpc.ManagedChannelBuilder;
31+
import io.quarkus.security.spi.runtime.AuthorizationController;
32+
import io.quarkus.test.junit.QuarkusTest;
33+
import org.eclipse.microprofile.config.ConfigProvider;
34+
import org.jspecify.annotations.Nullable;
35+
import org.junit.jupiter.api.AfterAll;
36+
import org.junit.jupiter.api.BeforeAll;
37+
import org.junit.jupiter.api.Test;
38+
39+
/**
40+
* Integration tests for multi-tenant executor routing on a gRPC server.
41+
* Verifies that gRPC SendMessage requests with a {@code tenant} field are routed
42+
* to the correct {@code AgentExecutor} bean qualified with {@code @Tenant}.
43+
*/
44+
@QuarkusTest
45+
public class MultiTenantGrpcTest {
46+
47+
@Inject
48+
AuthorizationController authorizationController;
49+
50+
private static ManagedChannel channel;
51+
private static String grpcTarget;
52+
53+
@BeforeAll
54+
public static void setupChannel() {
55+
int port = ConfigProvider.getConfig().getValue("quarkus.http.port", Integer.class);
56+
grpcTarget = "localhost:" + port;
57+
channel = ManagedChannelBuilder.forTarget(grpcTarget).usePlaintext().build();
58+
}
59+
60+
@AfterAll
61+
public static void closeChannel() {
62+
channel.shutdownNow();
63+
try {
64+
channel.awaitTermination(10, TimeUnit.SECONDS);
65+
} catch (InterruptedException e) {
66+
Thread.currentThread().interrupt();
67+
}
68+
}
69+
70+
@Test
71+
public void authorizationControllerIsTestAlternative() {
72+
assertInstanceOf(TestAuthorizationController.class, authorizationController,
73+
"TestAuthorizationController CDI alternative must be active");
74+
assertFalse(authorizationController.isAuthorizationEnabled(),
75+
"Authorization must be disabled for multitenancy tests");
76+
}
77+
78+
@Test
79+
public void knownTenantRoutesToAcmeExecutor() throws Exception {
80+
assertEquals("acme", sendMessageAndGetArtifactText("acme"));
81+
}
82+
83+
@Test
84+
public void secondTenantRoutesToBetaExecutor() throws Exception {
85+
assertEquals("beta", sendMessageAndGetArtifactText("beta"));
86+
}
87+
88+
@Test
89+
public void unknownTenantFallsBackToDefault() throws Exception {
90+
assertEquals("default", sendMessageAndGetArtifactText("unknown-corp"));
91+
}
92+
93+
@Test
94+
public void nullTenantUsesDefault() throws Exception {
95+
assertEquals("default", sendMessageAndGetArtifactText(null));
96+
}
97+
98+
private String sendMessageAndGetArtifactText(@Nullable String tenant) throws Exception {
99+
AgentCard card = buildGrpcAgentCard();
100+
MessageSendParams params = buildParams(tenant);
101+
102+
List<Task> tasks = new ArrayList<>();
103+
List<BiConsumer<ClientEvent, AgentCard>> consumers = List.of((event, agentCard) -> {
104+
if (event instanceof TaskEvent te) {
105+
tasks.add(te.getTask());
106+
}
107+
});
108+
try (Client client = Client.builder(card)
109+
.withTransport(GrpcTransport.class, new GrpcTransportConfigBuilder()
110+
.channelFactory(target -> channel))
111+
.build()) {
112+
client.sendMessage(params, consumers, null, null);
113+
}
114+
115+
assertEquals(1, tasks.size(), "Expected exactly one Task in the response");
116+
Task task = tasks.get(0);
117+
assertNotNull(task.artifacts(), "Expected artifacts in task");
118+
assertFalse(task.artifacts().isEmpty(), "Expected at least one artifact");
119+
return ((TextPart) task.artifacts().get(0).parts().get(0)).text();
120+
}
121+
122+
private static MessageSendParams buildParams(@Nullable String tenant) {
123+
Message message = Message.builder()
124+
.messageId(UUID.randomUUID().toString())
125+
.role(Message.Role.ROLE_USER)
126+
.parts(List.of(new TextPart("hello")))
127+
.build();
128+
MessageSendParams.Builder builder = MessageSendParams.builder().message(message);
129+
if (tenant != null) {
130+
builder.tenant(tenant);
131+
}
132+
return builder.build();
133+
}
134+
135+
private static AgentCard buildGrpcAgentCard() {
136+
return AgentCard.builder()
137+
.name("test-agent")
138+
.description("test")
139+
.version("1.0.0")
140+
.defaultInputModes(List.of("text"))
141+
.defaultOutputModes(List.of("text"))
142+
.capabilities(AgentCapabilities.builder().streaming(false).build())
143+
.skills(List.of())
144+
.supportedInterfaces(List.of(new AgentInterface(TransportProtocol.GRPC.asString(), grpcTarget)))
145+
.build();
146+
}
147+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.a2aproject.sdk.tests.multitenancy.grpc;
2+
3+
import jakarta.annotation.Priority;
4+
import jakarta.enterprise.inject.Alternative;
5+
import jakarta.inject.Singleton;
6+
import jakarta.interceptor.Interceptor;
7+
8+
import org.eclipse.microprofile.config.inject.ConfigProperty;
9+
10+
import io.quarkus.security.spi.runtime.AuthorizationController;
11+
12+
/**
13+
* Disables authorization for gRPC multitenancy tests.
14+
* <p>
15+
* The {@code @Authenticated} CDI interceptor checks {@link AuthorizationController#isAuthorizationEnabled()}
16+
* before enforcing. When disabled, {@code @Authenticated} becomes a no-op, allowing
17+
* tests to call gRPC endpoints without credentials.
18+
* <p>
19+
* The default is {@code false}. To enforce real authentication in a specific test profile,
20+
* set {@code test.authorization.enabled=true}.
21+
*/
22+
@Alternative
23+
@Priority(Interceptor.Priority.LIBRARY_AFTER + 1)
24+
@Singleton
25+
public class TestAuthorizationController extends AuthorizationController {
26+
27+
@ConfigProperty(name = "test.authorization.enabled", defaultValue = "false")
28+
boolean enabled;
29+
30+
@Override
31+
public boolean isAuthorizationEnabled() {
32+
return enabled;
33+
}
34+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
quarkus.grpc.server.use-separate-server=false
2+
quarkus.http.port=8081
3+
a2a.authorization.required=false

‎tests/multitenancy/jsonrpc/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<artifactId>a2a-java-extras-multitenancy</artifactId>
3434
<scope>test</scope>
3535
</dependency>
36+
<dependency>
37+
<groupId>${project.groupId}</groupId>
38+
<artifactId>a2a-java-sdk-tests-multitenancy-test-common</artifactId>
39+
<scope>test</scope>
40+
</dependency>
3641
<dependency>
3742
<groupId>io.quarkus</groupId>
3843
<artifactId>quarkus-junit5</artifactId>

0 commit comments

Comments
 (0)