Replace remove lazy artifact with insert

brioche-dev · Jan 20, 2024 · 9f098b1 · 9f098b1
1 parent 54de81f
commit 9f098b1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/crates/brioche/src/brioche/artifact.rs b/crates/brioche/src/brioche/artifact.rs
@@ -74,10 +74,11 @@ pub enum LazyArtifact {
         path: BString,
     },
     #[serde(rename_all = "camelCase")]
-    Remove {
+    Insert {
         directory: Box<WithMeta<LazyArtifact>>,
-        #[serde_as(as = "Vec<UrlEncoded>")]
-        paths: Vec<BString>,
+        #[serde_as(as = "UrlEncoded")]
+        path: BString,
+        artifact: Option<Box<WithMeta<LazyArtifact>>>,
     },
     #[serde(rename_all = "camelCase")]
     SetPermissions {
@@ -528,7 +529,7 @@ impl TryFrom<LazyArtifact> for CompleteArtifact {
             | LazyArtifact::Merge { .. }
             | LazyArtifact::Peel { .. }
             | LazyArtifact::Get { .. }
-            | LazyArtifact::Remove { .. }
+            | LazyArtifact::Insert { .. }
             | LazyArtifact::SetPermissions { .. }
             | LazyArtifact::Proxy { .. } => Err(ArtifactIncomplete),
         }

diff --git a/crates/brioche/src/brioche/resolve.rs b/crates/brioche/src/brioche/resolve.rs
@@ -336,14 +336,30 @@ async fn resolve_inner(
 
             Ok(result.value)
         }
-        LazyArtifact::Remove { directory, paths } => {
-            let result = resolve(brioche, *directory).await?;
-            let CompleteArtifact::Directory(mut directory) = result.value else {
+        LazyArtifact::Insert {
+            directory,
+            path,
+            artifact,
+        } => {
+            let (directory, artifact) =
+                tokio::try_join!(resolve(brioche, *directory), async move {
+                    match artifact {
+                        Some(artifact) => Ok(Some(resolve(brioche, *artifact).await?)),
+                        None => Ok(None),
+                    }
+                })?;
+
+            let CompleteArtifact::Directory(mut directory) = directory.value else {
                 anyhow::bail!("tried removing item from non-directory artifact");
             };
 
-            for path in paths {
-                directory.remove(&path)?;
+            match artifact {
+                Some(artifact) => {
+                    directory.insert(&path, artifact)?;
+                }
+                None => {
+                    directory.remove(&path)?;
+                }
             }
 
             Ok(CompleteArtifact::Directory(directory))