From effb34bc21b5dc3b56de10274e849f97da89e359 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 4 Mar 2026 18:46:36 +0100
Subject: [PATCH] fix(snapshots): Use org/project-scoped object keys for
 snapshot uploads

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/commands/build/snapshots.rs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/commands/build/snapshots.rs b/src/commands/build/snapshots.rs
index 6b66563899..a888b158dd 100644
--- a/src/commands/build/snapshots.rs
+++ b/src/commands/build/snapshots.rs
@@ -293,9 +293,22 @@ fn upload_images(
         .build()?;
 
     let mut scope = Usecase::new("preprod").scope();
-    for (key, value) in &options.objectstore.scopes {
-        scope = scope.push(key, value);
+    let (mut org_id, mut project_id): (Option<String>, Option<String>) = (None, None);
+    for (key, value) in options.objectstore.scopes.into_iter() {
+        scope = scope.push(&key, value.clone());
+        if key == "org" {
+            org_id = Some(value);
+        } else if key == "project" {
+            project_id = Some(value);
+        }
     }
+    let Some(org_id) = org_id else {
+        anyhow::bail!("Missing org in UploadOptions scope");
+    };
+    let Some(project_id) = project_id else {
+        anyhow::bail!("Missing project in UploadOptions scope");
+    };
+
     let session = scope.session(&client)?;
 
     let runtime = tokio::runtime::Builder::new_current_thread()
@@ -317,12 +330,13 @@ fn upload_images(
                 format!("Failed to open image for upload: {}", image.path.display())
             })?;
 
-        info!("Queueing {} as {hash}", image.relative_path.display());
+        let key = format!("{org_id}/{project_id}/{hash}");
+        info!("Queueing {} as {key}", image.relative_path.display());
 
         many_builder = many_builder.push(
             session
                 .put_file(file)
-                .key(&hash)
+                .key(&key)
                 .expiration_policy(expiration),
         );