Skip to content

Agent Mesh

refactor e2e tests

Antonio Ojea0577c91db38a
diff --git a/tests/e2e/auth_flows.bats b/tests/e2e/auth_flows.bats
index e23325fe..3c58f195 100644
--- a/tests/e2e/auth_flows.bats
+++ b/tests/e2e/auth_flows.bats
@@ -18,8 +18,7 @@ teardown() {
[[ "$status" -eq 0 ]]
# mesh_start_node uses --token-url by default, which implements Client Credentials flow
- run mesh_start_node 1
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1
run mesh_assert_container_running "${MESH_PREFIX}-node-1"
[[ "$status" -eq 0 ]]
@@ -34,7 +33,7 @@ teardown() {
# 1. Get a token from mock provider using Python helper
local token
- token=$(docker run --rm --network "${MESH_NETWORK}" python:3.12 python3 -c "import urllib.request; import json; req = urllib.request.Request('http://mock-oidc:18080/token', data=b''); resp = urllib.request.urlopen(req); print(json.loads(resp.read().decode())['access_token'])")
+ token=$(docker run --rm --network "${MESH_NETWORK}" $(mesh_get_add_hosts) python:3.12 python3 -c "import urllib.request; import json; req = urllib.request.Request('http://mock-oidc:18080/token', data=b''); resp = urllib.request.urlopen(req); print(json.loads(resp.read().decode())['access_token'])")
[[ -n "${token}" ]]
@@ -45,13 +44,16 @@ teardown() {
local data_vol="${MESH_PREFIX}-data"
docker volume create "${data_vol}"
+ CLEANUP_VOLUMES+=("${data_vol}")
docker run --name "${node_name}-join" \
--network "${MESH_NETWORK}" \
+ $(mesh_get_add_hosts) \
-v "${data_vol}:/root/.config/sam-mesh" \
"sam-node:local" \
join "http://sam-hub:9090" > "/tmp/${node_name}-join.out" 2>&1 &
local join_pid=$!
+ MESH_CONTAINERS+=("${node_name}-join")
# Wait for redirect_uri and state in the output
local redirect_uri=""
@@ -90,15 +92,14 @@ teardown() {
docker run -d \
--name "${node_name}" \
--network "${MESH_NETWORK}" \
+ $(mesh_get_add_hosts) \
-v "${data_vol}:/root/.config/sam-mesh" \
"sam-node:local" \
run \
--hub "http://sam-hub:9090"
+ MESH_CONTAINERS+=("${node_name}")
mesh_wait_for_log "${node_name}" "Using stored identity." 20
-
- # Cleanup volume
- docker volume rm "${data_vol}" >/dev/null 2>&1 || true
}
@test "Authentication Flow 3: Workload Identity Federation (JWT Path)" {
@@ -110,13 +111,14 @@ teardown() {
# 1. Get a token from mock provider
local token
- token=$(docker run --rm --network "${MESH_NETWORK}" python:3.12 python3 -c "import urllib.request; import json; req = urllib.request.Request('http://mock-oidc:18080/token', data=b''); resp = urllib.request.urlopen(req); print(json.loads(resp.read().decode())['access_token'])")
+ token=$(docker run --rm --network "${MESH_NETWORK}" $(mesh_get_add_hosts) python:3.12 python3 -c "import urllib.request; import json; req = urllib.request.Request('http://mock-oidc:18080/token', data=b''); resp = urllib.request.urlopen(req); print(json.loads(resp.read().decode())['access_token'])")
[[ -n "${token}" ]]
# 2. Save it to a file in a volume
local token_vol="${MESH_PREFIX}-token"
docker volume create "${token_vol}"
+ CLEANUP_VOLUMES+=("${token_vol}")
docker run --rm \
-v "${token_vol}:/tokens" \
@@ -131,15 +133,14 @@ teardown() {
docker run -d \
--name "${node_name}" \
--network "${MESH_NETWORK}" \
+ $(mesh_get_add_hosts) \
-v "${token_vol}:/var/run/secrets/tokens" \
"sam-node:local" \
run \
--hub "http://sam-hub:9090" \
--jwt-path "/var/run/secrets/tokens/sa-token" \
--api-token "secret-token"
+ MESH_CONTAINERS+=("${node_name}")
mesh_wait_for_log "${node_name}" "SAM Node Online" 20
-
- # Cleanup volume
- docker volume rm "${token_vol}" >/dev/null 2>&1 || true
}
diff --git a/tests/e2e/container_mesh.bats b/tests/e2e/container_mesh.bats
index 07a2514e..1c090439 100644
--- a/tests/e2e/container_mesh.bats
+++ b/tests/e2e/container_mesh.bats
@@ -8,16 +8,6 @@ setup() {
}
teardown() {
- if [[ "${BATS_TEST_COMPLETED:-0}" -ne 1 ]]; then
- mkdir -p tests/e2e/logs
- local ids
- ids="$(docker ps -aq --filter "name=mesh-")"
- for id in ${ids}; do
- local name
- name="$(docker inspect -f '{{.Name}}' "${id}" | tr -d '/')"
- docker logs "${id}" > "tests/e2e/logs/${name}.log" 2>&1 || true
- done
- fi
mesh_cleanup_env
}
@@ -31,8 +21,7 @@ teardown() {
local node_count=5
local i
for i in $(seq 1 "$node_count"); do
- run mesh_start_node "$i"
- [[ "$status" -eq 0 ]]
+ mesh_start_node "$i"
sleep 2
done
diff --git a/tests/e2e/datapath.bats b/tests/e2e/datapath.bats
index 6aefab60..925d4442 100644
--- a/tests/e2e/datapath.bats
+++ b/tests/e2e/datapath.bats
@@ -24,8 +24,7 @@ teardown() {
# Start Node 1
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 20
mesh_wait_for_mcp_ready 1 20
@@ -35,8 +34,7 @@ teardown() {
# Start Node 2
echo "[$(date +%T)] Starting Node 2"
- run mesh_start_node 2 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 2 "--log-level debug"
local node2_name="${MESH_PREFIX}-node-2"
mesh_wait_for_log "${node2_name}" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
diff --git a/tests/e2e/docker/calc-mcp/sam-node-config.yaml b/tests/e2e/docker/calc-mcp/sam-node-config.yaml
index 60744a5d..97a6465c 100644
--- a/tests/e2e/docker/calc-mcp/sam-node-config.yaml
+++ b/tests/e2e/docker/calc-mcp/sam-node-config.yaml
@@ -8,3 +8,7 @@ services:
name: "calculator"
description: "Simple math operations"
target_url: "http://calc-mcp:7777/mcp"
+ - type: "mcp"
+ name: "calc_service"
+ description: "Simple math operations with underscore"
+ target_url: "http://calc-mcp:7777/mcp"
diff --git a/tests/e2e/docker/mock_oidc.py b/tests/e2e/docker/mock_oidc.py
index 6caf867e..1d93fb7d 100644
--- a/tests/e2e/docker/mock_oidc.py
+++ b/tests/e2e/docker/mock_oidc.py
@@ -1,13 +1,11 @@
import json
import time
import jwt
+import urllib.parse
from http.server import BaseHTTPRequestHandler, HTTPServer
# The following RSA private key and JWKS were generated for testing purposes.
# They are used by the mock OIDC server to sign JWTs.
-# To generate a new key pair:
-# openssl genpkey -algorithm RSA -out private.pem -pkeyopt rsa_keygen_bits:2048
-# openssl rsa -pubout -in private.pem -out public.pem
# Parameters: RSA 2048 bits, Algorithm: RS256, kid: test-key-id
PRIVATE_KEY = """-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDGtPD85uaT342Y
@@ -79,6 +77,7 @@ class Handler(BaseHTTPRequestHandler):
self.send_response(200)
self.end_headers()
self.wfile.write(b'ok')
+ return
def do_POST(self):
if self.path == '/device/code':
@@ -97,12 +96,24 @@ class Handler(BaseHTTPRequestHandler):
self.wfile.write(data)
return
if self.path == '/token':
+ # Parse form data from post body
+ content_length = int(self.headers.get('Content-Length', 0))
+ body = self.rfile.read(content_length).decode('utf-8')
+ params = urllib.parse.parse_qs(body) if body else {}
+
+ client_id = params.get('client_id', [''])[0]
+
+ # Assign groups based on client_id
+ groups = ['data-scientist']
+ if client_id == 'admin-client':
+ groups = ['admin']
+
payload = {
'iss': 'http://mock-oidc:18080',
'aud': 'sam-mesh-audience',
'sub': 'test-user',
'exp': int(time.time()) + 3600,
- 'roles': ['admin', 'user']
+ 'groups': groups
}
token = jwt.encode(payload, PRIVATE_KEY, algorithm='RS256', headers={'kid': 'test-key-id'})
body = {
diff --git a/tests/e2e/docs_snippets.bats b/tests/e2e/docs_snippets.bats
index 11ed7f2e..1280ed55 100644
--- a/tests/e2e/docs_snippets.bats
+++ b/tests/e2e/docs_snippets.bats
@@ -21,8 +21,7 @@ teardown() {
run mesh_start_hub
[[ "$status" -eq 0 ]]
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 20
diff --git a/tests/e2e/find_remote_tools.bats b/tests/e2e/find_remote_tools.bats
index 3f29ef40..61a42584 100644
--- a/tests/e2e/find_remote_tools.bats
+++ b/tests/e2e/find_remote_tools.bats
@@ -39,8 +39,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -48,10 +47,9 @@ teardown() {
start_calc_mcp
echo "[$(date +%T)] Starting Node 2 with calculator service"
- run mesh_start_node 2 \
+ mesh_start_node 2 \
"--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
- [[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
@@ -93,8 +91,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -102,10 +99,9 @@ teardown() {
start_calc_mcp
echo "[$(date +%T)] Starting Node 2 with calculator service"
- run mesh_start_node 2 \
+ mesh_start_node 2 \
"--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
- [[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
@@ -144,8 +140,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -153,10 +148,9 @@ teardown() {
start_calc_mcp
echo "[$(date +%T)] Starting Node 2 with calculator service"
- run mesh_start_node 2 \
+ mesh_start_node 2 \
"--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
- [[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
@@ -209,8 +203,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -218,10 +211,9 @@ teardown() {
start_calc_mcp
echo "[$(date +%T)] Starting Node 2 with calculator service"
- run mesh_start_node 2 \
+ mesh_start_node 2 \
"--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
- [[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
diff --git a/tests/e2e/fixtures/mock-oidc.yaml b/tests/e2e/fixtures/mock-oidc.yaml
new file mode 100644
index 00000000..b0cd3d59
--- /dev/null
+++ b/tests/e2e/fixtures/mock-oidc.yaml
@@ -0,0 +1,32 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: mock-oidc
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: mock-oidc
+ template:
+ metadata:
+ labels:
+ app: mock-oidc
+ spec:
+ containers:
+ - name: mock-oidc
+ image: sam-mock-oidc:local
+ ports:
+ - containerPort: 18080
+ hostPort: 18080
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: mock-oidc
+spec:
+ selector:
+ app: mock-oidc
+ ports:
+ - name: http
+ port: 18080
+ targetPort: 18080
diff --git a/tests/e2e/fixtures/sam-hub.yaml b/tests/e2e/fixtures/sam-hub.yaml
index 1e441c0c..2a99bcbf 100644
--- a/tests/e2e/fixtures/sam-hub.yaml
+++ b/tests/e2e/fixtures/sam-hub.yaml
@@ -3,13 +3,19 @@ kind: ConfigMap
metadata:
name: sam-hub-config
data:
- SAM_OIDC_ISSUER: "${ISSUER}"
+ SAM_OIDC_ISSUER: "${ISSUERS}"
SAM_OIDC_ID: "sam-mesh-audience"
SAM_HUB_KEY: "0000000000000000000000000000000000000000000000000000000000000000"
policy.yaml: |
version: v1alpha1
bindings:
- - group: "*"
+ - user: "system:serviceaccount:default:sam-node-sa"
+ role: admin
+ - group: "data-scientist"
+ role: mesh-member
+ - group: "admin"
+ role: admin
+ - user: "admin-user"
role: admin
roles:
admin:
@@ -17,6 +23,14 @@ data:
- "*"
allowed_targets:
- "*"
+ mesh-member:
+ allowed_services:
+ - "mcp://calculator"
+ - "mcp://db-agent"
+ - "mcp://http-tool"
+ - "mcp://stdio-tool"
+ allowed_targets:
+ - "*"
---
apiVersion: v1
kind: Service
@@ -60,6 +74,11 @@ spec:
envFrom:
- configMapRef:
name: sam-hub-config
+ env:
+ - name: MY_NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
ports:
- containerPort: 9090
hostPort: 9090
@@ -72,17 +91,18 @@ spec:
protocol: UDP
args:
- "--issuer"
- - "${ISSUER}"
+ - "${ISSUERS}"
- "--key"
- "0000000000000000000000000000000000000000000000000000000000000000"
- "--insecure-skip-tls-verify"
- "--policy-file=/etc/sam/policy.yaml"
- "--listen=/ip4/0.0.0.0/tcp/4501"
- "--listen=/ip4/0.0.0.0/udp/4501/quic-v1"
- - "--external-multiaddr=/dns4/sam-hub.default.svc.cluster.local/tcp/4501"
- - "--external-multiaddr=/dns4/sam-hub.default.svc.cluster.local/udp/4501/quic-v1"
- - "--external-multiaddr=http://sam-hub-0.sam-hub.default.svc.cluster.local:9090"
- - "--external-multiaddr=http://sam-hub-1.sam-hub.default.svc.cluster.local:9090"
+ - "--external-multiaddr=/dns4/$(MY_NODE_NAME)/tcp/4501"
+ - "--external-multiaddr=/dns4/$(MY_NODE_NAME)/udp/4501/quic-v1"
+ - "--external-multiaddr=http://sam-hub:9090"
+ - "--log-level"
+ - "debug"
volumeMounts:
- name: config-volume
mountPath: /etc/sam/policy.yaml
diff --git a/tests/e2e/key_rotation_test.bats b/tests/e2e/key_rotation_test.bats
index 99a68785..6da02353 100644
--- a/tests/e2e/key_rotation_test.bats
+++ b/tests/e2e/key_rotation_test.bats
@@ -24,13 +24,14 @@ teardown() {
--name "${hub_name}" \
--network "${MESH_NETWORK}" \
--network-alias sam-hub \
+ $(mesh_get_add_hosts) \
"sam-hub:local" \
--issuer "http://mock-oidc:18080" \
--client-id "sam-e2e" \
--key "${key}" \
--listen "/ip4/0.0.0.0/tcp/4002" \
--external-multiaddr "/dns4/sam-hub/tcp/4002" \
- --mesh "e2e-mesh" \
+ --mesh "${MESH_PREFIX}" \
--key-rotation-interval 5s >/dev/null
MESH_CONTAINERS+=("${hub_name}")
@@ -41,8 +42,7 @@ teardown() {
echo "${hub_peer_id}" > "/tmp/${MESH_PREFIX}-hub-peer-id"
# Start Node
- run mesh_start_node 1
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1
local node_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node_name}" "SAM Node Online" 20
diff --git a/tests/e2e/kubernetes.bats b/tests/e2e/kubernetes.bats
deleted file mode 100644
index 6b7ff8a0..00000000
--- a/tests/e2e/kubernetes.bats
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env bats
-
-setup() {
- CLUSTER_NAME="sam-wi-test-$RANDOM"
- KUBECONTEXT="kind-${CLUSTER_NAME}"
-
- # Create Kind cluster with 2 worker nodes so we can use hostPort
- cat <<KIND | kind create cluster --name "${CLUSTER_NAME}" --config=-
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-- role: control-plane
-- role: worker
-- role: worker
-KIND
-
- # Load images into Kind
- kind load docker-image sam-hub:local --name "${CLUSTER_NAME}"
- kind load docker-image sam-node:local --name "${CLUSTER_NAME}"
-}
-
-teardown() {
- echo "=== Hub Logs ==="
- kubectl --context="${KUBECONTEXT}" logs -l app=sam-hub --tail=-1 || true
- echo "=== Node Logs ==="
- kubectl --context="${KUBECONTEXT}" logs -l app=sam-node --tail=-1 || true
- kind delete cluster --name "${CLUSTER_NAME}"
- docker rm -f external-sam-node >/dev/null 2>&1 || true
-}
-
-k8s_wait_for_log() {
- local pod="$1"
- local needle="$2"
- local timeout_s="${3:-20}"
- local i
- for ((i=0; i<timeout_s*10; i++)); do
- if kubectl --context="${KUBECONTEXT}" logs "${pod}" 2>&1 | grep -E -q "${needle}"; then
- return 0
- fi
- sleep 0.1
- done
- return 1
-}
-
-docker_wait_for_log() {
- local container="$1"
- local needle="$2"
- local timeout_s="${3:-20}"
- local i
- for ((i=0; i<timeout_s*10; i++)); do
- if docker logs "${container}" 2>&1 | grep -E -q "${needle}"; then
- return 0
- fi
- sleep 0.1
- done
- return 1
-}
-
-deploy_mesh() {
- # 1. Get the issuer URL
- local issuer
- issuer=$(kubectl --context="${KUBECONTEXT}" get --raw /.well-known/openid-configuration | jq -r .issuer)
- [[ -n "${issuer}" ]]
-
- # 1.5. Grant anonymous access to OIDC discovery
- kubectl --context="${KUBECONTEXT}" apply -f tests/e2e/fixtures/allow-anonymous-oidc.yaml
-
- # 2. Deploy Hub
- export ISSUER="${issuer}"
- envsubst < tests/e2e/fixtures/sam-hub.yaml | kubectl --context="${KUBECONTEXT}" apply -f -
-
- # Wait for Hub to be ready
- kubectl --context="${KUBECONTEXT}" rollout status statefulset/sam-hub --timeout=60s
-
- # Get Hub PeerID
- k8s_wait_for_log "sam-hub-0" "PeerID:" 20
- local hub_peer_id
- hub_peer_id=$(kubectl --context="${KUBECONTEXT}" logs "sam-hub-0" | grep -oE '12D3Koo[a-zA-Z0-9]+' | head -n 1 || true)
- [[ -n "${hub_peer_id}" ]]
-
- # 3. Deploy Node
- kubectl --context="${KUBECONTEXT}" create serviceaccount sam-node-sa || true
-
- kubectl --context="${KUBECONTEXT}" apply -f tests/e2e/fixtures/sam-node.yaml
-
- # Wait for Node to be ready
- kubectl --context="${KUBECONTEXT}" wait --for=condition=available deployment/sam-node --timeout=60s
-}
-
-@test "Workload Identity Federation in Kind" {
- deploy_mesh
-
- # Verify enrollment
- local pod_name
- pod_name=$(kubectl --context="${KUBECONTEXT}" get pods -l app=sam-node -o jsonpath='{.items[0].metadata.name}')
-
- k8s_wait_for_log "${pod_name}" "SAM Node Online|Successfully enrolled" 30
-}
-
-@test "Local SAM agent connects to cluster hub and uses relay" {
- deploy_mesh
-
- # Get IP of nodes running sam-hub pods
- NODE0_IP=$(kubectl --context="${KUBECONTEXT}" get pod sam-hub-0 -o jsonpath='{.status.hostIP}')
- NODE1_IP=$(kubectl --context="${KUBECONTEXT}" get pod sam-hub-1 -o jsonpath='{.status.hostIP}')
-
- # Start external node in a docker container attached to kind network
- # We use the sam-node:local image and mount the token
- kubectl --context="${KUBECONTEXT}" create token sam-node-sa --duration=1h --audience="sam-mesh-audience" > /tmp/sam-token
-
- # Run the node using docker
- # We add /etc/hosts entries for sam-hub.default.svc.cluster.local
- docker run -d --name external-sam-node --network kind \
- --add-host "sam-hub.default.svc.cluster.local:$NODE0_IP" \
- --add-host "sam-hub.default.svc.cluster.local:$NODE1_IP" \
- -v /tmp/sam-token:/var/run/secrets/tokens/sam-token \
- sam-node:local run \
- --hub "http://sam-hub.default.svc.cluster.local:9090" \
- --jwt-path "/var/run/secrets/tokens/sam-token" \
- --api-token "secret-token" \
- --bind-addr "0.0.0.0:8080" \
- --allow-loopback
-
- # Wait for external node to be ready
- if ! docker_wait_for_log external-sam-node "SAM Node Online|Successfully enrolled" 30; then
- echo "external-sam-node failed to start or connect. Logs:"
- docker logs external-sam-node
- return 1
- fi
-
- # Register a service on the first cluster node
- local pod_name
- pod_name=$(kubectl --context="${KUBECONTEXT}" get pods -l app=sam-node -o jsonpath='{.items[0].metadata.name}')
-
- # Wait for the cluster node to log its PeerID
- k8s_wait_for_log "${pod_name}" "PeerID:" 20
- local cluster_node_peer_id
- cluster_node_peer_id=$(kubectl --context="${KUBECONTEXT}" logs "${pod_name}" | grep "PeerID:" | head -n 1 | awk '{print $2}' | tr -d '\r' || true)
-
- # Port forward cluster node to register a service from the host
- kubectl --context="${KUBECONTEXT}" port-forward "${pod_name}" 8081:8080 &
- PF_NODE_PID=$!
-
- local i
- for ((i=0; i<50; i++)); do
- if nc -z 127.0.0.1 8081 2>/dev/null; then
- break
- fi
- sleep 0.1
- done
-
- # Register a service on the cluster node that points to its own /healthz endpoint
- python3 -c "
-import urllib.request
-import json
-data = {
- 'service': {
- 'type': 'SERVICE_TYPE_MCP',
- 'name': 'echo-tool',
- 'description': 'test'
- },
- 'target_url': 'http://127.0.0.1:8080/healthz'
-}
-req = urllib.request.Request(
- 'http://127.0.0.1:8081/sam/service/register',
- data=json.dumps(data).encode('utf-8'),
- headers={
- 'Authorization': 'Bearer secret-token',
- 'Content-Type': 'application/json'
- }
-)
-with urllib.request.urlopen(req) as response:
- print(response.read().decode('utf-8'))
-"
-
- # The external node will use its sidecar egress proxy to talk to the cluster node over the mesh.
- echo "Testing mesh datapath..."
- local output
- local i
- for ((i=0; i<60; i++)); do
- output=$(docker run --rm --network container:external-sam-node alpine wget -q -O- --timeout=2 --header="Authorization: Bearer secret-token" "http://127.0.0.1:8080/sam/${cluster_node_peer_id}/mcp/echo-tool" || true)
- if [ "$output" == "OK" ]; then
- break
- fi
- sleep 1
- done
-
- if [ "$output" != "OK" ]; then
- echo "Expected 'OK', got '$output'"
- echo "=== External Node Logs ==="
- docker logs external-sam-node || true
- return 1
- fi
-
- # Cleanup
- kill $PF_NODE_PID || true
- docker rm -f external-sam-node || true
-}
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index cb73172e..54e1e5cc 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -1,32 +1,23 @@
#!/usr/bin/env bash
# Shared BATS helpers for containerized SAM mesh tests.
+# Refactored to use Kind-hosted unified OIDC and Hub services.
if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
MESH_HELPERS_LOADED=1
MESH_RUNTIME_IMAGE="${MESH_RUNTIME_IMAGE:-sam-e2e-runtime:local}"
- MESH_NETWORK_SUBNET_BASE="${MESH_NETWORK_SUBNET_BASE:-172.31}"
- MESH_NETWORK=""
+ MESH_NETWORK="kind"
MESH_CONTAINERS=()
MESH_PREFIX=""
MESH_SOCKET_DIR=""
- # Best-effort cleanup of leaked resources from prior failed runs.
mesh_cleanup_stale_resources() {
- local id
- for id in $(docker ps -aq --filter "name=mesh-"); do
- docker rm -f "${id}" >/dev/null 2>&1 || true
- done
-
- local net
- for net in $(docker network ls --format '{{.Name}}'); do
- case "${net}" in
- mesh-*-net)
- docker network rm "${net}" >/dev/null 2>&1 || true
- ;;
- esac
- done
+ local stale_containers
+ stale_containers=$(docker ps -aq --filter "name=mesh-")
+ if [[ -n "${stale_containers}" ]]; then
+ docker rm -f ${stale_containers} >/dev/null 2>&1 || true
+ fi
}
mesh_require_docker() {
@@ -45,50 +36,44 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
}
mesh_setup_env() {
- if [[ -n "${MESH_NETWORK:-}" ]]; then
+ if [[ -n "${MESH_PREFIX:-}" ]]; then
return 0
fi
- mesh_cleanup_stale_resources
-
mesh_build_runtime_image
MESH_PREFIX="mesh-${BATS_TEST_NUMBER}-$$-$(date +%s)"
- MESH_NETWORK="${MESH_PREFIX}-net"
-
- # Use a deterministic subnet slice to reduce chance of Docker IPAM exhaustion.
- local subnet
- local octet
- octet=$(( (BATS_TEST_NUMBER % 200) + 20 ))
- subnet="${MESH_NETWORK_SUBNET_BASE}.${octet}.0/24"
-
- if ! docker network create --subnet "${subnet}" "${MESH_NETWORK}" >/dev/null 2>&1; then
- docker network create "${MESH_NETWORK}" >/dev/null
- fi
-
MESH_SOCKET_DIR="/tmp/${MESH_PREFIX}-sockets"
mkdir -p "${MESH_SOCKET_DIR}"
-
- if ! docker image inspect sam-mock-oidc:local >/dev/null 2>&1; then
- docker build -t sam-mock-oidc:local -f tests/e2e/docker/Dockerfile.mock-oidc . >/dev/null
- fi
+ CLEANUP_VOLUMES=()
}
mesh_cleanup_test_resources() {
+ if [[ "${BATS_TEST_COMPLETED:-0}" -ne 1 ]]; then
+ mkdir -p tests/e2e/logs
+ local c
+ for c in "${MESH_CONTAINERS[@]}"; do
+ docker logs "${c}" > "tests/e2e/logs/${c}.log" 2>&1 || true
+ done
+ fi
+
local c
for c in "${MESH_CONTAINERS[@]}"; do
docker rm -f "${c}" >/dev/null 2>&1 || true
done
MESH_CONTAINERS=()
+
+ local v
+ for v in "${CLEANUP_VOLUMES[@]}"; do
+ docker volume rm "${v}" >/dev/null 2>&1 || true
+ done
+ CLEANUP_VOLUMES=()
}
mesh_cleanup_env() {
mesh_cleanup_test_resources
- # We leave the network and socket dir alive for the suite
}
- mesh_cleanup_suite() {
- mesh_cleanup_stale_resources
- }
+
mesh_gen_hex32() {
hexdump -vn 32 -e '1/1 "%02x"' /dev/urandom
@@ -188,70 +173,135 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
return 1
}
- mesh_start_mock_oidc() {
- local name="${MESH_PREFIX}-oidc"
- if docker inspect -f '{{.State.Running}}' "${name}" 2>/dev/null | grep -q "true"; then
- return 0
- fi
- docker run -d \
- --name "${name}" \
- --network "${MESH_NETWORK}" \
- --network-alias mock-oidc \
- sam-mock-oidc:local >/dev/null
- MESH_CONTAINERS+=("${name}")
- mesh_wait_for_log "${name}" "Mock OIDC server ready" 30
+ mesh_get_add_hosts() {
+ local net="${MESH_NETWORK:-kind}"
+ # Resolve mock-oidc node IP
+ local oidc_node
+ oidc_node=$(kubectl --context="${KUBECONTEXT:-kind-sam-wi-test}" get pod -l app=mock-oidc -o jsonpath='{.items[0].spec.nodeName}')
+ local oidc_node_ip
+ oidc_node_ip=$(docker inspect -f "{{(index .NetworkSettings.Networks \"${net}\").IPAddress}}" "${oidc_node}")
+
+ # Check if a custom local Hub container exists in this test scope
+ local hub_ip=""
+ local custom_hub="${MESH_PREFIX}-hub"
+ if docker inspect "${custom_hub}" >/dev/null 2>&1; then
+ hub_ip=$(docker inspect -f "{{(index .NetworkSettings.Networks \"${net}\").IPAddress}}" "${custom_hub}")
+ echo "--add-host mock-oidc:${oidc_node_ip} --add-host sam-hub:${hub_ip}"
+ else
+ # Resolve sam-hub-0 node IP
+ local hub_node
+ hub_node=$(kubectl --context="${KUBECONTEXT:-kind-sam-wi-test}" get pod sam-hub-0 -o jsonpath='{.spec.nodeName}')
+ local hub_node_ip
+ hub_node_ip=$(docker inspect -f "{{(index .NetworkSettings.Networks \"${net}\").IPAddress}}" "${hub_node}")
+ echo "--add-host mock-oidc:${oidc_node_ip} --add-host sam-hub:${hub_node_ip} --add-host ${hub_node}:${hub_node_ip}"
+ fi
}
- mesh_start_hub() {
- local config_path="${1:-tests/e2e/fixtures/default-policy.yaml}"
- local name="${MESH_PREFIX}-hub"
- if docker inspect -f '{{.State.Running}}' "${name}" 2>/dev/null | grep -q "true"; then
- return 0
+ mesh_setup_suite() {
+ export PATH="${HOME}/go/bin:/usr/local/bin:/usr/bin:$PATH"
+ mesh_cleanup_stale_resources
+ if ! command -v docker >/dev/null 2>&1 || ! docker info >/dev/null 2>&1; then
+ echo "docker not available or daemon not running" >&2
+ return 1
+ fi
+ if ! command -v kind >/dev/null 2>&1; then
+ echo "kind not available" >&2
+ return 1
+ fi
+ if ! command -v kubectl >/dev/null 2>&1; then
+ echo "kubectl not available" >&2
+ return 1
+ fi
+ if ! command -v jq >/dev/null 2>&1; then
+ echo "jq not available" >&2
+ return 1
fi
- local key
- key="$(mesh_gen_hex32)"
- docker run -d \
- --name "${name}" \
- --network "${MESH_NETWORK}" \
- --network-alias sam-hub \
- -v "$(pwd)/${config_path}:/etc/sam/hub-config.yaml:ro" \
- "sam-hub:local" \
- --issuer "http://mock-oidc:18080" \
- --client-id "sam-e2e" \
- --allowed-audiences "sam-e2e,sam-mesh-audience" \
- --key "${key}" \
- --listen "/ip4/0.0.0.0/tcp/4002" \
- --external-multiaddr "/dns4/sam-hub/tcp/4002" \
- --policy-file "/etc/sam/hub-config.yaml" \
- --mesh "e2e-mesh" >/dev/null
+ cd "${BATS_TEST_DIRNAME}/../.."
+ make
+ make docker-build
- MESH_CONTAINERS+=("${name}")
- mesh_wait_for_log "${name}" "PeerID:" 20
-
- # Extract Peer ID for nodes to use
- local peer_id
- peer_id=$(docker logs "${name}" 2>&1 | grep -oE '12D3Koo[a-zA-Z0-9]+' | head -n 1)
- echo "${peer_id}" > "/tmp/${MESH_PREFIX}-hub-peer-id"
- echo "Extracted Hub PeerID: ${peer_id}"
+ if [[ ! -x "./bin/sam-node" || ! -x "./bin/sam-hub" || ! -x "./bin/mcp-client" ]]; then
+ echo "missing binaries; run: make build" >&2
+ return 1
+ fi
+
+ export KUBERNETES_CLUSTER_NAME="sam-wi-test"
+ export KUBECONTEXT="kind-${KUBERNETES_CLUSTER_NAME}"
+
+ if ! kind get clusters | grep -q "^${KUBERNETES_CLUSTER_NAME}$"; then
+ kind delete cluster --name "${KUBERNETES_CLUSTER_NAME}" >/dev/null 2>&1 || true
+ cat <<KIND | kind create cluster --name "${KUBERNETES_CLUSTER_NAME}" --config=-
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
+KIND
+
+ kind load docker-image sam-hub:local --name "${KUBERNETES_CLUSTER_NAME}"
+ kind load docker-image sam-node:local --name "${KUBERNETES_CLUSTER_NAME}"
+ kind load docker-image sam-mock-oidc:local --name "${KUBERNETES_CLUSTER_NAME}"
+ else
+ kind export kubeconfig --name "${KUBERNETES_CLUSTER_NAME}"
+ fi
+
+ kubectl --context="${KUBECONTEXT}" apply -f tests/e2e/fixtures/mock-oidc.yaml
+ kubectl --context="${KUBECONTEXT}" rollout status deployment/mock-oidc --timeout=60s
+
+ local kube_issuer
+ kube_issuer=$(kubectl --context="${KUBECONTEXT}" get --raw /.well-known/openid-configuration | jq -r .issuer)
+ [[ -n "${kube_issuer}" ]]
+
+ kubectl --context="${KUBECONTEXT}" apply -f tests/e2e/fixtures/allow-anonymous-oidc.yaml
+
+ export ISSUERS="${kube_issuer},http://mock-oidc:18080"
+ envsubst '$ISSUERS' < tests/e2e/fixtures/sam-hub.yaml | kubectl --context="${KUBECONTEXT}" apply -f -
+ kubectl --context="${KUBECONTEXT}" rollout restart statefulset/sam-hub
+ kubectl --context="${KUBECONTEXT}" rollout status statefulset/sam-hub --timeout=60s
+
+ local i
+ for ((i=0; i<200; i++)); do
+ if kubectl --context="${KUBECONTEXT}" logs "sam-hub-0" 2>&1 | grep -q "PeerID:"; then
+ break
+ fi
+ sleep 0.1
+ done
+ local hub_peer_id
+ hub_peer_id=$(kubectl --context="${KUBECONTEXT}" logs "sam-hub-0" | grep -oE '12D3Koo[a-zA-Z0-9]+' | head -n 1 || true)
+ [[ -n "${hub_peer_id}" ]]
+
+ echo "${hub_peer_id}" > "/tmp/sam-wi-test-hub-peer-id"
+ return 0
+ }
+
+ mesh_teardown_suite() {
+ cd "${BATS_TEST_DIRNAME}/../.."
+ mesh_cleanup_stale_resources
+ kind delete cluster --name "${KUBERNETES_CLUSTER_NAME:-sam-wi-test}" >/dev/null 2>&1 || true
+ echo "teardown suite"
}
- # Optional 3rd arg: host-relative path to a sam-node config yaml.
- # When set, mounted into the container and passed via --config.
mesh_start_node() {
local idx="$1"
local flags="${2:-}"
local config_path="${3:-}"
local name="${MESH_PREFIX}-node-${idx}"
+ local add_hosts
+ add_hosts=$(mesh_get_add_hosts)
+
local hub_peer_id
hub_peer_id=$(cat "/tmp/${MESH_PREFIX}-hub-peer-id")
local mount_args=()
local config_args=()
if [[ -n "${config_path}" ]]; then
- mount_args+=(-v "$(pwd)/${config_path}:/etc/sam/node-config.yaml:ro")
+ local abs_config
+ abs_config=$(realpath "${config_path}")
+ mount_args+=(-v "${abs_config}:/etc/sam/node-config.yaml:ro")
config_args+=(--config /etc/sam/node-config.yaml)
fi
@@ -259,10 +309,12 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
--name "${name}" \
--network "${MESH_NETWORK}" \
--network-alias "sam-node-${idx}" \
+ ${add_hosts} \
"${mount_args[@]}" \
"${MESH_RUNTIME_IMAGE}" \
/usr/local/bin/sam-node run \
${flags} \
+ --log-level debug \
--discovery-interval 2s \
--hub "http://sam-hub:9090" \
--client-id "sam-mesh-audience" \
@@ -272,14 +324,30 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
--listen "/ip4/0.0.0.0/tcp/5002" \
--bind-addr "0.0.0.0:8080" \
--api-token "secret-token" \
- --mesh "e2e-mesh" \
+ --mesh "${MESH_PREFIX}" \
"${config_args[@]}" >/dev/null
MESH_CONTAINERS+=("${name}")
}
+ mesh_start_mock_oidc() {
+ # No-op: Mock OIDC is running in k8s
+ return 0
+ }
+
+ mesh_start_hub() {
+ # No-op: Hub is running in k8s
+ local peer_id
+ peer_id=$(cat "/tmp/sam-wi-test-hub-peer-id")
+ echo "${peer_id}" > "/tmp/${MESH_PREFIX}-hub-peer-id"
+ return 0
+ }
+
mesh_assert_container_running() {
local name="$1"
+ if [[ "${name}" == *"-hub" ]]; then
+ name="sam-hub"
+ fi
local state
state="$(docker inspect -f '{{.State.Running}}' "${name}" 2>/dev/null || true)"
[[ "${state}" == "true" ]]
diff --git a/tests/e2e/policy.bats b/tests/e2e/policy.bats
index 89a4f6eb..2432c5c6 100644
--- a/tests/e2e/policy.bats
+++ b/tests/e2e/policy.bats
@@ -152,21 +152,6 @@ setup() {
build_calc_mcp_image
mkdir -p tests/e2e/logs
- # Create volume for policies
- export POLICY_VOL="${MESH_PREFIX}-policy"
- docker volume create "${POLICY_VOL}"
-
- # Write policies to volume
- local hub_policy="version: \"v1alpha1\"
-bindings:
- - group: \"data-scientist\"
- role: \"mesh-member\"
-roles:
- mesh-member:
- allowed_services:
- - \"mcp://calculator\"
- - \"mcp://db-agent\""
-
local node_policy="version: \"v1alpha1\"
services:
- type: \"mcp\"
@@ -181,69 +166,20 @@ attenuation:
policies:
- 'deny if service(\"mcp\", \"db-agent\");'"
- docker run --rm -v "${POLICY_VOL}:/policies" busybox sh -c "cat <<'EOF' > /policies/policies.yaml
-${hub_policy}
-EOF
-cat <<'EOF' > /policies/local_policy.yaml
-${node_policy}
-EOF"
+ local config_file="/tmp/${MESH_PREFIX}-local_policy.yaml"
+ echo "${node_policy}" > "${config_file}"
# Start services
- run mesh_start_mock_oidc_custom
- [[ "$status" -eq 0 ]]
-
start_calc_mcp
- # Start Hub with policy file
- local hub_name="${MESH_PREFIX}-hub"
- local key
- key="$(mesh_gen_hex32)"
-
- docker run -d \
- --name "${hub_name}" \
- --network "${MESH_NETWORK}" \
- --network-alias sam-hub \
- -v "${POLICY_VOL}:/etc/sam" \
- "sam-hub:local" \
- --issuer "http://mock-oidc:18080" \
- --client-id "sam-e2e" \
- --allowed-audiences "sam-e2e" \
- --key "${key}" \
- --listen "/ip4/0.0.0.0/tcp/4002" \
- --external-multiaddr "/dns4/sam-hub/tcp/4002" \
- --mesh "e2e-mesh" \
- --policy-file "/etc/sam/policies.yaml" >/dev/null
-
- MESH_CONTAINERS+=("${hub_name}")
- mesh_wait_for_log "${hub_name}" "PeerID:" 20
-
- local hub_peer_id
- hub_peer_id=$(docker logs "${hub_name}" 2>&1 | grep -oE '12D3Koo[a-zA-Z0-9]+' | head -n 1)
- echo "${hub_peer_id}" > "/tmp/${MESH_PREFIX}-hub-peer-id"
-
- # Start Node 1 (Target) with local policy
- docker run -d \
- --name "${MESH_PREFIX}-node-1" \
- --network "${MESH_NETWORK}" \
- --network-alias "sam-node-1" \
- -v "${POLICY_VOL}:/etc/sam" \
- "sam-node:local" \
- run \
- --hub "http://sam-hub:9090" \
- --client-id "sam-e2e" \
- --client-secret "sam-e2e-secret" \
- --oidc-issuer "http://mock-oidc:18080" \
- --listen "/ip4/0.0.0.0/udp/5001/quic-v1" \
- --listen "/ip4/0.0.0.0/tcp/5002" \
- --bind-addr "0.0.0.0:8080" \
- --api-token "secret-token" \
- --mesh "e2e-mesh" \
- --config "/etc/sam/local_policy.yaml" >/dev/null
+ # Initialize Hub PeerID from suite-level file
+ mesh_start_hub
- MESH_CONTAINERS+=("${MESH_PREFIX}-node-1")
+ # Start Node 1 (Target) with local policy file
+ mesh_start_node 1 "" "${config_file}"
mesh_wait_for_log "${MESH_PREFIX}-node-1" "Successfully enrolled" 20
- # Start Node 2 (Caller) without specific local policy
+ # Start Node 2 (Caller)
mesh_start_node 2
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2
@@ -259,7 +195,7 @@ EOF"
for ((i=0; i<40; i++)); do
local output
- output="$(docker run --rm --network "${MESH_NETWORK}" "${MESH_RUNTIME_IMAGE}" mcp-client -url "http://sam-node-2:8080/mcp" -tool "get_mesh_info" 2>/dev/null)"
+ output="$(docker run --rm --network "${MESH_NETWORK}" "${MESH_RUNTIME_IMAGE}" mcp-client -url "http://sam-node-2:8080/mcp" -tool "get_mesh_info")"
TARGET_PEER_ID=$(echo "${output}" | grep -oE '12D3Koo[a-zA-Z0-9]+' | grep -v "${hub_id}" | grep -v "${node2_id}" | head -n 1)
if [[ -n "${TARGET_PEER_ID}" ]]; then
break
@@ -292,7 +228,7 @@ teardown() {
done
fi
mesh_cleanup_env
- docker volume rm "${POLICY_VOL}" >/dev/null 2>&1 || true
+ rm -f "/tmp/${MESH_PREFIX}-local_policy.yaml" || true
}
@test "Policy E2E: Positive Path (Allowed by Hub, Not blocked by Node)" {
diff --git a/tests/e2e/relay.bats b/tests/e2e/relay.bats
index 0934692d..3b4c7133 100644
--- a/tests/e2e/relay.bats
+++ b/tests/e2e/relay.bats
@@ -4,21 +4,25 @@ load "lib/container_mesh.bash"
setup() {
mesh_setup_env
- mkdir -p tests/e2e/logs
+ CLEANUP_NETWORKS=()
+ DISCONNECT_CONTAINERS=()
}
teardown() {
- if [[ "${BATS_TEST_COMPLETED:-0}" -ne 1 ]]; then
- mkdir -p tests/e2e/logs
- local ids
- ids="$(docker ps -aq --filter "name=mesh-")"
- for id in ${ids}; do
- local name
- name="$(docker inspect -f '{{.Name}}' "${id}" | tr -d '/')"
- docker logs "${id}" > "tests/e2e/logs/${name}.log" 2>&1 || true
- done
- fi
+ local item
+ for item in "${DISCONNECT_CONTAINERS[@]}"; do
+ local container="${item%%:*}"
+ local net="${item#*:}"
+ docker network disconnect "${net}" "${container}" >/dev/null 2>&1 || true
+ done
+ DISCONNECT_CONTAINERS=()
+
mesh_cleanup_env
+ local net
+ for net in "${CLEANUP_NETWORKS[@]}"; do
+ docker network rm "${net}" >/dev/null 2>&1 || true
+ done
+ CLEANUP_NETWORKS=()
}
@test "node starts with --enable-relay=true and logs message" {
@@ -29,8 +33,7 @@ teardown() {
[[ "$status" -eq 0 ]]
# Start node with relay flag
- run mesh_start_node "1" "--enable-relay=true --log-level=debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node "1" "--enable-relay=true --log-level=debug"
# Wait for log message
run mesh_wait_for_log "${MESH_PREFIX}-node-1" "Enabling Relay Service" 20
@@ -46,17 +49,23 @@ teardown() {
local MESH_NETWORK_2="${MESH_PREFIX}-2-net"
docker network create "${MESH_NETWORK_2}"
+ CLEANUP_NETWORKS+=("${MESH_NETWORK_2}")
- docker network connect --alias sam-hub "${MESH_NETWORK_2}" "${MESH_PREFIX}-hub"
- docker network connect --alias mock-oidc "${MESH_NETWORK_2}" "${MESH_PREFIX}-oidc"
+ local hub_node
+ hub_node=$(kubectl --context="${KUBECONTEXT}" get pod sam-hub-0 -o jsonpath='{.spec.nodeName}')
+ local oidc_node
+ oidc_node=$(kubectl --context="${KUBECONTEXT}" get pod -l app=mock-oidc -o jsonpath='{.items[0].spec.nodeName}')
- run mesh_start_node "1" "--enable-relay=true --log-level=debug"
- [[ "$status" -eq 0 ]]
+ docker network connect "${MESH_NETWORK_2}" "${hub_node}"
+ DISCONNECT_CONTAINERS+=("${hub_node}:${MESH_NETWORK_2}")
+ docker network connect "${MESH_NETWORK_2}" "${oidc_node}"
+ DISCONNECT_CONTAINERS+=("${oidc_node}:${MESH_NETWORK_2}")
+
+ mesh_start_node "1" "--enable-relay=true --log-level=debug"
OLD_NET=$MESH_NETWORK
MESH_NETWORK=$MESH_NETWORK_2
- run mesh_start_node "2" "--log-level=debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node "2" "--log-level=debug"
MESH_NETWORK=$OLD_NET
run mesh_wait_for_log "${MESH_PREFIX}-node-1" "PeerID:" 20
diff --git a/tests/e2e/revocation_test.bats b/tests/e2e/revocation_test.bats
index 3d9a9007..d6060c96 100644
--- a/tests/e2e/revocation_test.bats
+++ b/tests/e2e/revocation_test.bats
@@ -23,11 +23,12 @@ teardown() {
--name "${hub_name}" \
--network "${MESH_NETWORK}" \
--network-alias sam-hub \
+ $(mesh_get_add_hosts) \
"sam-hub:local" \
--issuer "http://mock-oidc:18080" \
--client-id "sam-e2e" \
--key "${hub_key}" \
- --mesh "e2e-mesh" \
+ --mesh "${MESH_PREFIX}" \
--admin-token "e2e-token" \
--listen "/ip4/0.0.0.0/tcp/4002" \
--external-multiaddr "/dns4/sam-hub/tcp/4002" \
@@ -42,8 +43,7 @@ teardown() {
# Start Node 1
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 20
mesh_wait_for_mcp_ready 1 20
@@ -53,8 +53,7 @@ teardown() {
# Start Node 2
echo "[$(date +%T)] Starting Node 2"
- run mesh_start_node 2 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 2 "--log-level debug"
local node2_name="${MESH_PREFIX}-node-2"
mesh_wait_for_log "${node2_name}" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
diff --git a/tests/e2e/services.bats b/tests/e2e/services.bats
index c811786b..f1ca7ea8 100644
--- a/tests/e2e/services.bats
+++ b/tests/e2e/services.bats
@@ -38,8 +38,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--log-level debug"
- [[ "$status" -eq 0 ]]
+ mesh_start_node 1 "--log-level debug"
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -48,10 +47,9 @@ teardown() {
start_calc_mcp
echo "[$(date +%T)] Starting Node 2 (with calculator service config)"
- run mesh_start_node 2 \
+ mesh_start_node 2 \
"--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
- [[ "$status" -eq 0 ]]
local node2_name="${MESH_PREFIX}-node-2"
mesh_wait_for_log "${node2_name}" "SAM Node Online" 20
mesh_wait_for_mcp_ready 2 20
@@ -75,6 +73,7 @@ teardown() {
echo "[$(date +%T)] Discovering MCP services from Node 1 (type-only)"
run docker run --rm --network "${MESH_NETWORK}" \
"${MESH_RUNTIME_IMAGE}" mcp-client \
+ -timeout 30 \
-url "http://sam-node-1:8080/mcp" \
-tool "discover_remote_services" \
-args '{"type":"mcp"}'
@@ -91,6 +90,15 @@ teardown() {
and .peer_id == $pid
and .srv_description == "Simple math operations")] | length
')
- echo "Matching entries: ${match_count}"
+ echo "Matching entries for calculator: ${match_count}"
[[ "${match_count}" -eq 1 ]]
+
+ local underscore_match_count
+ underscore_match_count=$(echo "$catalog" | jq --arg pid "${node2_peer_id}" '
+ [.[] | select(.srv_name == "calc_service"
+ and .peer_id == $pid
+ and .srv_description == "Simple math operations with underscore")] | length
+ ')
+ echo "Matching entries for calc_service: ${underscore_match_count}"
+ [[ "${underscore_match_count}" -eq 1 ]]
}
diff --git a/tests/e2e/setup_suite.bash b/tests/e2e/setup_suite.bash
index 5cce475c..e0177758 100644
--- a/tests/e2e/setup_suite.bash
+++ b/tests/e2e/setup_suite.bash
@@ -2,51 +2,13 @@
set -eu
-function setup_suite {
- export PATH="${HOME}/go/bin:$PATH"
- export BATS_TEST_TIMEOUT=150
-
- if ! command -v docker >/dev/null 2>&1 || ! docker info >/dev/null 2>&1; then
- echo "docker not available or daemon not running" >&2
- exit 1
- fi
- if ! command -v kind >/dev/null 2>&1; then
- echo "kind not available" >&2
- exit 1
- fi
- if ! command -v kubectl >/dev/null 2>&1; then
- echo "kubectl not available" >&2
- exit 1
- fi
- if ! command -v jq >/dev/null 2>&1; then
- echo "jq not available" >&2
- exit 1
- fi
-
- # tests/e2e
- cd "$BATS_TEST_DIRNAME"/../..
- make
- make docker-build
+# Load container mesh helpers
+source "${BATS_TEST_DIRNAME}/lib/container_mesh.bash"
- if [[ ! -x "./bin/sam-node" || ! -x "./bin/sam-hub" || ! -x "./bin/mcp-client" ]]; then
- echo "missing binaries; run: make build" >&2
- exit 1
- fi
-
- export BATS_TEST_NUMBER=0
- source tests/e2e/lib/container_mesh.bash
- mesh_setup_env
- export MESH_PREFIX
- export MESH_NETWORK
-
- # Ensure the mock oidc and hub are running for all tests
- mesh_start_mock_oidc
- mesh_start_hub
+function setup_suite {
+ mesh_setup_suite
}
function teardown_suite {
- cd "$BATS_TEST_DIRNAME"/../..
- source tests/e2e/lib/container_mesh.bash
- mesh_cleanup_suite
- echo "teardown suite"
+ mesh_teardown_suite
}
\ No newline at end of file