Skip to content

fix(build): Namespace snapshot object keys by org and project #3166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
runningcode wants to merge 1 commit into from
Closed

fix(build): Namespace snapshot object keys by org and project #3166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/commands/build/snapshots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,21 @@ fn upload_images(
}
let session = scope.session(&client)?;

let org_id = options
.objectstore
.scopes
.iter()
.find(|(k, _)| k == "org")
.map(|(_, v)| v.as_str())
.context("Missing 'org' scope in upload options")?;
let project_id = options
.objectstore
.scopes
.iter()
.find(|(k, _)| k == "project")
.map(|(_, v)| v.as_str())
.context("Missing 'project' scope in upload options")?;

let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
Expand All @@ -231,13 +246,14 @@ fn upload_images(
let contents = fs::read(&image.path)
.with_context(|| format!("Failed to read image: {}", image.path.display()))?;
let hash = compute_sha256_hash(&contents);
let object_key = format!("{org_id}/{project_id}/{hash}");

info!("Queueing {} as {hash}", image.relative_path.display());
info!("Queueing {} as {object_key}", image.relative_path.display());

many_builder = many_builder.push(
session
.put(contents)
.key(&hash)
.key(&object_key)
.expiration_policy(expiration),
);

Expand Down