fix: fix build cache key

Author: MasterPtato

packages/core/services/build/Cargo.toml

@@ -9,6 +9,7 @@ edition.workspace = true
 acme-lib = "0.9"
 anyhow = "1.0"
 chirp-workflow.workspace = true
+cjson = "0.1"
 cloudflare.workspace = true
 heck = "0.3"
 http = "0.2"

packages/core/services/build/src/ops/resolve_for_tags.rs

@@ -19,29 +19,33 @@ pub struct Output {
 
 #[operation]
 pub async fn build_resolve_for_tags(ctx: &OperationCtx, input: &Input) -> GlobalResult<Output> {
-	let tags_str = serde_json::to_string(&input.tags)?;
+	let tags_str = unwrap!(cjson::to_string(&input.tags));
 
 	let builds = if input.bypass_cache {
 		get_builds(&ctx, input.env_id, &tags_str).await?
 	} else {
 		unwrap!(
 			ctx.cache()
 				.ttl(util::duration::seconds(15))
-				.fetch_one_json("build", tags_str.as_str(), {
-					let ctx = ctx.clone();
-					let tags_str = tags_str.clone();
-					move |mut cache, key| {
+				.fetch_one_json(
+					"build",
+					format!("{}:{}", input.env_id, tags_str.as_str()),
+					{
 						let ctx = ctx.clone();
 						let tags_str = tags_str.clone();
-						async move {
-							let builds = get_builds(&ctx, input.env_id, &tags_str).await?;
+						move |mut cache, key| {
+							let ctx = ctx.clone();
+							let tags_str = tags_str.clone();
+							async move {
+								let builds = get_builds(&ctx, input.env_id, &tags_str).await?;
 
-							cache.resolve(&key, builds);
+								cache.resolve(&key, builds);
 
-							Ok(cache)
+								Ok(cache)
+							}
 						}
 					}
-				})
+				)
 				.await?
 		)
 	};