Add upload tag functionality to gitimport binary

Summary: Every now and then we come across a weird tag object that gitimport as part of its normal execution doesn't upload for some reason. This new command is created specifically for that purpose. Note that this won't add a mapping in `bonsai_tag_mapping` table but will simply upload the tag object to the storage layer. We might want to extend this to add the mappings as well in the future, if we see a need.

Reviewed By: markbt

Differential Revision: D75960452

fbshipit-source-id: 81596968cd5d5c4861c533c0a7608411a8426485

Author: RajivTS

eden/mononoke/git/gitimport/src/main.rs

@@ -10,6 +10,7 @@ mod repo;
 use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::Context;
@@ -227,6 +228,10 @@ enum GitimportSubcommand {
     ImportTreeAsSingleBonsaiChangeset {
         git_commit: String,
     },
+    /// Import a single tag object into Mononoke data store
+    UploadTag {
+        tag_sha1: String,
+    },
 }
 
 #[fbinit::main]
@@ -328,7 +333,7 @@ async fn async_main(app: MononokeApp) -> Result<(), Error> {
     }
 
     let uploader = Arc::new(import_direct::DirectUploader::new(repo.clone(), reupload));
-
+    let reader = Arc::new(GitRepoReader::new(&prefs.git_command_path, path).await?);
     let target = match args.subcommand {
         GitimportSubcommand::FullRepo {} => GitimportTarget::full(),
         GitimportSubcommand::GitRange { git_from, git_to } => {
@@ -357,6 +362,15 @@ async fn async_main(app: MononokeApp) -> Result<(), Error> {
             }
             return Ok(());
         }
+        GitimportSubcommand::UploadTag { tag_sha1 } => {
+            let tag_sha1 = ObjectId::from_str(&tag_sha1)
+                .with_context(|| format!("Invalid SHA1 hash provided for Git Tag {}", tag_sha1))?;
+            upload_git_tag(&ctx, uploader.clone(), reader.clone(), &tag_sha1)
+                .await
+                .with_context(|| format!("Error in uploading tag with ID {}", tag_sha1))?;
+            info!(ctx.logger(), "Uploaded tag with ID {}", tag_sha1);
+            return Ok(());
+        }
     };
 
     let gitimport_result: LinkedHashMap<_, _> =
@@ -425,7 +439,6 @@ async fn async_main(app: MononokeApp) -> Result<(), Error> {
                 .into_iter()
                 .map(|entry| (entry.tag_name, entry.tag_hash))
                 .collect::<HashMap<_, _>>();
-            let reader = Arc::new(GitRepoReader::new(&prefs.git_command_path, path).await?);
             let pushvars = if args.bypass_readonly {
                 Some(HashMap::from_iter([(
                     "BYPASS_READONLY".to_string(),

eden/mononoke/tests/integration/gitimport/test-gitimport-upload-tag.t

@@ -0,0 +1,46 @@
+# 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"
+  $ GIT_REPO="${TESTTMP}/repo-git"
+  $ setup_common_config blob_files
+
+# Setup git repository
+  $ mkdir -p "$GIT_REPO"
+  $ cd "$GIT_REPO"
+  $ git init -q
+  $ echo "this is file1" > file1
+  $ git add file1
+  $ git commit -qa -m "Commit"
+  $ git tag -a -m "Tag" tag1
+  $ tag_hash=$(git rev-parse tags/tag1)
+
+# Import just the tag into Mononoke
+  $ with_stripped_logs gitimport "$GIT_REPO" upload-tag $tag_hash
+  using repo "repo" repoid RepositoryId(0)
+  Uploaded tag with ID 929a3a6ccd846af11aa4384cc99d63691b480d9d
+
+# Ensure that the uploaded tag is visible in Mononoke
+  $ mononoke_admin git-objects -R repo fetch --id $tag_hash
+  The object is a Git Tag
+  
+  Tag {
+      target: Sha1(15cc4e9575665b507ee372f97b716ff552842136),
+      target_kind: Commit,
+      name: "tag1",
+      tagger: Some(
+          Signature {
+              name: "mononoke",
+              email: "mononoke@mononoke",
+              time: Time {
+                  seconds: 946684800,
+                  offset: 0,
+              },
+          },
+      ),
+      message: "Tag\n",
+      pgp_signature: None,
+  }