fix: don't get target_aid when NoEmbed

Signed-off-by: Andrew Lilley Brinker <[email protected]>

Author: alilleybrinker

omnibor/src/embed.rs

@@ -4,7 +4,7 @@
 pub(crate) mod auto_embed;
 pub(crate) mod embed_provider;
 
-use crate::{error::InputManifestError, hash_algorithm::HashAlgorithm};
+use crate::{error::InputManifestError, hash_algorithm::HashAlgorithm, util::sealed::Sealed};
 use std::{marker::PhantomData, path::Path};
 
 pub use crate::embed::embed_provider::EmbedProvider;
@@ -13,7 +13,7 @@ pub use crate::embed::embed_provider::EmbedProvider;
 use crate::embed::auto_embed::embed_manifest_in_target;
 
 /// Defines how embedding should be handled in target artifacts.
-pub trait Embed<H>
+pub trait Embed<H>: Sealed
 where
     H: HashAlgorithm,
 {
@@ -26,12 +26,19 @@ where
         target_path: &Path,
         embed_provider: EmbedProvider<H>,
     ) -> Option<Result<(), InputManifestError>>;
+
+    /// Indicates if the embedder will attempt to embed.
+    fn will_embed(&self) -> bool {
+        true
+    }
 }
 
 /// Do not embed in the target file.
 #[derive(Debug, Copy, Clone)]
 pub struct NoEmbed;
 
+impl Sealed for NoEmbed {}
+
 impl<H: HashAlgorithm> Embed<H> for NoEmbed {
     // Do nothing, as we're not actually embedding.
     fn try_embed(
@@ -41,13 +48,20 @@ impl<H: HashAlgorithm> Embed<H> for NoEmbed {
     ) -> Option<Result<(), InputManifestError>> {
         None
     }
+
+    fn will_embed(&self) -> bool {
+        false
+    }
 }
 
 #[cfg(feature = "infer-filetypes")]
 /// Automatically infer the filetype of the target file, and attempt to embed.
 #[derive(Debug, Copy, Clone)]
 pub struct AutoEmbed;
 
+#[cfg(feature = "infer-filetypes")]
+impl Sealed for AutoEmbed {}
+
 #[cfg(feature = "infer-filetypes")]
 impl<H: HashAlgorithm> Embed<H> for AutoEmbed {
     fn try_embed(
@@ -83,6 +97,13 @@ where
     }
 }
 
+impl<H, F> Sealed for CustomEmbed<H, F>
+where
+    H: HashAlgorithm,
+    F: Fn(&Path, EmbedProvider<H>) -> Result<(), InputManifestError>,
+{
+}
+
 impl<H, F> Embed<H> for CustomEmbed<H, F>
 where
     H: HashAlgorithm,

omnibor/src/input_manifest/input_manifest_builder.rs

@@ -112,13 +112,19 @@ where
             S2: Storage<H2>,
         {
             // Get the Artifact ID of the target.
-            let target_aid =
-                ArtifactId::new(manifest_builder.storage.get_hash_provider(), target)?;
+            let target_aid = if embed.will_embed() {
+                Some(ArtifactId::new(
+                    manifest_builder.storage.get_hash_provider(),
+                    target,
+                )?)
+            } else {
+                None
+            };
 
             // Construct a new input manifest.
             let manifest = InputManifest::with_relations(
                 manifest_builder.relations.iter().cloned(),
-                Some(target_aid),
+                target_aid,
             );
 
             // Get the Artifact ID of the manifest.