Fix gitClone error logging and improve code quality (#1366)

* Fix gitClone error logging and improve code quality Signed-off-by: amuravski <[email protected]> * Fix lint warning and ran ```pnpm lint && pnpm run gen-types``` Signed-off-by: amuravski <[email protected]> --------- Signed-off-by: amuravski <[email protected]>
CycloneDX · Sep 9, 2024 · 057205c · 057205c
1 parent e7be44f
commit 057205c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 33 deletions.
diff --git a/server.js b/server.js
@@ -31,32 +31,21 @@ const gitClone = (repoUrl, branch = null) => {
     path.join(os.tmpdir(), path.basename(repoUrl)),
   );
 
-  if (branch == null) {
-    console.log("Cloning Repo", "to", tempDir);
-    const result = spawnSync(
-      "git",
-      ["clone", repoUrl, "--depth", "1", tempDir],
-      {
-        encoding: "utf-8",
-        shell: false,
-      },
-    );
-    if (result.status !== 0 || result.error) {
-      console.log(result.error);
-    }
-  } else {
-    console.log("Cloning repo with optional branch", "to", tempDir);
-    const result = spawnSync(
-      "git",
-      ["clone", repoUrl, "--branch", branch, "--depth", "1", tempDir],
-      {
-        encoding: "utf-8",
-        shell: false,
-      },
-    );
-    if (result.status !== 0 || result.error) {
-      console.log(result.error);
-    }
+  const gitArgs = ["clone", repoUrl, "--depth", "1", tempDir];
+  if (branch) {
+    gitArgs.splice(2, 0, "--branch", branch);
+  }
+
+  console.log(
+    `Cloning Repo${branch ? ` with branch ${branch}` : ""} to ${tempDir}`,
+  );
+
+  const result = spawnSync("git", gitArgs, {
+    encoding: "utf-8",
+    shell: false,
+  });
+  if (result.status !== 0) {
+    console.log(result.stderr);
   }
 
   return tempDir;

diff --git a/types/index.d.ts.map b/types/index.d.ts.map
diff --git a/types/server.d.ts.map b/types/server.d.ts.map
diff --git a/types/utils.d.ts b/types/utils.d.ts
@@ -269,20 +269,18 @@ export function parseGradleProperties(rawOutput: string): {
  * Execute gradle properties command using multi-threading and return parsed output
  *
  * @param {string} dir Directory to execute the command
- * @param {string} rootPath Root directory
  * @param {array} allProjectsStr List of all sub-projects (including the preceding `:`)
  *
  * @returns {string} The combined output for all subprojects of the Gradle properties task
  */
-export function executeParallelGradleProperties(dir: string, rootPath: string, allProjectsStr: any[]): string;
+export function executeParallelGradleProperties(dir: string, allProjectsStr: any[]): string;
 /**
  * Execute gradle properties command and return parsed output
  *
  * @param {string} dir Directory to execute the command
- * @param {string} rootPath Root directory
  * @param {string} subProject Sub project name
  */
-export function executeGradleProperties(dir: string, rootPath: string, subProject: string): {};
+export function executeGradleProperties(dir: string, subProject: string): {};
 /**
  * Parse bazel action graph output
  * @param {string} rawOutput Raw string output
@@ -1052,6 +1050,16 @@ export function getJarClasses(jarFile: string): Promise<any[]>;
  * @param {string} rootPath Root directory to look for gradlew wrapper
  */
 export function getGradleCommand(srcPath: string, rootPath: string): string;
+/**
+ * Method to combine the general gradle arguments, the sub-commands and the sub-commands' arguments in the correct way
+ *
+ * @param {string[]} gradleArguments The general gradle arguments, which must only be added once
+ * @param {string[]} gradleSubCommands The sub-commands that are to be executed by gradle
+ * @param {string[]} gradleSubCommandArguments The arguments specific to the sub-command(s), which much be added PER sub-command
+ *
+ * @returns {string[]} Array of arguments to be added to the gradle command
+ */
+export function buildGradleCommandArguments(gradleArguments: string[], gradleSubCommands: string[], gradleSubCommandArguments: string[]): string[];
 /**
  * Method to split the output produced by Gradle using parallel processing by project
  *

diff --git a/types/utils.d.ts.map b/types/utils.d.ts.map