chore(actors): disable waiting for upgrade complete signal in api (#1898)

MasterPtato · MasterPtato · commit 960390eda2ef · 2025-01-22T15:16:34.000Z
&lt;!-- Please make sure there is an issue that this PR is correlated to. --&gt;

## Changes

&lt;!-- If there are frontend changes, please include screenshots. --&gt;
diff --git a/packages/api/actor/src/route/actors.rs b/packages/api/actor/src/route/actors.rs
@@ -518,9 +518,11 @@ pub async fn upgrade(
 
 	let build = resolve_build(&ctx, game_id, env_id, body.build, body.build_tags.flatten()).await?;
 
-	let mut sub = ctx
-		.subscribe::<ds::workflows::server::UpgradeStarted>(("server_id", actor_id))
-		.await?;
+	// TODO: Add back once we figure out how to cleanly handle if a wf is already complete when
+	// upgrading
+	// let mut sub = ctx
+	// 	.subscribe::<ds::workflows::server::UpgradeStarted>(("server_id", actor_id))
+	// 	.await?;
 
 	ctx.signal(ds::workflows::server::Upgrade {
 		image_id: build.build_id,
@@ -529,7 +531,7 @@ pub async fn upgrade(
 	.send()
 	.await?;
 
-	sub.next().await?;
+	// sub.next().await?;
 
 	Ok(json!({}))
 }
@@ -611,13 +613,15 @@ pub async fn upgrade_all(
 		count += list_res.server_ids.len();
 		cursor = list_res.server_ids.last().cloned();
 
-		let subs = futures_util::stream::iter(list_res.server_ids.clone())
-			.map(|server_id| {
-				ctx.subscribe::<ds::workflows::server::UpgradeStarted>(("server_id", server_id))
-			})
-			.buffer_unordered(32)
-			.try_collect::<Vec<_>>()
-			.await?;
+        // TODO: Add back once we figure out how to cleanly handle if a wf is already complete when
+        // upgrading
+		// let subs = futures_util::stream::iter(list_res.server_ids.clone())
+		// 	.map(|server_id| {
+		// 		ctx.subscribe::<ds::workflows::server::UpgradeStarted>(("server_id", server_id))
+		// 	})
+		// 	.buffer_unordered(32)
+		// 	.try_collect::<Vec<_>>()
+		// 	.await?;
 
 		futures_util::stream::iter(list_res.server_ids)
 			.map(|server_id| {
@@ -631,11 +635,11 @@ pub async fn upgrade_all(
 			.try_collect::<Vec<_>>()
 			.await?;
 
-		futures_util::stream::iter(subs)
-			.map(|mut sub| async move { sub.next().await })
-			.buffer_unordered(32)
-			.try_collect::<Vec<_>>()
-			.await?;
+		// futures_util::stream::iter(subs)
+		// 	.map(|mut sub| async move { sub.next().await })
+		// 	.buffer_unordered(32)
+		// 	.try_collect::<Vec<_>>()
+		// 	.await?;
 
 		if count < 10_000 {
 			break;
diff --git a/packages/api/actor/src/route/mod.rs b/packages/api/actor/src/route/mod.rs
@@ -44,7 +44,7 @@ impl GlobalQuery {
 }
 
 define_router! {
-	cors: |config| CorsConfigBuilder::hub(config).build(),
+	cors: |config| CorsConfigBuilder::public().build(),
 	routes: {
 		"actors": {
 			GET: actors::list_actors(

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ impl GlobalQuery {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`define_router! {`
`47`		`- cors: \|config\| CorsConfigBuilder::hub(config).build(),`
	`47`	`+ cors: \|config\| CorsConfigBuilder::public().build(),`
`48`	`48`	`routes: {`
`49`	`49`	`"actors": {`
`50`	`50`	`GET: actors::list_actors(`