@gearbox-protocol/deploy-tools 5.49.9 → 5.49.11

package/dist/index.mjs

@@ -429514,34 +429514,44 @@ var log_default = logger;
 var log = log_default.child({ name: "git" });
 function getGithubUrl(repo, https = false) {
   const credentials = process.env.GIT_TOKEN ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
-  log.info({
-    GIT_TOKEN: process.env.GIT_TOKEN?.slice(-4) ?? "--",
-    GITHUB_TOKEN: process.env.GITHUB_TOKEN?.slice(-4) ?? "--",
-    GH_TOKEN: process.env.GH_TOKEN?.slice(-4) ?? "--"
-  }, `using git token *****${credentials?.slice(-4)}`);
+  const githubUser = process.env.GITHUB_USER;
   const path12 = repo.replace(/^@/, "").replace(/\/$/, "");
-  const cred = credentials ? `${credentials}@` : "";
-  return https || credentials ? `https://${cred}github.com/${path12}.git` : `git@github.com:${path12}.git`;
+  let cred = "";
+  if (credentials) {
+    cred = githubUser ? `${githubUser}:${credentials}@` : `${credentials}@`;
+  }
+  const url2 = https || credentials ? `https://${cred}github.com/${path12}.git` : `git@github.com:${path12}.git`;
+  log.info(`github URL: ${url2.replace(/\/\/[^@]+@/, "//***@")}`);
+  return url2;
 }
 async function cloneRepo(opts) {
   const { repo, commit, sandboxDir } = opts;
   const destDir = opts.destDir ?? repo.split("/")[1];
   const repoPath = path.resolve(sandboxDir, destDir);
+  const cloneUrl = getGithubUrl(repo);
+  const clearCreds = ["credential-cache", "exit"];
+  spawnSync("git", clearCreds, { cwd: sandboxDir });
+  const gitConfig = ["config", "--local", "credential.helper", "store"];
+  spawnSync("git", gitConfig, { cwd: sandboxDir });
   if (existsSync(repoPath)) {
     log.trace(`repo ${repoPath} already exists, assuming repo already cloned`);
     if (opts.disablePull) {
       return;
     }
   } else {
-    const clone2 = ["clone", getGithubUrl(repo), destDir];
+    const clone2 = ["clone", cloneUrl, destDir];
     log.debug(`cloning ${repo} at ${commit} to ${destDir}`);
-    await new Promise((r) => {
-      log.flush(r);
-    });
     const { stderr, status, error: error46 } = spawnSync("git", clone2, {
-      cwd: sandboxDir
+      cwd: sandboxDir,
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+        // Disable credential prompts
+      }
     });
     if (error46 || status !== 0) {
+      log.error(`Git clone failed with status ${status}: ${stderr?.toString()}`);
+      log.error(`Clone command: git ${clone2.join(" ")}`);
       throw error46 ?? new Error(stderr?.toString());
     }
     log.debug({ clone: clone2 }, "cloned");
@@ -429550,7 +429560,12 @@ async function cloneRepo(opts) {
     const reset2 = ["reset", "--hard", commit, "--"];
     log.trace({ reset: reset2 }, "reset");
     const { stderr, status, error: error46 } = spawnSync("git", reset2, {
-      cwd: repoPath
+      cwd: repoPath,
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+        // Disable credential prompts
+      }
     });
     if (error46 || status !== 0) {
       throw error46 ?? new Error(stderr?.toString());
@@ -429559,13 +429574,23 @@ async function cloneRepo(opts) {
   } else {
     log.trace(`fetching latest from ${repoPath}...`);
     const fetchResult = spawnSync("git", ["fetch", "--all"], {
-      cwd: path.resolve(sandboxDir, destDir)
+      cwd: path.resolve(sandboxDir, destDir),
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+        // Disable credential prompts
+      }
     });
     if (fetchResult.error || fetchResult.status !== 0) {
       throw fetchResult.error ?? new Error(fetchResult.stderr?.toString());
     }
     const currentBranchResult = spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
-      cwd: path.resolve(sandboxDir, destDir)
+      cwd: path.resolve(sandboxDir, destDir),
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+        // Disable credential prompts
+      }
     });
     if (currentBranchResult.error || currentBranchResult.status !== 0) {
       throw currentBranchResult.error ?? new Error(currentBranchResult.stderr?.toString());
@@ -429573,7 +429598,12 @@ async function cloneRepo(opts) {
     const currentBranch = currentBranchResult.stdout.toString().trim();
     log.trace(`resetting ${repoPath} to latest commit in origin/${currentBranch}...`);
     const resetResult = spawnSync("git", ["reset", "--hard", `origin/${currentBranch}`], {
-      cwd: path.resolve(sandboxDir, destDir)
+      cwd: path.resolve(sandboxDir, destDir),
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+        // Disable credential prompts
+      }
     });
     if (resetResult.error || resetResult.status !== 0) {
       throw resetResult.error ?? new Error(resetResult.stderr?.toString());
@@ -453189,7 +453219,8 @@ var MetaRepo = class {
     this.#logger.debug({
       GIT_TOKEN: process.env.GIT_TOKEN?.slice(-4) ?? "--",
       GITHUB_TOKEN: process.env.GITHUB_TOKEN?.slice(-4) ?? "--",
-      GH_TOKEN: process.env.GH_TOKEN?.slice(-4) ?? "--"
+      GH_TOKEN: process.env.GH_TOKEN?.slice(-4) ?? "--",
+      GITHUB_USER: process.env.GITHUB_USER ?? "--"
     }, "loading metadata from github repo");
     mkdirSync4(this.#dir, { recursive: true });
     await cloneRepo({
@@ -458772,7 +458803,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.49.9",
+  version: "5.49.11",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.49.9",
+  "version": "5.49.11",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"