fix(ds): fix server list & nomad monitor alloc plan queries

fern/definition/servers/common.yml

@@ -9,7 +9,6 @@ types:
       id: uuid
       environment: uuid
       datacenter: uuid
-      cluster: uuid
       tags: unknown
       runtime: Runtime
       network: Network

lib/chirp-workflow/core/src/worker.rs

@@ -9,7 +9,7 @@ use crate::{
 	util,
 };
 
-const TICK_INTERVAL: Duration = Duration::from_secs(30);
+const TICK_INTERVAL: Duration = Duration::from_secs(5);
 
 /// Used to spawn a new thread that indefinitely polls the database for new workflows. Only pulls workflows
 /// that are registered in its registry. After pulling, the workflows are ran and their state is written to

svc/api/servers/src/route/mod.rs

@@ -28,16 +28,38 @@ define_router! {
 		"games" / Uuid / "environments" / Uuid / "servers": {
 			GET: servers::list_servers(
 				query: servers::ListQuery,
+				rate_limit: {
+					buckets: [
+						{ count: 200, bucket: duration::minutes(1) },
+					],
+				},
 			),
 			POST: servers::create(
 				body: models::ServersCreateServerRequest,
+				rate_limit: {
+					buckets: [
+						{ count: 100, bucket: duration::minutes(1) },
+					],
+				},
 			),
 		},
 
 		"games" / Uuid / "environments" / Uuid / "servers" / Uuid: {
-			GET: servers::get(),
+			GET: servers::get(
+				rate_limit: {
+					buckets: [
+						{ count: 120, bucket: duration::minutes(1) },
+					],
+				},
+
+			),
 			DELETE: servers::destroy(
 				query: servers::DeleteQuery,
+				rate_limit: {
+					buckets: [
+						{ count: 200, bucket: duration::minutes(1) },
+					],
+				},
 			),
 		},
 
@@ -52,11 +74,22 @@ define_router! {
 		"games" / Uuid / "environments" / Uuid / "builds": {
 			GET: builds::list(
 				query: builds::GetQuery,
+				rate_limit: {
+					buckets: [
+						{ count: 200, bucket: duration::minutes(1) },
+					],
+				},
 			),
 		},
 
 		"games" / Uuid / "environments" / Uuid / "builds" / Uuid: {
-			GET: builds::get(),
+			GET: builds::get(
+				rate_limit: {
+					buckets: [
+						{ count: 100, bucket: duration::minutes(1) },
+					],
+				},
+			),
 		},
 
 		"games" / Uuid / "environments" / Uuid / "builds" / Uuid / "tags": {
@@ -73,7 +106,13 @@ define_router! {
 
 		// MARK: Datacenters
 		"games" / Uuid / "environments" / Uuid / "datacenters": {
-			GET: dc::list(),
+			GET: dc::list(
+				rate_limit: {
+					buckets: [
+						{ count: 100, bucket: duration::minutes(1) },
+					],
+				},
+			),
 		},
 	},
 }

svc/pkg/ds/src/ops/server/get.rs

@@ -160,8 +160,10 @@ pub async fn get(ctx: &OperationCtx, input: &Input) -> GlobalResult<Output> {
 		),
 	)?;
 
-	let servers = server_rows
-		.into_iter()
+	let servers = input
+		.server_ids
+		.iter()
+		.filter_map(|server_id| server_rows.iter().find(|x| x.server_id == *server_id))
 		.map(|server| {
 			let server_nomad = unwrap!(server_nomad_rows
 				.iter()
@@ -205,14 +207,14 @@ pub async fn get(ctx: &OperationCtx, input: &Input) -> GlobalResult<Output> {
 				env_id: server.env_id,
 				datacenter_id: server.datacenter_id,
 				cluster_id: server.cluster_id,
-				tags: server.tags.0,
+				tags: server.tags.0.clone(),
 				resources: ServerResources {
 					cpu_millicores: server.resources_cpu_millicores.try_into()?,
 					memory_mib: server.resources_memory_mib.try_into()?,
 				},
 				kill_timeout_ms: server.kill_timeout_ms,
-				args: server.args,
-				environment: server.environment.0,
+				args: server.args.clone(),
+				environment: server.environment.0.clone(),
 				image_id: server.image_id,
 				network_mode: unwrap!(NetworkMode::from_repr(server.network_mode.try_into()?)),
 				network_ports: ports,

svc/pkg/ds/src/types.rs

@@ -95,7 +95,6 @@ impl ApiTryFrom<Server> for models::ServersServer {
 			id: value.server_id,
 			environment: value.env_id,
 			datacenter: value.datacenter_id,
-			cluster: value.cluster_id,
 			created_at: value.create_ts,
 			started_at: value.start_ts,
 			connectable_at: value.connectable_ts,