Remove logging of metadata file upload (#2394)

expo · Jun 3, 2024 · a0606ad · a0606ad
1 parent f0e3b64
commit a0606ad
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 58 deletions.
diff --git a/packages/eas-cli/src/build/build.ts b/packages/eas-cli/src/build/build.ts
@@ -275,20 +275,23 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         }
 
         projectTarballPath = projectTarball.path;
-        const bucketKey = await uploadFileAtPathToGCSAsync(
-          ctx.graphqlClient,
-          UploadSessionType.EasBuildGcsProjectSources,
-          projectTarball.path,
-          createProgressTracker({
-            total: projectTarball.size,
-            message: ratio =>
-              `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
-                projectTarball.size
-              )})`,
-            completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
-          })
-        );
-        const { metadataLocation } = await uploadMetadataFileAsync<TPlatform>(projectTarball, ctx);
+        const [bucketKey, { metadataLocation }] = await Promise.all([
+          uploadFileAtPathToGCSAsync(
+            ctx.graphqlClient,
+            UploadSessionType.EasBuildGcsProjectSources,
+            projectTarball.path,
+            createProgressTracker({
+              total: projectTarball.size,
+              message: ratio =>
+                `Uploading to EAS Build (${formatBytes(
+                  projectTarball.size * ratio
+                )} / ${formatBytes(projectTarball.size)})`,
+              completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
+            })
+          ),
+          uploadMetadataFileAsync<TPlatform>(projectTarball, ctx),
+        ]);
+
         if (metadataLocation) {
           return { bucketKey, metadataLocation };
         }
@@ -327,15 +330,7 @@ async function uploadMetadataFileAsync<TPlatform extends Platform>(
     const metadataLocation = await uploadFileAtPathToGCSAsync(
       ctx.graphqlClient,
       UploadSessionType.EasBuildGcsProjectMetadata,
-      projectMetadataFile.path,
-      createProgressTracker({
-        total: projectMetadataFile.size,
-        message: ratio =>
-          `Uploading metadata to EAS Build (${formatBytes(
-            projectMetadataFile!.size * ratio
-          )} / ${formatBytes(projectMetadataFile!.size)})`,
-        completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
-      })
+      projectMetadataFile.path
     );
     return { metadataLocation };
   } catch (err: any) {

diff --git a/packages/eas-cli/src/build/utils/repository.ts b/packages/eas-cli/src/build/utils/repository.ts
@@ -100,44 +100,21 @@ export type LocalFile = {
 };
 
 export async function makeProjectMetadataFileAsync(archivePath: string): Promise<LocalFile> {
-  const spinner = ora('Creating project metadata file');
-  const timerLabel = 'makeProjectMetadataFileAsync';
-  const timer = setTimeout(
-    () => {
-      spinner.start();
-    },
-    Log.isDebug ? 1 : 1000
-  );
-  startTimer(timerLabel);
-
   const metadataLocation = path.join(getTmpDirectory(), `${uuidv4()}-eas-build-metadata.json`);
   const archiveContent: string[] = [];
 
-  try {
-    await tar.list({
-      file: archivePath,
-      onentry: (entry: tar.ReadEntry) => {
-        if (entry.type === 'File' && !entry.path.includes('.git/')) {
-          archiveContent.push(entry.path);
-        }
-      },
-    });
-
-    await fs.writeJSON(metadataLocation, {
-      archiveContent,
-    });
-  } catch (e) {
-    clearTimeout(timer);
-    if (spinner.isSpinning) {
-      spinner.fail();
-    }
-    throw e;
-  }
-  clearTimeout(timer);
+  await tar.list({
+    file: archivePath,
+    onentry: (entry: tar.ReadEntry) => {
+      if (entry.type === 'File' && !entry.path.includes('.git/')) {
+        archiveContent.push(entry.path);
+      }
+    },
+  });
 
-  const duration = endTimer(timerLabel);
-  const prettyTime = formatMilliseconds(duration);
-  spinner.succeed(`Created project metadata file ${chalk.dim(prettyTime)}`);
+  await fs.writeJSON(metadataLocation, {
+    archiveContent,
+  });
 
   return { path: metadataLocation, size: await fs.stat(metadataLocation).then(stat => stat.size) };
 }

diff --git a/packages/eas-cli/src/uploads.ts b/packages/eas-cli/src/uploads.ts
@@ -18,7 +18,7 @@ export async function uploadFileAtPathToGCSAsync(
   graphqlClient: ExpoGraphqlClient,
   type: UploadSessionType,
   path: string,
-  handleProgressEvent: ProgressHandler
+  handleProgressEvent: ProgressHandler = () => {}
 ): Promise<string> {
   const signedUrl = await UploadSessionMutation.createUploadSessionAsync(graphqlClient, type);