admin: Merge SyncToIndex admin commands (#12815)

Author: Turbo87

src/bin/crates-admin/enqueue_job.rs

@@ -47,12 +47,6 @@ pub enum Command {
         force: bool,
     },
     SyncCratesFeed,
-    SyncToGitIndex {
-        name: String,
-    },
-    SyncToSparseIndex {
-        name: String,
-    },
     SyncUpdatesFeed,
     TrustpubCleanup,
     UpdateDownloads,
@@ -146,14 +140,6 @@ pub async fn run(command: Command) -> Result<()> {
         Command::SyncCratesFeed => {
             jobs::rss::SyncCratesFeed.enqueue(&mut conn).await?;
         }
-        Command::SyncToGitIndex { name } => {
-            jobs::SyncToGitIndex::new(name).enqueue(&mut conn).await?;
-        }
-        Command::SyncToSparseIndex { name } => {
-            jobs::SyncToSparseIndex::new(name)
-                .enqueue(&mut conn)
-                .await?;
-        }
         Command::SyncUpdatesFeed => {
             jobs::rss::SyncUpdatesFeed.enqueue(&mut conn).await?;
         }

src/bin/crates-admin/main.rs

@@ -11,6 +11,7 @@ mod migrate;
 mod populate;
 mod render_og_images;
 mod render_readmes;
+mod sync_index;
 mod test_email;
 mod transfer_crates;
 mod upload_index;
@@ -26,6 +27,7 @@ enum Command {
     DeleteVersion(delete_version::Opts),
     Populate(populate::Opts),
     RenderReadmes(render_readmes::Opts),
+    SyncIndex(sync_index::Opts),
     TestEmail(test_email::Opts),
     TransferCrates(transfer_crates::Opts),
     VerifyToken(verify_token::Opts),
@@ -58,6 +60,7 @@ async fn main() -> anyhow::Result<()> {
         Command::DeleteVersion(opts) => delete_version::run(opts).await,
         Command::Populate(opts) => populate::run(opts).await,
         Command::RenderReadmes(opts) => render_readmes::run(opts).await,
+        Command::SyncIndex(opts) => sync_index::run(opts).await,
         Command::TestEmail(opts) => test_email::run(opts).await,
         Command::TransferCrates(opts) => transfer_crates::run(opts).await,
         Command::VerifyToken(opts) => verify_token::run(opts).await,

src/bin/crates-admin/sync_index.rs

@@ -0,0 +1,53 @@
+use anyhow::{Result, bail};
+use clap::builder::ArgAction;
+use crates_io::db;
+use crates_io::schema::crates;
+use crates_io::worker::jobs;
+use crates_io_worker::BackgroundJob;
+use diesel::dsl::exists;
+use diesel::prelude::*;
+use diesel_async::RunQueryDsl;
+
+#[derive(clap::Parser, Debug)]
+#[command(
+    name = "sync-index",
+    about = "Synchronize crate index data to git and sparse indexes"
+)]
+pub struct Opts {
+    /// Name of the crate to synchronize
+    name: String,
+
+    /// Skip syncing to the git index
+    #[arg(long = "no-git", action = ArgAction::SetFalse)]
+    git: bool,
+
+    /// Skip syncing to the sparse index
+    #[arg(long = "no-sparse", action = ArgAction::SetFalse)]
+    sparse: bool,
+}
+
+pub async fn run(opts: Opts) -> Result<()> {
+    let mut conn = db::oneoff_connection().await?;
+
+    let query = crates::table.filter(crates::name.eq(&opts.name));
+    let crate_exists: bool = diesel::select(exists(query)).get_result(&mut conn).await?;
+    if !crate_exists {
+        bail!("Crate `{}` does not exist", opts.name);
+    }
+
+    if opts.git {
+        println!("Enqueueing SyncToGitIndex job for `{}`", opts.name);
+        jobs::SyncToGitIndex::new(&opts.name)
+            .enqueue(&mut conn)
+            .await?;
+    }
+
+    if opts.sparse {
+        println!("Enqueueing SyncToSparseIndex job for `{}`", opts.name);
+        jobs::SyncToSparseIndex::new(&opts.name)
+            .enqueue(&mut conn)
+            .await?;
+    }
+
+    Ok(())
+}