chore: cleanup manifest target saving logic

Signed-off-by: Andrew Lilley Brinker <alilleybrinker@gmail.com>

Author: alilleybrinker

omnibor-cli/src/cmd/store/add.rs

@@ -9,19 +9,26 @@ use omnibor::{hash_algorithm::Sha256, storage::Storage, InputManifest};
 pub async fn run(app: &App, args: &StoreAddArgs) -> Result<()> {
     let mut storage = app.storage()?;
 
-    let manifest =
+    let mut manifest =
         InputManifest::<Sha256>::from_path(&args.manifest).map_err(Error::UnableToReadManifest)?;
 
-    let manifest_aid = storage
+    let target_aid = match &args.target {
+        Some(targetable) => {
+            let target_aid = targetable
+                .clone()
+                .into_artifact_id()
+                .map_err(Error::IdFailed)?;
+
+            Some(target_aid)
+        }
+        None => None,
+    };
+
+    manifest.set_target(target_aid);
+
+    storage
         .write_manifest(&manifest)
         .map_err(Error::FailedToAddManifest)?;
 
-    if let Some(target) = args.target.clone() {
-        let target_aid = target.into_artifact_id().map_err(Error::IdFailed)?;
-        storage
-            .update_target_for_manifest(manifest_aid, target_aid)
-            .map_err(Error::FailedToUpdateTarget)?;
-    }
-
     Ok(())
 }

omnibor-cli/src/error.rs

@@ -117,9 +117,6 @@ pub enum Error {
 
     #[error("unable to read manifest")]
     UnableToReadManifest(#[source] InputManifestError),
-
-    #[error("failed to update target")]
-    FailedToUpdateTarget(#[source] InputManifestError),
 }
 
 pub type Result<T> = StdResult<T, Error>;

omnibor/src/input_manifest/input_manifest.rs

@@ -72,7 +72,7 @@ impl<H: HashAlgorithm> InputManifest<H> {
     }
 
     /// Set a new target.
-    pub(crate) fn set_target(&mut self, target: Option<ArtifactId<H>>) -> &mut Self {
+    pub fn set_target(&mut self, target: Option<ArtifactId<H>>) -> &mut Self {
         self.target = target;
         self
     }

omnibor/src/storage/file_system_storage.rs

@@ -225,6 +225,10 @@ impl<H: HashAlgorithm, P: HashProvider<H>> Storage<H> for FileSystemStorage<H, P
             InputManifestError::CantWriteManifest(path.clone_as_boxstr(), Box::new(source))
         })?;
 
+        if let Some(target_aid) = manifest.target() {
+            self.update_target_for_manifest(manifest_aid, target_aid)?;
+        }
+
         Ok(manifest_aid)
     }
 

omnibor/src/storage/mod.rs

@@ -35,6 +35,8 @@ pub trait Storage<H: HashAlgorithm> {
     ) -> Result<Option<InputManifest<H>>, InputManifestError>;
 
     /// Write a manifest to the storage.
+    ///
+    /// If the manifest has a target attached, update any indices.
     fn write_manifest(
         &mut self,
         manifest: &InputManifest<H>,