From 51b5354ed4da0ecff6c55df1d66dcae4d3dd67bc Mon Sep 17 00:00:00 2001
From: Krishna Suravarapu <36037520+KrishnaSuravarapu@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:33:32 +0530
Subject: [PATCH 1/4] Chore: Fixing force upload failing

---
 bin/commands/runs.js         | 9 ++++++++-
 bin/helpers/checkUploaded.js | 9 +++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index 79282b73..39710a8f 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -263,7 +263,14 @@ module.exports = function run(args, rawArgs) {
 
             let test_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.fileName));
             let npm_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.packageFileName));
-            let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"))            
+            let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"));
+
+            if (Constants.turboScaleObj.enabled) {
+              let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig, args, {markBlockStart, markBlockEnd});
+              let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig);
+              Object.assign(md5data, { npm_package_md5sum });
+              Object.assign(md5data, { zip_md5sum });
+            }
             
             //Package diff
             let isPackageDiff = false;
diff --git a/bin/helpers/checkUploaded.js b/bin/helpers/checkUploaded.js
index fa5926f7..f16bf26c 100644
--- a/bin/helpers/checkUploaded.js
+++ b/bin/helpers/checkUploaded.js
@@ -13,9 +13,6 @@ const crypto = require('crypto'),
 
 const checkSpecsMd5 = (runSettings, args, instrumentBlocks) => {
   return new Promise(function (resolve, reject) {
-    if (args["force-upload"]) {
-      return resolve("force-upload");
-    }
     let cypressFolderPath = undefined;
     if (runSettings.home_directory) {
       cypressFolderPath = runSettings.home_directory;
@@ -166,4 +163,8 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
   });
 };
 
-exports.checkUploadedMd5 = checkUploadedMd5;
+exports = {
+  checkSpecsMd5,
+  checkPackageMd5,
+  checkUploadedMd5
+};

From b1b1e684c80304527ef3a6aafc1106e2e37966da Mon Sep 17 00:00:00 2001
From: Krishna Suravarapu <36037520+KrishnaSuravarapu@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:57:20 +0530
Subject: [PATCH 2/4] Minor: Fixing import bug

---
 bin/commands/runs.js         | 5 +++--
 bin/helpers/checkUploaded.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index 39710a8f..d58393a2 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -266,10 +266,11 @@ module.exports = function run(args, rawArgs) {
             let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"));
 
             if (Constants.turboScaleObj.enabled) {
-              let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig, args, {markBlockStart, markBlockEnd});
-              let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig);
+              let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig.run_settings, args, {markBlockStart, markBlockEnd});
+              let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig.run_settings);
               Object.assign(md5data, { npm_package_md5sum });
               Object.assign(md5data, { zip_md5sum });
+              process.exit(0);
             }
             
             //Package diff
diff --git a/bin/helpers/checkUploaded.js b/bin/helpers/checkUploaded.js
index f16bf26c..68588d45 100644
--- a/bin/helpers/checkUploaded.js
+++ b/bin/helpers/checkUploaded.js
@@ -163,7 +163,7 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
   });
 };
 
-exports = {
+module.exports = {
   checkSpecsMd5,
   checkPackageMd5,
   checkUploadedMd5

From d567e5afb74579ab02f53a65f1b1843398b2fece Mon Sep 17 00:00:00 2001
From: Krishna Suravarapu <36037520+KrishnaSuravarapu@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:58:16 +0530
Subject: [PATCH 3/4] Minor: Removing process.exit

---
 bin/commands/runs.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index d58393a2..fb2168e0 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -270,7 +270,6 @@ module.exports = function run(args, rawArgs) {
               let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig.run_settings);
               Object.assign(md5data, { npm_package_md5sum });
               Object.assign(md5data, { zip_md5sum });
-              process.exit(0);
             }
             
             //Package diff

From 19c8eb59b3a00b1e3090d1b8104ce8b131a244e1 Mon Sep 17 00:00:00 2001
From: Krishna Suravarapu <36037520+KrishnaSuravarapu@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:37:42 +0530
Subject: [PATCH 4/4] Minor: Adding comment

---
 bin/commands/runs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index fb2168e0..57ed58d1 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -266,6 +266,7 @@ module.exports = function run(args, rawArgs) {
             let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"));
 
             if (Constants.turboScaleObj.enabled) {
+              // Note: Calculating md5 here for turboscale force-upload so that we don't need to re-calculate at hub         
               let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig.run_settings, args, {markBlockStart, markBlockEnd});
               let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig.run_settings);
               Object.assign(md5data, { npm_package_md5sum });