chore: fix tests (#3093)

Author: MasterPtato

packages/core/guard/core/src/proxy_service.rs

@@ -2253,6 +2253,9 @@ fn err_into_response(err: anyhow::Error) -> Result<Response<ResponseBody>> {
 	let (status, error_response) =
 		if let Some(rivet_err) = err.chain().find_map(|x| x.downcast_ref::<RivetError>()) {
 			let status = match (rivet_err.group(), rivet_err.code()) {
+				("api", "not_found") => StatusCode::NOT_FOUND,
+				("api", "unauthorized") => StatusCode::UNAUTHORIZED,
+				("api", "forbidden") => StatusCode::FORBIDDEN,
 				("guard", "rate_limit") => StatusCode::TOO_MANY_REQUESTS,
 				("guard", "upstream_error") => StatusCode::BAD_GATEWAY,
 				("guard", "routing_error") => StatusCode::BAD_GATEWAY,

packages/core/pegboard-serverless/src/lib.rs

@@ -1,14 +1,14 @@
 use std::{
 	collections::HashMap,
 	sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	},
 };
 
 use anyhow::Result;
-use base64::engine::general_purpose::STANDARD as BASE64;
 use base64::Engine;
+use base64::engine::general_purpose::STANDARD as BASE64;
 use futures_util::{StreamExt, TryStreamExt};
 use gas::prelude::*;
 use pegboard::keys;

packages/services/epoxy/src/ops/propose.rs

@@ -121,7 +121,7 @@ pub async fn run_paxos_accept(
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn commit(
+async fn commit(
 	ctx: &OperationCtx,
 	config: &protocol::ClusterConfig,
 	replica_id: ReplicaId,

scripts/tests/actor_e2e.ts

@@ -1,21 +1,26 @@
 #!/usr/bin/env tsx
 
-import { RIVET_ENDPOINT, RIVET_TOKEN, createActor, destroyActor } from "./utils";
+import { RIVET_ENDPOINT, RIVET_TOKEN, RIVET_NAMESPACE, createActor, destroyActor } from "./utils";
 
 async function main() {
+	let actorId;
+
 	try {
 		console.log("Starting actor E2E test...");
 
 		// Create an actor
 		console.log("Creating actor...");
-		const actorResponse = await createActor("default", "test-runner");
+		const actorResponse = await createActor(RIVET_NAMESPACE, "test-runner");
 		console.log("Actor created:", actorResponse.actor);
 
+		actorId = actorResponse.actor.actor_id;
+
 		// Make a request to the actor
 		console.log("Making request to actor...");
 		const actorPingResponse = await fetch(`${RIVET_ENDPOINT}/ping`, {
 			method: "GET",
 			headers: {
+				"X-Rivet-Token": RIVET_TOKEN,
 				"X-Rivet-Target": "actor",
 				"X-Rivet-Actor": actorResponse.actor.actor_id,
 			},
@@ -32,17 +37,13 @@ async function main() {
 		console.log("Actor ping response:", pingResult);
 
 		await testWebSocket(actorResponse.actor.actor_id);
-
-		console.log("Destroying actor...");
-		await destroyActor("default", actorResponse.actor.actor_id);
-
-		console.log("E2E test completed successfully!");
-
-		// HACK: This script does not exit by itself for some reason
-		process.exit(0);
 	} catch (error) {
-		console.error("E2E test failed:", error);
-		process.exit(1);
+		console.error(`Actor ${i} test failed:`, error);
+	} finally {
+		if (actorId) {
+			console.log(`Destroying actor ${i}...`);
+			await destroyActor(RIVET_NAMESPACE, actorId);
+		}
 	}
 }
 

scripts/tests/spam_actors.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env tsx
 
-import { RIVET_ENDPOINT, RIVET_TOKEN, createActor, destroyActor } from "./utils";
+import { RIVET_ENDPOINT, RIVET_TOKEN, RIVET_NAMESPACE, createActor, destroyActor } from "./utils";
 
 const ACTORS = parseInt(process.argv[2]) || 15;
 
@@ -18,17 +18,21 @@ async function main() {
 }
 
 async function testActor(i: number) {
+	let actorId;
 	try {
 		// Create an actor
 		console.log(`Creating actor ${i}...`);
-		const actorResponse = await createActor("default", "test-runner");
+		const actorResponse = await createActor(RIVET_NAMESPACE, "test-runner");
 		console.log("Actor created:", actorResponse.actor);
 
+		actorId = actorResponse.actor.actor_id;
+
 		// Make a request to the actor
 		console.log(`Making request to actor ${i}...`);
 		const actorPingResponse = await fetch(`${RIVET_ENDPOINT}/ping`, {
 			method: "GET",
 			headers: {
+				"X-Rivet-Token": RIVET_TOKEN,
 				"X-Rivet-Target": "actor",
 				"X-Rivet-Actor": actorResponse.actor.actor_id,
 			},
@@ -45,11 +49,13 @@ async function testActor(i: number) {
 		console.log(`Actor ${i} ping response:`, pingResult);
 
 		await testWebSocket(actorResponse.actor.actor_id);
-
-		console.log(`Destroying actor ${i}...`);
-		await destroyActor("default", actorResponse.actor.actor_id);
 	} catch (error) {
 		console.error(`Actor ${i} test failed:`, error);
+	} finally {
+		if (actorId) {
+			console.log(`Destroying actor ${i}...`);
+			await destroyActor(RIVET_NAMESPACE, actorId);
+		}
 	}
 }
 

scripts/tests/utils.ts

@@ -1,6 +1,7 @@
 export const RIVET_ENDPOINT =
 	process.env.RIVET_ENDPOINT ?? "http://localhost:6420";
 export const RIVET_TOKEN = process.env.RIVET_TOKEN ?? "dev";
+export const RIVET_NAMESPACE = process.env.RIVET_NAMESPACE ?? "default";
 
 export async function createActor(
 	namespaceName: string,
@@ -11,6 +12,7 @@ export async function createActor(
 		{
 			method: "POST",
 			headers: {
+				"Authorization": `Bearer ${RIVET_TOKEN}`,
 				"Content-Type": "application/json",
 			},
 			body: JSON.stringify({
@@ -64,6 +66,7 @@ export async function getOrCreateActorById(
 		{
 			method: "PUT",
 			headers: {
+				"Authorization": `Bearer ${RIVET_TOKEN}`,
 				"Content-Type": "application/json",
 			},
 			body: JSON.stringify({
@@ -95,6 +98,9 @@ export async function listActors(
 
 	const response = await fetch(url, {
 		method: "GET",
+		headers: {
+			"Authorization": `Bearer ${RIVET_TOKEN}`,
+		}
 	});
 
 	if (!response.ok) {