Fix tests.

moonrepo · Jan 23, 2025 · 7b82e1c · 7b82e1c
1 parent b874320
commit 7b82e1c
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 99 deletions.
diff --git a/.moon/workspace.yml b/.moon/workspace.yml
@@ -35,15 +35,12 @@ docker:
     include:
       - '*.config.js'
       - '*.json'
+
 unstable_remote:
-  # host: 'http://0.0.0.0:8080'
-  # host: 'grpcs://0.0.0.0:9092'
-  host: 'https://cache.depot.dev'
+  host: 'grpcs://cache.depot.dev'
   auth:
     token: 'DEPOT_TOKEN'
     headers:
-      Authorization:
-        'Bearer depot_org_ece2365d877c7f2f437f46de5bf03bd54862e3ca7fde67f079264e971ecb0789'
       'X-Depot-Org': '1xtpjd084j'
       'X-Depot-Project': '90xxfkst9n'
   # cache:

diff --git a/crates/remote/src/action_state.rs b/crates/remote/src/action_state.rs
@@ -21,7 +21,7 @@ pub struct ActionState<'task> {
     pub blobs: Vec<Blob>,
 }
 
-impl<'task> ActionState<'task> {
+impl ActionState<'_> {
     pub fn new(digest: Digest, task: &Task) -> ActionState<'_> {
         ActionState {
             task,

diff --git a/crates/remote/src/grpc_remote_client.rs b/crates/remote/src/grpc_remote_client.rs
@@ -366,7 +366,9 @@ impl RemoteClient for GrpcRemoteClient {
             if let Some(status) = download.status {
                 if status.code != 0 {
                     warn!(
+                        hash = &digest.hash,
                         details = ?status.details,
+                        code = status.code,
                         "Failed to download blob: {}",
                         status.message
                     );

diff --git a/crates/remote/src/remote_service.rs b/crates/remote/src/remote_service.rs
@@ -273,7 +273,7 @@ impl RemoteService {
         batch_download_blobs(
             self.client.clone(),
             &state.digest,
-            &result,
+            result,
             &self.workspace_root,
             self.get_max_batch_size() as usize,
         )

diff --git a/crates/task-expander/tests/task_expander_test.rs b/crates/task-expander/tests/task_expander_test.rs
@@ -26,9 +26,7 @@ mod task_expander {
         task.input_files.insert("project/source/out".into());
 
         let context = create_context(sandbox.path());
-        let task = TaskExpander::new(&project, &context)
-            .expand(&mut task)
-            .unwrap();
+        let task = TaskExpander::new(&project, &context).expand(&task).unwrap();
 
         assert!(task.input_files.is_empty());
         assert_eq!(
@@ -48,9 +46,7 @@ mod task_expander {
         task.input_globs.insert("project/source/out/**/*".into());
 
         let context = create_context(sandbox.path());
-        let task = TaskExpander::new(&project, &context)
-            .expand(&mut task)
-            .unwrap();
+        let task = TaskExpander::new(&project, &context).expand(&task).unwrap();
 
         assert!(task.input_globs.is_empty());
         assert_eq!(
@@ -72,9 +68,7 @@ mod task_expander {
         task.inputs = vec![InputPath::ProjectFile("dir".into())];
 
         let context = create_context(sandbox.path());
-        let task = TaskExpander::new(&project, &context)
-            .expand(&mut task)
-            .unwrap();
+        let task = TaskExpander::new(&project, &context).expand(&task).unwrap();
 
         assert!(task.input_files.is_empty());
         assert_eq!(

diff --git a/crates/task-runner/tests/output_archiver_test.rs b/crates/task-runner/tests/output_archiver_test.rs
@@ -1,21 +1,13 @@
 mod utils;
 
 use moon_cache::CacheMode;
-use moon_remote::Digest;
 use moon_task::Target;
 use starbase_archive::Archiver;
 use std::env;
 use std::fs;
 use std::sync::Arc;
 use utils::*;
 
-fn stub_digest() -> Digest {
-    Digest {
-        hash: "hash123".into(),
-        size_bytes: 0,
-    }
-}
-
 mod output_archiver {
     use super::*;
 
@@ -26,19 +18,17 @@ mod output_archiver {
         async fn does_nothing_if_no_outputs_in_task() {
             let container = TaskRunnerContainer::new("archive", "no-outputs").await;
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            assert!(archiver.archive(&digest, None).await.unwrap().is_none());
+            assert!(archiver.archive("hash123", None).await.unwrap().is_none());
         }
 
         #[tokio::test]
         #[should_panic(expected = "Task project:file-outputs defines outputs but after being ran")]
         async fn errors_if_outputs_not_created() {
             let container = TaskRunnerContainer::new("archive", "file-outputs").await;
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            archiver.archive(&digest, None).await.unwrap();
+            archiver.archive("hash123", None).await.unwrap();
         }
 
         #[tokio::test]
@@ -47,9 +37,8 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            assert!(archiver.archive(&digest, None).await.unwrap().is_some());
+            assert!(archiver.archive("hash123", None).await.unwrap().is_some());
             assert!(container
                 .sandbox
                 .path()
@@ -66,9 +55,8 @@ mod output_archiver {
                 .create_file(".moon/cache/outputs/hash123.tar.gz", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
 
             assert_eq!(fs::metadata(file).unwrap().len(), 0);
         }
@@ -79,14 +67,13 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
             container
                 .app_context
                 .cache_engine
                 .force_mode(CacheMode::Off);
 
-            assert!(archiver.archive(&digest, None).await.unwrap().is_none());
+            assert!(archiver.archive("hash123", None).await.unwrap().is_none());
 
             env::remove_var("MOON_CACHE");
         }
@@ -97,14 +84,13 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
             container
                 .app_context
                 .cache_engine
                 .force_mode(CacheMode::Read);
 
-            assert!(archiver.archive(&digest, None).await.unwrap().is_none());
+            assert!(archiver.archive("hash123", None).await.unwrap().is_none());
 
             env::remove_var("MOON_CACHE");
         }
@@ -115,9 +101,8 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -133,9 +118,8 @@ mod output_archiver {
             container.sandbox.create_file("project/three.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -157,9 +141,8 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -181,9 +164,8 @@ mod output_archiver {
             container.sandbox.create_file("project/c.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -201,9 +183,8 @@ mod output_archiver {
             container.sandbox.create_file("project/c.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -219,9 +200,8 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -237,9 +217,8 @@ mod output_archiver {
             container.sandbox.create_file("project/c.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -255,9 +234,8 @@ mod output_archiver {
             container.sandbox.create_file("project/dir/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -273,9 +251,8 @@ mod output_archiver {
             container.sandbox.create_file("project/c/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -292,9 +269,8 @@ mod output_archiver {
             container.sandbox.create_file("project/dir/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -311,9 +287,8 @@ mod output_archiver {
             container.sandbox.create_file("shared/z.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();
@@ -331,9 +306,8 @@ mod output_archiver {
             container.sandbox.create_file("project/file.txt", "");
 
             let archiver = container.create_archiver();
-            let digest = stub_digest();
 
-            let file = archiver.archive(&digest, None).await.unwrap().unwrap();
+            let file = archiver.archive("hash123", None).await.unwrap().unwrap();
             let dir = container.sandbox.path().join("out");
 
             Archiver::new(&dir, &file).unpack_from_ext().unwrap();