monad: add delete-directory subcommand

Summary: It was convenient to have an admin command for creating a bonsai changeset that deletes a directory with SEV fighting S646665. Let's land this for similar such SEVs.

Reviewed By: gustavoavena, clara-9

Differential Revision: D100177683

fbshipit-source-id: 00d3fe426a92be3e9e3122a8897a721307663f9b

Author: YousefSalama

eden/mononoke/tests/integration/newadmin/test-admin-commit-delete-directory.t

@@ -0,0 +1,48 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License found in the LICENSE file in the root
+# directory of this source tree.
+
+  $ . "${TEST_FIXTURES}/library.sh"
+
+setup configuration
+  $ setup_common_config
+
+  $ testtool_drawdag -R repo --derive-all << 'EOF' 2>/dev/null
+  > A
+  > # modify: A "dir/subdir/file1" "content1"
+  > # modify: A "dir/subdir/file2" "content2"
+  > # modify: A "dir/subdir/nested/file3" "content3"
+  > # modify: A "dir/other_file" "other"
+  > # modify: A "root_file" "root"
+  > # bookmark: A main
+  > EOF
+
+Test 1: Basic directory deletion
+  $ mononoke_admin commit -R repo delete-directory --parent $A --path dir/subdir | tee $TESTTMP/delete_output
+  Deleting 3 files under 'dir/subdir'
+  * (glob)
+
+  $ DELETE_CS_ID=$(tail -1 $TESTTMP/delete_output)
+
+Verify the deletion commit
+  $ mononoke_admin fetch -R repo -i "$DELETE_CS_ID"
+  BonsaiChangesetId: * (glob)
+  Author: svcscm
+  Message: Deleted via mononoke_admin commit delete-directory
+  FileChanges:
+  	 REMOVED: dir/subdir/file1
+  	 REMOVED: dir/subdir/file2
+  	 REMOVED: dir/subdir/nested/file3
+  
+
+Test 2: Error case - non-existent path
+  $ mononoke_admin commit -R repo delete-directory --parent $A --path nonexistent
+  Error: Path 'nonexistent' does not exist in the given commit
+  [1]
+
+Test 3: Error case - path is a file, not a directory
+  $ mononoke_admin commit -R repo delete-directory --parent $A --path root_file
+  Error: Path 'root_file' is a file, not a directory
+  [1]

eden/mononoke/tools/admin/src/commands/commit.rs

@@ -5,6 +5,7 @@
  * GNU General Public License version 2.
  */
 
+mod delete_directory;
 mod pushrebase;
 mod rebase;
 mod split;
@@ -37,6 +38,7 @@ use repo_cross_repo::RepoCrossRepo;
 use repo_derived_data::RepoDerivedData;
 use repo_identity::RepoIdentity;
 
+use self::delete_directory::CommitDeleteDirectoryArgs;
 use self::pushrebase::CommitPushrebaseArgs;
 use self::rebase::CommitRebaseArgs;
 use self::split::CommitSplitArgs;
@@ -124,6 +126,9 @@ pub enum CommitSubcommand {
     /// Rebases a commit from its current bookmark onto a bookmark, and moves
     /// that bookmark to the newly rebased commit.
     Pushrebase(CommitPushrebaseArgs),
+
+    /// Delete all files under a directory, creating a new commit
+    DeleteDirectory(CommitDeleteDirectoryArgs),
 }
 
 pub async fn run(app: MononokeApp, args: CommandArgs) -> Result<()> {
@@ -140,6 +145,9 @@ pub async fn run(app: MononokeApp, args: CommandArgs) -> Result<()> {
         CommitSubcommand::Pushrebase(pushrebase_args) => {
             pushrebase::pushrebase(&ctx, &repo, pushrebase_args).await?
         }
+        CommitSubcommand::DeleteDirectory(args) => {
+            delete_directory::delete_directory(&ctx, &repo, args).await?
+        }
     }
 
     Ok(())

eden/mononoke/tools/admin/src/commands/commit/delete_directory.rs

@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+use anyhow::Result;
+use anyhow::bail;
+use changesets_creation::save_changesets;
+use clap::Args;
+use commit_id::parse_commit_id;
+use context::CoreContext;
+use derivation_queue_thrift::DerivationPriority;
+use futures::TryStreamExt;
+use manifest::Entry;
+use manifest::ManifestOps;
+use mononoke_types::BonsaiChangesetMut;
+use mononoke_types::DateTime;
+use mononoke_types::FileChange;
+use mononoke_types::NonRootMPath;
+use repo_blobstore::RepoBlobstoreRef;
+use repo_derived_data::RepoDerivedDataRef;
+use skeleton_manifest::RootSkeletonManifestId;
+use sorted_vector_map::SortedVectorMap;
+
+use super::Repo;
+
+#[derive(Args)]
+pub struct CommitDeleteDirectoryArgs {
+    /// Commit ID of the parent commit (e.g. bookmark name, bonsai hash)
+    #[clap(long)]
+    parent: String,
+
+    /// Path of the directory to delete
+    #[clap(long)]
+    path: String,
+
+    /// Commit message for the deletion commit
+    #[clap(
+        long,
+        default_value = "Deleted via mononoke_admin commit delete-directory"
+    )]
+    message: String,
+
+    /// Author of the deletion commit
+    #[clap(long, default_value = "svcscm")]
+    author: String,
+}
+
+pub async fn delete_directory(
+    ctx: &CoreContext,
+    repo: &Repo,
+    args: CommitDeleteDirectoryArgs,
+) -> Result<()> {
+    let parent_cs_id = parse_commit_id(ctx, repo, &args.parent).await?;
+
+    // Derive skeleton manifest for parent
+    let root_sk_id = repo
+        .repo_derived_data()
+        .derive::<RootSkeletonManifestId>(ctx, parent_cs_id, DerivationPriority::LOW)
+        .await?
+        .into_skeleton_manifest_id();
+
+    let dir_path = NonRootMPath::new(&args.path)?;
+
+    // Find the directory entry in the skeleton manifest
+    let entry = root_sk_id
+        .find_entry(
+            ctx.clone(),
+            repo.repo_blobstore().clone(),
+            dir_path.clone().into(),
+        )
+        .await?;
+
+    let tree_id = match entry {
+        Some(Entry::Tree(tree_id)) => tree_id,
+        Some(Entry::Leaf(_)) => bail!("Path '{}' is a file, not a directory", args.path),
+        None => bail!("Path '{}' does not exist in the given commit", args.path),
+    };
+
+    // List all files under the directory
+    let files: Vec<NonRootMPath> = tree_id
+        .list_leaf_entries(ctx.clone(), repo.repo_blobstore().clone())
+        .map_ok(|(relative_path, ())| dir_path.join(&relative_path))
+        .try_collect()
+        .await?;
+
+    if files.is_empty() {
+        bail!("No files found under '{}'", args.path);
+    }
+
+    println!("Deleting {} files under '{}'", files.len(), args.path);
+
+    // Build deletion file changes
+    let file_changes: SortedVectorMap<NonRootMPath, FileChange> = files
+        .into_iter()
+        .map(|path| (path, FileChange::Deletion))
+        .collect();
+
+    // Create the deletion commit
+    let bcs = BonsaiChangesetMut {
+        parents: vec![parent_cs_id],
+        author: args.author,
+        author_date: DateTime::now(),
+        message: args.message,
+        file_changes,
+        ..Default::default()
+    }
+    .freeze()?;
+
+    let cs_id = bcs.get_changeset_id();
+    save_changesets(ctx, repo, vec![bcs]).await?;
+
+    println!("{}", cs_id);
+
+    Ok(())
+}