Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
e2e: read /admin/status with its proto field names
Antonio Ojeae0087a05db88
diff --git a/tests/e2e/auth_flows.bats b/tests/e2e/auth_flows.batsindex 2de16103..7d21f8c3 100644--- a/tests/e2e/auth_flows.bats+++ b/tests/e2e/auth_flows.bats@@ -23,8 +23,8 @@ assert_enrolled() {echo "control plane has no enrollment for ${peer_id}" >&2return 1fi- [[ "$(jq -r '.EnrollmentType' <<<"${record}")" == "${enrollment_type}" ]]- [[ "$(jq -r '.Role' <<<"${record}")" == "sam:role:node" ]]+ [[ "$(jq -r '.enrollment_type' <<<"${record}")" == "${enrollment_type}" ]]+ [[ "$(jq -r '.role' <<<"${record}")" == "sam:role:node" ]]echo "${record}"}@@ -107,7 +107,7 @@ assert_enrolled() {local recordrecord="$(assert_enrolled login OIDC)"echo "enrollment: ${record}"- [[ "$(jq -r '.ClaimsJSON | fromjson | .sub' <<<"${record}")" == "test-user" ]]+ [[ "$(jq -r '.claims_json | fromjson | .sub' <<<"${record}")" == "test-user" ]]# The labels join declared must come back attested. /sam/identity hands back# the raw biscuit rather than decoded claims, so read the signeddiff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bashindex de8f91d3..c561721f 100644--- a/tests/e2e/lib/container_mesh.bash+++ b/tests/e2e/lib/container_mesh.bash@@ -246,7 +246,7 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then# peer, or nothing.mesh_enrolled_node() {local peer_id="$1"- mesh_admin_status | jq -c --arg id "${peer_id}" '.enrolled_nodes // [] | .[] | select(.PeerID == $id)'+ mesh_admin_status | jq -c --arg id "${peer_id}" '.enrolled_nodes // [] | .[] | select(.peer_id == $id)'}# POST /debug/connect-peer on node <idx>; the REST endpoint that replaced@@ -484,11 +484,11 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; thenlocal router_peer_id=""local lease_deadline=$((SECONDS + 60))while [[ -z "${router_peer_id}" ]]; do- # active_routers is null, not [], until the first lease lands.+ # active_routers is absent until the first lease lands.router_peer_id=$(docker run --rm --network "${MESH_NETWORK:-kind}" "${MESH_RUNTIME_IMAGE}" \curl -sf --max-time 5 -H "Authorization: Bearer super-secret-admin-token" \"http://${router_node_ip}:8080/admin/status" 2>/dev/null |- jq -r '.active_routers // [] | sort_by(.LastRenewal) | last | .PeerID // empty')+ jq -r '.active_routers // [] | sort_by(.last_renewal_time) | last | .peer_id // empty')if [[ -z "${router_peer_id}" ]] && ((SECONDS >= lease_deadline)); thenecho "router lease did not reach the control plane within 60s" >&2return 1