Skip to content

Agent Mesh

Fix flake due to biscuit timeout

Antonio Ojea53b15af29c3f
diff --git a/cmd/sam-node/gate_test.go b/cmd/sam-node/gate_test.go
index 4220a2c2..c14ca7b7 100644
--- a/cmd/sam-node/gate_test.go
+++ b/cmd/sam-node/gate_test.go
@@ -48,8 +48,9 @@ func TestConnectionGater(t *testing.T) {
}
node := &SamNode{
- Store: store,
- revokedPeers: cache,
+ Store: store,
+ revokedPeers: cache,
+ BiscuitTimeout: 500 * time.Millisecond,
}
gater := &nodeConnGate{node: node}
diff --git a/cmd/sam-node/mcp_test.go b/cmd/sam-node/mcp_test.go
index 0fe44640..fdb5f183 100644
--- a/cmd/sam-node/mcp_test.go
+++ b/cmd/sam-node/mcp_test.go
@@ -20,6 +20,7 @@ import (
"net/http"
"net/http/httptest"
"testing"
+ "time"
dht "github.com/libp2p/go-libp2p-kad-dht"
"github.com/libp2p/go-libp2p/core/peerstore"
@@ -29,7 +30,9 @@ import (
func TestMCPHandler_HTTP(t *testing.T) {
// Setup a dummy node
- node := &SamNode{}
+ node := &SamNode{
+ BiscuitTimeout: 500 * time.Millisecond,
+ }
handler := NewMCPHandler(node)
ts := httptest.NewServer(handler)
@@ -88,8 +91,9 @@ func TestResolveRelayAddresses(t *testing.T) {
defer func() { _ = kdht.Close() }()
node := &SamNode{
- Host: localHost,
- DHT: kdht,
+ Host: localHost,
+ DHT: kdht,
+ BiscuitTimeout: 500 * time.Millisecond,
}
// Create relay host
diff --git a/cmd/sam-node/middleware_test.go b/cmd/sam-node/middleware_test.go
index a2f0f51d..050daf8f 100644
--- a/cmd/sam-node/middleware_test.go
+++ b/cmd/sam-node/middleware_test.go
@@ -146,9 +146,10 @@ func TestAuthorize(t *testing.T) {
}
node := &SamNode{
- Store: store,
- trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
- TrustHubRBAC: true,
+ Store: store,
+ trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
+ TrustHubRBAC: true,
+ BiscuitTimeout: 500 * time.Millisecond,
}
req := RequestContext{
@@ -357,9 +358,10 @@ func TestRevocation(t *testing.T) {
cache, _ := lru.New[string, int64](10000)
rl, _ := NewPeerRateLimiter(100)
node := &SamNode{
- trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
- revokedPeers: cache,
- rateLimiter: rl,
+ trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
+ revokedPeers: cache,
+ rateLimiter: rl,
+ BiscuitTimeout: 500 * time.Millisecond,
}
// Mark as revoked
@@ -413,7 +415,8 @@ func TestVerifyEvent(t *testing.T) {
}
node := &SamNode{
- trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
+ trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
+ BiscuitTimeout: 500 * time.Millisecond,
}
event := &api.MeshEvent{
@@ -480,6 +483,7 @@ func TestVerifyBiscuitCache(t *testing.T) {
node := &SamNode{
trustedKeys: []TrustedKey{{Key: pub, ReceivedAt: time.Now()}},
verificationCache: cache,
+ BiscuitTimeout: 500 * time.Millisecond,
}
// Case 1: Fresh verification (uncached)
diff --git a/cmd/sam-node/node_test.go b/cmd/sam-node/node_test.go
index 15aa9011..9d797ea7 100644
--- a/cmd/sam-node/node_test.go
+++ b/cmd/sam-node/node_test.go
@@ -30,7 +30,8 @@ import (
func TestHandleBannedEvent(t *testing.T) {
revokedCache, _ := lru.New[string, int64](10)
node := &SamNode{
- revokedPeers: revokedCache,
+ revokedPeers: revokedCache,
+ BiscuitTimeout: 500 * time.Millisecond,
}
event := &api.MeshEvent{
@@ -47,7 +48,7 @@ func TestHandleBannedEvent(t *testing.T) {
}
func TestHandleKeyRotationEvent(t *testing.T) {
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
pub, _, err := ed25519.GenerateKey(nil)
if err != nil {
@@ -74,7 +75,8 @@ func TestStartRenewalLoop_ExpiredAndFails(t *testing.T) {
_ = store.SaveIdentityExpiration(time.Now().Add(-1 * time.Hour).Unix())
node := &SamNode{
- Store: store,
+ BiscuitTimeout: 500 * time.Millisecond,
+ Store: store,
}
// Run the renewal loop. Since there's no JWT/Issuer provided, it fails to renew.
diff --git a/cmd/sam-node/oidc_test.go b/cmd/sam-node/oidc_test.go
index af0e9a1e..a72ad5a4 100644
--- a/cmd/sam-node/oidc_test.go
+++ b/cmd/sam-node/oidc_test.go
@@ -48,7 +48,7 @@ func TestInteractiveLogin(t *testing.T) {
server := httptest.NewServer(mux)
defer server.Close()
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
@@ -93,7 +93,7 @@ func TestDiscoverEndpoints(t *testing.T) {
server := httptest.NewServer(mux)
defer server.Close()
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
ctx := context.Background()
tokenURL, authURL, err := node.DiscoverEndpoints(ctx, server.URL)
@@ -146,7 +146,7 @@ func TestInteractiveLoginWithRefresh(t *testing.T) {
}
}()
- node := &SamNode{Store: store}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond, Store: store}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
@@ -250,7 +250,7 @@ func TestRenewWithRefreshToken(t *testing.T) {
t.Fatalf("Failed to save Refresh Token: %v", err)
}
- node := &SamNode{Store: store}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond, Store: store}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
diff --git a/cmd/sam-node/relay_acl_test.go b/cmd/sam-node/relay_acl_test.go
index abfdc6a6..0b33e55c 100644
--- a/cmd/sam-node/relay_acl_test.go
+++ b/cmd/sam-node/relay_acl_test.go
@@ -16,13 +16,14 @@ package main
import (
"testing"
+ "time"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multiaddr"
)
func TestNodeRelayACL_AllowConnect(t *testing.T) {
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
acl := &nodeRelayACL{node: node}
srcPeer := peer.ID("src-peer")
@@ -49,7 +50,7 @@ func TestNodeRelayACL_AllowConnect(t *testing.T) {
}
func TestNodeRelayACL_AllowReserve(t *testing.T) {
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
acl := &nodeRelayACL{node: node}
peerID := peer.ID("some-peer")
diff --git a/cmd/sam-node/sidecar_test.go b/cmd/sam-node/sidecar_test.go
index 12d26d3e..574d5854 100644
--- a/cmd/sam-node/sidecar_test.go
+++ b/cmd/sam-node/sidecar_test.go
@@ -146,7 +146,7 @@ func TestHandleRegisterService(t *testing.T) {
// Wait for DHT to recognize the peer
time.Sleep(100 * time.Millisecond)
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(d),
DHT: d,
}
@@ -185,7 +185,7 @@ func TestHandleRegisterService(t *testing.T) {
}
func TestHandleUnregisterService(t *testing.T) {
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(&fakeDHT{}),
}
node.services.insertService(&testService{info: &api.ServiceInfo{Name: "test-service"}})
@@ -222,7 +222,7 @@ func TestHandleDiscoverService(t *testing.T) {
}
defer func() { _ = d.Close() }()
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(d),
DHT: d,
Host: h,
@@ -281,7 +281,7 @@ func TestHandleDiscoverService(t *testing.T) {
}
func TestListLocalServices(t *testing.T) {
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(&fakeDHT{}),
}
@@ -299,7 +299,7 @@ func TestListLocalServices(t *testing.T) {
}
func TestListLocalServices_TypeFilter(t *testing.T) {
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(&fakeDHT{}),
}
mcpA := &api.ServiceInfo{Type: api.ServiceType_SERVICE_TYPE_MCP, Name: "mcp-a"}
@@ -398,7 +398,7 @@ func TestServiceKeyToCID_Equivalence(t *testing.T) {
}
func TestHandleRegisterService_Validation(t *testing.T) {
- node := &SamNode{
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond,
services: NewServiceRegistry(&fakeDHT{}),
}
@@ -458,7 +458,7 @@ func TestHandleRegisterService_Validation(t *testing.T) {
}
func TestStartSidecarServer_TokenMandatory(t *testing.T) {
- node := &SamNode{}
+ node := &SamNode{BiscuitTimeout: 500 * time.Millisecond}
// Test case: No token, no TLS
err := startSidecarServer(node, "127.0.0.1:0", "", "", "", "")