Skip to content

Commit e4c6ee6

Browse files
authored
fix(jsonrpc): fix tenant extraction in getTenantAgentCard (a2aproject#1110)
- Was calling extractTenant() (full normalized path) instead of rc.pathParam("tenant") - Add tests/multitenancy/jsonrpc: proves tenant public cards work without REST on classpath Fixes a2aproject#1106 Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent 4f62963 commit e4c6ee6

8 files changed

Lines changed: 231 additions & 1 deletion

File tree

‎pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,9 @@
632632
<!-- Multitenancy test module (Weld SE unit tests, no Quarkus) -->
633633
<module>tests/multitenancy</module>
634634

635+
<!-- Multitenancy JSON-RPC integration tests (no REST transport on classpath) -->
636+
<module>tests/multitenancy/jsonrpc</module>
637+
635638
<!-- Multi-version test modules -->
636639
<module>tests/multiversion/jsonrpc</module>
637640
<module>tests/multiversion/rest</module>

‎reference/jsonrpc/src/main/java/org/a2aproject/sdk/server/apps/quarkus/A2AServerRoutes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ public String getAgentCard(RoutingContext rc) throws JsonProcessingException {
440440
* @throws JsonProcessingException if serialization fails
441441
*/
442442
public String getTenantAgentCard(RoutingContext rc) throws JsonProcessingException {
443-
String tenant = extractTenant(rc);
443+
String tenant = rc.pathParam("tenant");
444444
cacheMetadata.getHttpHeadersMap().forEach((k, v) -> rc.response().putHeader(k, v));
445445
return JsonUtil.toJson(jsonRpcHandler.getAgentCard(tenant));
446446
}

‎tests/multitenancy/jsonrpc/pom.xml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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-jsonrpc</artifactId>
15+
16+
<packaging>jar</packaging>
17+
18+
<name>Java A2A SDK Tests Multitenancy JSON-RPC</name>
19+
<description>Integration tests for multi-tenant public agent card on a JSON-RPC-only server (no REST transport on classpath)</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-jsonrpc</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>io.quarkus</groupId>
38+
<artifactId>quarkus-junit5</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.junit.jupiter</groupId>
43+
<artifactId>junit-jupiter-api</artifactId>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.rest-assured</groupId>
48+
<artifactId>rest-assured</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<!-- Security disabled for tests — no auth module intentionally -->
52+
<dependency>
53+
<groupId>io.quarkus</groupId>
54+
<artifactId>quarkus-security</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
</dependencies>
58+
59+
<build>
60+
<plugins>
61+
<plugin>
62+
<groupId>io.quarkus</groupId>
63+
<artifactId>quarkus-maven-plugin</artifactId>
64+
<version>${quarkus.platform.version}</version>
65+
<extensions>true</extensions>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
</project>
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
package org.a2aproject.sdk.tests.multitenancy.jsonrpc;
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.AgentCapabilities;
12+
import org.a2aproject.sdk.spec.AgentCard;
13+
import org.a2aproject.sdk.spec.AgentInterface;
14+
import org.a2aproject.sdk.spec.TransportProtocol;
15+
16+
@Singleton
17+
public class AgentCardProducer {
18+
19+
private static final String BASE_URL = "http://localhost:8081";
20+
21+
@Produces
22+
@PublicAgentCard
23+
public AgentCard publicCard() {
24+
return card("Default Agent");
25+
}
26+
27+
@Produces
28+
@ExtendedAgentCard
29+
public AgentCard defaultExtendedCard() {
30+
return card("Default Agent (extended)");
31+
}
32+
33+
@Produces
34+
@Singleton
35+
@Tenant("acme")
36+
public AgentCard acmePublicCard() {
37+
return card("Acme Agent");
38+
}
39+
40+
@Produces
41+
@Singleton
42+
@Tenant("acme")
43+
@ExtendedAgentCard
44+
public AgentCard acmeExtendedCard() {
45+
return card("Acme Agent (extended)");
46+
}
47+
48+
@Produces
49+
@Singleton
50+
@Tenant("beta")
51+
public AgentCard betaPublicCard() {
52+
return card("Beta Agent");
53+
}
54+
55+
@Produces
56+
@Singleton
57+
@Tenant("beta")
58+
@ExtendedAgentCard
59+
public AgentCard betaExtendedCard() {
60+
return card("Beta Agent (extended)");
61+
}
62+
63+
private static AgentCard card(String name) {
64+
return AgentCard.builder()
65+
.name(name)
66+
.description(name)
67+
.version("1.0.0")
68+
.defaultInputModes(List.of("text"))
69+
.defaultOutputModes(List.of("text"))
70+
.capabilities(AgentCapabilities.builder().streaming(true).extendedAgentCard(true).build())
71+
.skills(List.of())
72+
.supportedInterfaces(List.of(new AgentInterface(TransportProtocol.JSONRPC.asString(), BASE_URL)))
73+
.build();
74+
}
75+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.a2aproject.sdk.tests.multitenancy.jsonrpc;
2+
3+
import java.util.List;
4+
5+
import jakarta.enterprise.context.ApplicationScoped;
6+
import jakarta.enterprise.inject.Produces;
7+
8+
import org.a2aproject.sdk.server.agentexecution.AgentExecutor;
9+
import org.a2aproject.sdk.spec.TextPart;
10+
11+
@ApplicationScoped
12+
public class AgentExecutorProducer {
13+
14+
@Produces
15+
public AgentExecutor defaultExecutor() {
16+
return (context, emitter) -> {
17+
emitter.startWork();
18+
emitter.addArtifact(List.of(new TextPart("default")));
19+
emitter.complete();
20+
};
21+
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package org.a2aproject.sdk.tests.multitenancy.jsonrpc;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
5+
import io.quarkus.test.junit.QuarkusTest;
6+
import io.restassured.RestAssured;
7+
import io.restassured.path.json.JsonPath;
8+
import org.junit.jupiter.api.Test;
9+
10+
/**
11+
* Verifies that the JSON-RPC transport serves the public agent card endpoints
12+
* (/.well-known/agent-card.json and /.well-known/{tenant}/agent-card.json)
13+
* when the REST transport is NOT on the classpath.
14+
*/
15+
@QuarkusTest
16+
public class MultiTenantJSONRPCPublicCardTest {
17+
18+
@Test
19+
public void defaultPublicCardIsServed() {
20+
String response = RestAssured.given()
21+
.when().get("/.well-known/agent-card.json")
22+
.then().statusCode(200)
23+
.extract().asString();
24+
assertEquals("Default Agent", JsonPath.from(response).getString("name"));
25+
}
26+
27+
@Test
28+
public void acmeTenantPublicCardIsServed() {
29+
String response = RestAssured.given()
30+
.when().get("/.well-known/acme/agent-card.json")
31+
.then().statusCode(200)
32+
.extract().asString();
33+
assertEquals("Acme Agent", JsonPath.from(response).getString("name"));
34+
}
35+
36+
@Test
37+
public void betaTenantPublicCardIsServed() {
38+
String response = RestAssured.given()
39+
.when().get("/.well-known/beta/agent-card.json")
40+
.then().statusCode(200)
41+
.extract().asString();
42+
assertEquals("Beta Agent", JsonPath.from(response).getString("name"));
43+
}
44+
45+
@Test
46+
public void unknownTenantPublicCardFallsBackToDefault() {
47+
String response = RestAssured.given()
48+
.when().get("/.well-known/unknown-corp/agent-card.json")
49+
.then().statusCode(200)
50+
.extract().asString();
51+
assertEquals("Default Agent", JsonPath.from(response).getString("name"));
52+
}
53+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
<?xml version="1.0" encoding="UTF-8"?>
3+
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
6+
bean-discovery-mode="all">
7+
</beans>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a2a.authorization.required=false

0 commit comments

Comments
 (0)