refactor(git): replace positional args with parameter object

garden-io · Sep 24, 2024 · 68b2c67 · 68b2c67
1 parent a6b5697
commit 68b2c67
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/core/src/util/fs.ts b/core/src/util/fs.ts
@@ -135,7 +135,7 @@ export async function findConfigPathsInPath({
     log,
     filter: (f) => isConfigFilename(basename(f)),
     scanRoot: dir,
-    skipHashCalculation: true
+    skipHashCalculation: true,
   })
 
   return paths.map((f) => f.path)

diff --git a/core/src/vcs/git-sub-tree.ts b/core/src/vcs/git-sub-tree.ts
@@ -297,7 +297,12 @@ export class GitSubTreeHandler extends AbstractGitHandler {
       // No need to stat unless it has no hash, is a symlink, or is modified
       // Note: git ls-files always returns mode 120000 for symlinks
       if (hash && entry.mode !== "120000" && !modifiedFiles.has(resolvedPath)) {
-        return ensureHash(output, undefined, modifiedFiles, skipHashCalculation)
+        return ensureHash({
+          file: output,
+          stats: undefined,
+          modifiedFiles,
+          skipHashCalculation,
+        })
       }
 
       try {
@@ -320,7 +325,12 @@ export class GitSubTreeHandler extends AbstractGitHandler {
                 gitLog.verbose(`Ignoring symlink pointing outside of ${pathDescription} at ${resolvedPath}`)
                 return
               }
-              return ensureHash(output, stats, modifiedFiles, skipHashCalculation)
+              return ensureHash({
+                file: output,
+                stats,
+                modifiedFiles,
+                skipHashCalculation,
+              })
             } catch (err) {
               if (isErrnoException(err) && err.code === "ENOENT") {
                 gitLog.verbose(`Ignoring dead symlink at ${resolvedPath}`)
@@ -329,10 +339,20 @@ export class GitSubTreeHandler extends AbstractGitHandler {
               throw err
             }
           } else {
-            return ensureHash(output, stats, modifiedFiles, skipHashCalculation)
+            return ensureHash({
+              file: output,
+              stats,
+              modifiedFiles,
+              skipHashCalculation,
+            })
           }
         } else {
-          return ensureHash(output, stats, modifiedFiles, skipHashCalculation)
+          return ensureHash({
+            file: output,
+            stats,
+            modifiedFiles,
+            skipHashCalculation,
+          })
         }
       } catch (err) {
         if (isErrnoException(err) && err.code === "ENOENT") {
@@ -472,12 +492,17 @@ function parseGitLsFilesOutputLine(data: Buffer): GitEntry | undefined {
 /**
  * Make sure we have a fresh hash for each file.
  */
-async function ensureHash(
-  file: VcsFile,
-  stats: fsExtra.Stats | undefined,
-  modifiedFiles: Set<string>,
+async function ensureHash({
+  file,
+  stats,
+  modifiedFiles,
+  skipHashCalculation,
+}: {
+  file: VcsFile
+  stats: fsExtra.Stats | undefined
+  modifiedFiles: Set<string>
   skipHashCalculation: boolean
-): Promise<VcsFile> {
+}): Promise<VcsFile> {
   if (skipHashCalculation) {
     return file
   }