Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.PHONY: pre-commit

pre-commit:
cargo fmt --all --check
cargo clippy --workspace --all-targets -- -D warnings
cargo test --workspace
183 changes: 183 additions & 0 deletions crates/cli/tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2965,6 +2965,189 @@ mod option_behavior_operations {
cleanup_bucket(config_dir.path(), &bucket_name);
}

#[test]
fn test_rm_purge_dry_run_does_not_delete_versioned_object() {
let (config_dir, bucket_name) = match setup_with_alias("rmpurgedryrun") {
Some(v) => v,
None => {
eprintln!("Skipping: S3 test config not available");
return;
}
};

let enable_output = run_rc(
&[
"version",
"enable",
&format!("test/{}", bucket_name),
"--json",
],
config_dir.path(),
);
if !enable_output.status.success() {
eprintln!(
"Enable versioning not supported: {}",
String::from_utf8_lossy(&enable_output.stderr)
);
cleanup_bucket(config_dir.path(), &bucket_name);
return;
}

upload_text_object(
config_dir.path(),
&bucket_name,
"keep-version.txt",
"rm purge dry run source",
);

let dry_run_output = run_rc(
&[
"rm",
&format!("test/{}/keep-version.txt", bucket_name),
"--purge",
"--dry-run",
"--json",
],
config_dir.path(),
);
assert!(
dry_run_output.status.success(),
"rm --purge --dry-run failed: {}",
String::from_utf8_lossy(&dry_run_output.stderr)
);

let versions_output = run_rc(
&[
"version",
"list",
&format!("test/{}/keep-version.txt", bucket_name),
"--json",
],
config_dir.path(),
);
assert!(
versions_output.status.success(),
"Failed to list versions after rm --purge --dry-run: {}",
String::from_utf8_lossy(&versions_output.stderr)
);

let versions_stdout = String::from_utf8_lossy(&versions_output.stdout);
let versions: serde_json::Value =
serde_json::from_str(&versions_stdout).expect("Invalid JSON version list");
let versions = versions
.as_array()
.expect("Version list should be a JSON array");
assert_eq!(
versions.len(),
1,
"Object should keep its only version after rm --purge --dry-run"
);
assert_eq!(
versions[0]["key"].as_str(),
Some("keep-version.txt"),
"Version list should still include the uploaded object"
);
assert_eq!(
versions[0]["is_delete_marker"].as_bool(),
Some(false),
"rm --purge --dry-run must not create a delete marker"
);

cleanup_bucket(config_dir.path(), &bucket_name);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Purge remaining version before cleanup

After asserting --dry-run, this test leaves keep-version.txt in a versioned bucket and then calls cleanup_bucket, which only runs rm --recursive --force and rb (no --purge). In a versioned bucket, that delete path does not remove historical versions, so bucket removal can fail and the test leaks buckets/versions on every successful run; over repeated CI or local runs this can exhaust test resources and cause unrelated integration failures. The same pattern is repeated in the object remove --purge --dry-run test.

Useful? React with 👍 / 👎.

}

#[test]
fn test_object_remove_purge_dry_run_does_not_delete_versioned_object() {
let (config_dir, bucket_name) = match setup_with_alias("objectremovepurgedryrun") {
Some(v) => v,
None => {
eprintln!("Skipping: S3 test config not available");
return;
}
};

let enable_output = run_rc(
&[
"version",
"enable",
&format!("test/{}", bucket_name),
"--json",
],
config_dir.path(),
);
if !enable_output.status.success() {
eprintln!(
"Enable versioning not supported: {}",
String::from_utf8_lossy(&enable_output.stderr)
);
cleanup_bucket(config_dir.path(), &bucket_name);
return;
}

upload_text_object(
config_dir.path(),
&bucket_name,
"keep-object-remove-version.txt",
"object remove purge dry run source",
);

let dry_run_output = run_rc(
&[
"object",
"remove",
&format!("test/{}/keep-object-remove-version.txt", bucket_name),
"--purge",
"--dry-run",
"--json",
],
config_dir.path(),
);
assert!(
dry_run_output.status.success(),
"object remove --purge --dry-run failed: {}",
String::from_utf8_lossy(&dry_run_output.stderr)
);

let versions_output = run_rc(
&[
"version",
"list",
&format!("test/{}/keep-object-remove-version.txt", bucket_name),
"--json",
],
config_dir.path(),
);
assert!(
versions_output.status.success(),
"Failed to list versions after object remove --purge --dry-run: {}",
String::from_utf8_lossy(&versions_output.stderr)
);

let versions_stdout = String::from_utf8_lossy(&versions_output.stdout);
let versions: serde_json::Value =
serde_json::from_str(&versions_stdout).expect("Invalid JSON version list");
let versions = versions
.as_array()
.expect("Version list should be a JSON array");
assert_eq!(
versions.len(),
1,
"Object should keep its only version after object remove --purge --dry-run"
);
assert_eq!(
versions[0]["key"].as_str(),
Some("keep-object-remove-version.txt"),
"Version list should still include the uploaded object"
);
assert_eq!(
versions[0]["is_delete_marker"].as_bool(),
Some(false),
"object remove --purge --dry-run must not create a delete marker"
);

cleanup_bucket(config_dir.path(), &bucket_name);
}

#[test]
fn test_head_bytes_returns_prefix_bytes() {
let (config_dir, bucket_name) = match setup_with_alias("headbytes") {
Expand Down