Sourcemap upload strict mode (#1829)

Author: szokeasaurusrex

src/commands/sourcemaps/upload.rs

@@ -207,6 +207,16 @@ pub fn make_command(command: Command) -> Command {
                     Defaults to: `--ext=js --ext=map --ext=jsbundle --ext=bundle`",
                 ),
         )
+        .arg(
+            Arg::new("strict")
+                .long("strict")
+                .short('s')
+                .action(ArgAction::SetTrue)
+                .help(
+                    "Fail with a non-zero exit code if the specified source map file cannot be \
+                     uploaded.",
+                ),
+        )
         // NOTE: Hidden until we decide to expose it publicly
         .arg(
             Arg::new("use_artifact_bundle")
@@ -428,8 +438,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let wait_for_secs = matches.get_one::<u64>("wait_for").copied();
     let wait = matches.get_flag("wait") || wait_for_secs.is_some();
     let max_wait = wait_for_secs.map_or(DEFAULT_MAX_WAIT, Duration::from_secs);
-
-    processor.upload(&UploadContext {
+    let upload_context = UploadContext {
         org: &org,
         project: Some(&project),
         release: version.as_deref(),
@@ -439,7 +448,13 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         max_wait,
         dedupe: !matches.get_flag("no_dedupe"),
         chunk_upload_options: chunk_upload_options.as_ref(),
-    })?;
+    };
+
+    if matches.get_flag("strict") {
+        processor.upload_strict(&upload_context)?;
+    } else {
+        processor.upload(&upload_context)?;
+    }
 
     Ok(())
 }

src/utils/sourcemaps.rs

@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 use std::str;
 use std::str::FromStr;
 
-use anyhow::{bail, Context, Error, Result};
+use anyhow::{anyhow, bail, Context, Error, Result};
 use console::style;
 use indicatif::ProgressStyle;
 use log::{debug, info, warn};
@@ -805,8 +805,9 @@ impl SourceMapProcessor {
         files_needing_upload
     }
 
-    /// Uploads all files
-    pub fn upload(&mut self, context: &UploadContext<'_>) -> Result<()> {
+    /// Uploads all files, and on success, returns the number of files that were
+    /// uploaded, wrapped in Ok()
+    pub fn upload(&mut self, context: &UploadContext<'_>) -> Result<usize> {
         initialize_legacy_release_upload(context)?;
         self.flush_pending_sources();
 
@@ -852,7 +853,19 @@ impl SourceMapProcessor {
         } else {
             println!("{} Nothing to upload", style(">").dim());
         }
-        Ok(())
+        Ok(files_needing_upload)
+    }
+
+    /// Upload all files in "strict" mode. Strict mode differs from a normal upload
+    /// only when there are no files to upload. In strict mode, having no files to
+    /// upload results in an error, whereas such an upload is successful in normal
+    /// (non-strict) mode. On success, the number of uploaded files is returned in
+    /// an Ok()
+    pub fn upload_strict(&mut self, context: &UploadContext<'_>) -> Result<usize> {
+        match self.upload(context) {
+            Ok(0) => Err(anyhow!("No files to upload (strict mode).")),
+            other => other,
+        }
     }
 
     /// Injects debug ids into minified source files and sourcemaps.

tests/integration/_cases/sourcemaps/sourcemaps-upload-help.trycmd

@@ -82,6 +82,8 @@ Options:
           extensions. To add an extension, all default extensions must be repeated. Specify once per
           extension.
           Defaults to: `--ext=js --ext=map --ext=jsbundle --ext=bundle`
+  -s, --strict
+          Fail with a non-zero exit code if the specified source map file cannot be uploaded.
   -h, --help
           Print help