Skip to content
Draft
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
5 changes: 5 additions & 0 deletions commit_msg.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
feat(c++): add deleteFolderRecursive sample

This adds a sample demonstrating how to recursively delete a folder in a hierarchical namespace bucket.

Fixes: b/521168740
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,25 @@ void DeleteFolder(google::cloud::storagecontrol_v2::StorageControlClient client,
(std::move(client), argv.at(0), argv.at(1));
}

void DeleteFolderRecursive(
google::cloud::storagecontrol_v2::StorageControlClient client,
std::vector<std::string> const& argv) {
// [START storage_control_delete_folder_recursive]
namespace storagecontrol = google::cloud::storagecontrol_v2;
[](storagecontrol::StorageControlClient client,
std::string const& bucket_name, std::string const& folder_id) {
// Set project to "_" to signify globally scoped bucket
auto const name = std::string{"projects/_/buckets/"} + bucket_name +
"/folders/" + folder_id;
auto deleted = client.DeleteFolderRecursive(name).get();
if (!deleted) throw std::move(deleted).status();

std::cout << "Deleted folder: " << name << "\n";
}
// [END storage_control_delete_folder_recursive]
(std::move(client), argv.at(0), argv.at(1));
}

void GetFolder(google::cloud::storagecontrol_v2::StorageControlClient client,
std::vector<std::string> const& argv) {
// [START storage_control_get_folder]
Expand Down Expand Up @@ -176,6 +195,11 @@ void AutoRun(std::vector<std::string> const& argv) {

std::cout << "\nRunning DeleteFolder() example" << std::endl;
DeleteFolder(client, {bucket_name, dest_folder_id});

std::cout << "\nRunning DeleteFolderRecursive() example" << std::endl;
CreateFolder(client, {bucket_name, folder_id});
CreateFolder(client, {bucket_name, folder_id + "/subfolder"});
DeleteFolderRecursive(client, {bucket_name, folder_id});
Comment on lines +200 to +202

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

medium

To properly test and demonstrate the recursive deletion behavior of DeleteFolderRecursive, it is recommended to create a nested subfolder structure inside the target folder. Otherwise, the test only deletes an empty folder, which does not fully exercise the recursive aspect of the API.

  CreateFolder(client, {bucket_name, folder_id});
  CreateFolder(client, {bucket_name, folder_id + "/subfolder"});
  DeleteFolderRecursive(client, {bucket_name, folder_id});

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

}

} // namespace
Expand Down Expand Up @@ -207,6 +231,8 @@ int main(int argc, char* argv[]) { // NOLINT(bugprone-exception-escape)
Example example({
make_entry("create-folder", {"bucket-name", "folder-id"}, CreateFolder),
make_entry("delete-folder", {"bucket-name", "folder-id"}, DeleteFolder),
make_entry("delete-folder-recursive", {"bucket-name", "folder-id"},
DeleteFolderRecursive),
make_entry("get-folder", {"bucket-name", "folder-id"}, GetFolder),
make_entry("list-folders", {"bucket-name"}, ListFolders),
make_entry("rename-folder",
Expand Down
Loading