@backstage/plugin-scaffolder-node 0.13.4-next.0 → 0.13.5-next.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.13.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.11.5-next.0
+  - @backstage/plugin-permission-node@0.11.2-next.0
+  - @backstage/backend-plugin-api@1.9.3-next.0
+
+## 0.13.4
+
+### Patch Changes
+
+- 3d0ba59: Added retry with exponential back off to `Git.push()`. Scaffolder template actions that create a repository and immediately push to it (e.g., `publish:github`) can encounter transient failures when the repository is not yet fully provisioned. The push is now retried up to 5 times with increasing delays before failing. Authentication and permission errors (401, 403) fail immediately without retrying.
+- Updated dependencies
+  - @backstage/integration@2.0.3
+  - @backstage/backend-plugin-api@1.9.2
+  - @backstage/plugin-scaffolder-common@2.2.1
+  - @backstage/plugin-permission-node@0.11.1
+
 ## 0.13.4-next.0
 
 ### Patch Changes

package/dist/scm/git.cjs.js

@@ -3,6 +3,7 @@
 var git = require('isomorphic-git');
 var http = require('isomorphic-git/http/node');
 var fs = require('fs-extra');
+var errors = require('@backstage/errors');
 var pgpPlugin = require('@isomorphic-git/pgp-plugin');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -157,25 +158,34 @@ class Git {
       `Pushing directory to remote {dir=${dir},remote=${remote}}`
     );
     try {
-      return await git__default.default.push({
-        fs: fs__default.default,
-        dir,
-        http: http__default.default,
-        onProgress: this.onProgressHandler(),
-        remoteRef,
-        force,
-        headers: this.headers,
-        remote,
-        url,
-        onAuth: this.onAuth,
-        corsProxy: ""
+      return await this.retryOnTransientError({
+        name: "Git push",
+        fn: () => git__default.default.push({
+          fs: fs__default.default,
+          dir,
+          http: http__default.default,
+          onProgress: this.onProgressHandler(),
+          remoteRef,
+          force,
+          headers: this.headers,
+          remote,
+          url,
+          onAuth: this.onAuth,
+          corsProxy: ""
+        })
       });
     } catch (ex) {
       this.config.logger?.error(
         `Failed to push to repo {dir=${dir}, remote=${remote}}`
       );
-      if (ex.data) {
-        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);
+      if (errors.isError(ex) && "data" in ex) {
+        let serializedData;
+        try {
+          serializedData = JSON.stringify(ex.data);
+        } catch {
+          serializedData = "[unserializable data]";
+        }
+        throw new Error(`${ex.message} {data=${serializedData}}`);
       }
       throw ex;
     }
@@ -208,6 +218,50 @@ class Git {
     });
   }
   onAuth;
+  static nonTransientPatterns = [
+    /auth/i,
+    /permission/i,
+    /forbidden/i,
+    /401/,
+    /403/
+  ];
+  async retryOnTransientError(operation) {
+    const maxRetries = 5;
+    const baseDelayMs = 2e3;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        return await operation.fn();
+      } catch (ex) {
+        const errorMsg = errors.isError(ex) ? ex.message : String(ex);
+        let errorData = "";
+        if (errors.isError(ex) && "data" in ex) {
+          try {
+            errorData = JSON.stringify(ex.data);
+          } catch {
+            errorData = "[unserializable data]";
+          }
+        }
+        const fullError = `${errorMsg} ${errorData}`;
+        const isNonTransient = Git.nonTransientPatterns.some(
+          (p) => p.test(fullError)
+        );
+        if (isNonTransient || attempt >= maxRetries) {
+          throw ex;
+        }
+        const delayMs = baseDelayMs * Math.pow(2, attempt);
+        const jitterMs = Math.floor(
+          Math.random() * Math.max(1, Math.floor(delayMs * 0.1))
+        );
+        this.config.logger?.warn(
+          `${operation.name} failed (attempt ${attempt + 1}/${maxRetries + 1}), retrying in ${delayMs + jitterMs}ms: ${errorMsg}`
+        );
+        await new Promise((resolve) => setTimeout(resolve, delayMs + jitterMs));
+      }
+    }
+    throw new Error(
+      `${operation.name} failed after ${maxRetries + 1} attempts`
+    );
+  }
   onProgressHandler = () => {
     let currentPhase = "";
     return (event) => {

package/dist/scm/git.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.cjs.js","sources":["../../src/scm/git.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport git, {\n  AuthCallback,\n  MergeResult,\n  ProgressCallback,\n  ReadCommitResult,\n} from 'isomorphic-git';\nimport http from 'isomorphic-git/http/node';\nimport fs from 'fs-extra';\nimport { LoggerService } from '@backstage/backend-plugin-api';\n// @ts-ignore\nimport { pgp } from '@isomorphic-git/pgp-plugin';\n\nfunction isAuthCallbackOptions(\n  options: StaticAuthOptions | AuthCallbackOptions,\n): options is AuthCallbackOptions {\n  return 'onAuth' in options;\n}\n\n/**\n * Configure static credential for authentication\n *\n * @public\n */\nexport type StaticAuthOptions = {\n  username?: string;\n  password?: string;\n  token?: string;\n  logger?: LoggerService;\n};\n\n/**\n * Configure an authentication callback that can provide credentials on demand\n *\n * @public\n */\nexport type AuthCallbackOptions = {\n  onAuth: AuthCallback;\n  logger?: LoggerService;\n};\n\n/*\nprovider          username         password\nAzure             'notempty'       token\nBitbucket Cloud   'x-token-auth'   token\nBitbucket Server  username         password or token\nGitHub            'x-access-token' token\nGitLab            'oauth2'         token\n\nFrom : https://isomorphic-git.org/docs/en/onAuth with fix for GitHub\n\nOr token provided as `token` for Bearer auth header\ninstead of Basic Auth (e.g., Bitbucket Server).\n*/\n\n/**\n * A convenience wrapper around the `isomorphic-git` library.\n *\n * @public\n */\n\nexport class Git {\n  private readonly headers: {\n    [x: string]: string;\n  };\n\n  private readonly config: {\n    onAuth: AuthCallback;\n    token?: string;\n    logger?: LoggerService;\n  };\n\n  private constructor(config: {\n    onAuth: AuthCallback;\n    token?: string;\n    logger?: LoggerService;\n  }) {\n    this.config = config;\n    this.onAuth = config.onAuth;\n\n    this.headers = {\n      'user-agent': 'git/@isomorphic-git',\n      ...(config.token ? { Authorization: `Bearer ${config.token}` } : {}),\n    };\n  }\n\n  async add(options: { dir: string; filepath: string }): Promise<void> {\n    const { dir, filepath } = options;\n    this.config.logger?.info(`Adding file {dir=${dir},filepath=${filepath}}`);\n\n    return git.add({ fs, dir, filepath });\n  }\n\n  async addRemote(options: {\n    dir: string;\n    remote: string;\n    url: string;\n    force?: boolean;\n  }): Promise<void> {\n    const { dir, url, remote, force } = options;\n    this.config.logger?.info(\n      `Creating new remote {dir=${dir},remote=${remote},url=${url}}`,\n    );\n    return git.addRemote({ fs, dir, remote, url, force });\n  }\n\n  async deleteRemote(options: { dir: string; remote: string }): Promise<void> {\n    const { dir, remote } = options;\n    this.config.logger?.info(`Deleting remote {dir=${dir},remote=${remote}}`);\n    return git.deleteRemote({ fs, dir, remote });\n  }\n\n  async checkout(options: { dir: string; ref: string }): Promise<void> {\n    const { dir, ref } = options;\n    this.config.logger?.info(`Checking out branch {dir=${dir},ref=${ref}}`);\n\n    return git.checkout({ fs, dir, ref });\n  }\n\n  async branch(options: { dir: string; ref: string }): Promise<void> {\n    const { dir, ref } = options;\n    this.config.logger?.info(`Creating branch {dir=${dir},ref=${ref}`);\n\n    return git.branch({ fs, dir, ref });\n  }\n\n  async commit(options: {\n    dir: string;\n    message: string;\n    author: { name: string; email: string };\n    committer: { name: string; email: string };\n    signingKey?: string;\n  }): Promise<string> {\n    const { dir, message, author, committer, signingKey } = options;\n    this.config.logger?.info(\n      `Committing file to repo {dir=${dir},message=${message}}`,\n    );\n    return git.commit({\n      fs,\n      dir,\n      message,\n      author,\n      committer,\n      signingKey,\n      onSign: signingKey ? pgp.sign : undefined,\n    });\n  }\n\n  /** https://isomorphic-git.org/docs/en/clone */\n  async clone(options: {\n    url: string;\n    dir: string;\n    ref?: string;\n    depth?: number;\n    noCheckout?: boolean;\n  }): Promise<void> {\n    const { url, dir, ref, depth, noCheckout } = options;\n    this.config.logger?.info(`Cloning repo {dir=${dir},url=${url}}`);\n\n    try {\n      return await git.clone({\n        fs,\n        http,\n        url,\n        dir,\n        ref,\n        singleBranch: true,\n        depth: depth ?? 1,\n        noCheckout,\n        onProgress: this.onProgressHandler(),\n        headers: this.headers,\n        onAuth: this.onAuth,\n      });\n    } catch (ex) {\n      this.config.logger?.error(`Failed to clone repo {dir=${dir},url=${url}}`);\n      if (ex.data) {\n        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);\n      }\n      throw ex;\n    }\n  }\n\n  /** https://isomorphic-git.org/docs/en/currentBranch */\n  async currentBranch(options: {\n    dir: string;\n    fullName?: boolean;\n  }): Promise<string | undefined> {\n    const { dir, fullName = false } = options;\n    return git.currentBranch({ fs, dir, fullname: fullName }) as Promise<\n      string | undefined\n    >;\n  }\n\n  /** https://isomorphic-git.org/docs/en/fetch */\n  async fetch(options: {\n    dir: string;\n    remote?: string;\n    tags?: boolean;\n  }): Promise<void> {\n    const { dir, remote = 'origin', tags = false } = options;\n    this.config.logger?.info(\n      `Fetching remote=${remote} for repository {dir=${dir}}`,\n    );\n\n    try {\n      await git.fetch({\n        fs,\n        http,\n        dir,\n        remote,\n        tags,\n        onProgress: this.onProgressHandler(),\n        headers: this.headers,\n        onAuth: this.onAuth,\n      });\n    } catch (ex) {\n      this.config.logger?.error(\n        `Failed to fetch repo {dir=${dir},remote=${remote}}`,\n      );\n      if (ex.data) {\n        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);\n      }\n      throw ex;\n    }\n  }\n\n  async init(options: { dir: string; defaultBranch?: string }): Promise<void> {\n    const { dir, defaultBranch = 'master' } = options;\n    this.config.logger?.info(`Init git repository {dir=${dir}}`);\n\n    return git.init({\n      fs,\n      dir,\n      defaultBranch,\n    });\n  }\n\n  /** https://isomorphic-git.org/docs/en/merge */\n  async merge(options: {\n    dir: string;\n    theirs: string;\n    ours?: string;\n    author: { name: string; email: string };\n    committer: { name: string; email: string };\n    signingKey?: string;\n  }): Promise<MergeResult> {\n    const { dir, theirs, ours, author, committer, signingKey } = options;\n    this.config.logger?.info(\n      `Merging branch '${theirs}' into '${ours}' for repository {dir=${dir}}`,\n    );\n\n    // If ours is undefined, current branch is used.\n    return git.merge({\n      fs,\n      dir,\n      ours,\n      theirs,\n      author,\n      committer,\n      signingKey,\n      onSign: signingKey ? pgp.sign : undefined,\n    });\n  }\n\n  async push(options: {\n    dir: string;\n    remote: string;\n    remoteRef?: string;\n    url?: string;\n    force?: boolean;\n  }) {\n    const { dir, remote, url, remoteRef, force } = options;\n    this.config.logger?.info(\n      `Pushing directory to remote {dir=${dir},remote=${remote}}`,\n    );\n    try {\n      return await git.push({\n        fs,\n        dir,\n        http,\n        onProgress: this.onProgressHandler(),\n        remoteRef,\n        force,\n        headers: this.headers,\n        remote,\n        url,\n        onAuth: this.onAuth,\n        corsProxy: '',\n      });\n    } catch (ex) {\n      this.config.logger?.error(\n        `Failed to push to repo {dir=${dir}, remote=${remote}}`,\n      );\n      if (ex.data) {\n        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);\n      }\n      throw ex;\n    }\n  }\n\n  /** https://isomorphic-git.org/docs/en/readCommit */\n  async readCommit(options: {\n    dir: string;\n    sha: string;\n  }): Promise<ReadCommitResult> {\n    const { dir, sha } = options;\n    return git.readCommit({ fs, dir, oid: sha });\n  }\n\n  /** https://isomorphic-git.org/docs/en/remove */\n  async remove(options: { dir: string; filepath: string }): Promise<void> {\n    const { dir, filepath } = options;\n    this.config.logger?.info(\n      `Removing file from git index {dir=${dir},filepath=${filepath}}`,\n    );\n    return git.remove({ fs, dir, filepath });\n  }\n\n  /** https://isomorphic-git.org/docs/en/resolveRef */\n  async resolveRef(options: { dir: string; ref: string }): Promise<string> {\n    const { dir, ref } = options;\n    return git.resolveRef({ fs, dir, ref });\n  }\n\n  /** https://isomorphic-git.org/docs/en/log */\n  async log(options: {\n    dir: string;\n    ref?: string;\n  }): Promise<ReadCommitResult[]> {\n    const { dir, ref } = options;\n    return git.log({\n      fs,\n      dir,\n      ref: ref ?? 'HEAD',\n    });\n  }\n\n  private onAuth: AuthCallback;\n\n  private onProgressHandler = (): ProgressCallback => {\n    let currentPhase = '';\n\n    return event => {\n      if (currentPhase !== event.phase) {\n        currentPhase = event.phase;\n        this.config.logger?.info(event.phase);\n      }\n      const total = event.total\n        ? `${Math.round((event.loaded / event.total) * 100)}%`\n        : event.loaded;\n      this.config.logger?.debug(`status={${event.phase},total={${total}}}`);\n    };\n  };\n\n  static fromAuth = (options: StaticAuthOptions | AuthCallbackOptions) => {\n    if (isAuthCallbackOptions(options)) {\n      const { onAuth, logger } = options;\n      return new Git({ onAuth, logger });\n    }\n\n    const { username, password, token, logger } = options;\n    return new Git({ onAuth: () => ({ username, password }), token, logger });\n  };\n}\n"],"names":["git","fs","pgp","http","logger"],"mappings":"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"}
+{"version":3,"file":"git.cjs.js","sources":["../../src/scm/git.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport git, {\n  AuthCallback,\n  MergeResult,\n  ProgressCallback,\n  ReadCommitResult,\n} from 'isomorphic-git';\nimport http from 'isomorphic-git/http/node';\nimport fs from 'fs-extra';\nimport { LoggerService } from '@backstage/backend-plugin-api';\nimport { isError } from '@backstage/errors';\n// @ts-ignore\nimport { pgp } from '@isomorphic-git/pgp-plugin';\n\nfunction isAuthCallbackOptions(\n  options: StaticAuthOptions | AuthCallbackOptions,\n): options is AuthCallbackOptions {\n  return 'onAuth' in options;\n}\n\n/**\n * Configure static credential for authentication\n *\n * @public\n */\nexport type StaticAuthOptions = {\n  username?: string;\n  password?: string;\n  token?: string;\n  logger?: LoggerService;\n};\n\n/**\n * Configure an authentication callback that can provide credentials on demand\n *\n * @public\n */\nexport type AuthCallbackOptions = {\n  onAuth: AuthCallback;\n  logger?: LoggerService;\n};\n\n/*\nprovider          username         password\nAzure             'notempty'       token\nBitbucket Cloud   'x-token-auth'   token\nBitbucket Server  username         password or token\nGitHub            'x-access-token' token\nGitLab            'oauth2'         token\n\nFrom : https://isomorphic-git.org/docs/en/onAuth with fix for GitHub\n\nOr token provided as `token` for Bearer auth header\ninstead of Basic Auth (e.g., Bitbucket Server).\n*/\n\n/**\n * A convenience wrapper around the `isomorphic-git` library.\n *\n * @public\n */\n\nexport class Git {\n  private readonly headers: {\n    [x: string]: string;\n  };\n\n  private readonly config: {\n    onAuth: AuthCallback;\n    token?: string;\n    logger?: LoggerService;\n  };\n\n  private constructor(config: {\n    onAuth: AuthCallback;\n    token?: string;\n    logger?: LoggerService;\n  }) {\n    this.config = config;\n    this.onAuth = config.onAuth;\n\n    this.headers = {\n      'user-agent': 'git/@isomorphic-git',\n      ...(config.token ? { Authorization: `Bearer ${config.token}` } : {}),\n    };\n  }\n\n  async add(options: { dir: string; filepath: string }): Promise<void> {\n    const { dir, filepath } = options;\n    this.config.logger?.info(`Adding file {dir=${dir},filepath=${filepath}}`);\n\n    return git.add({ fs, dir, filepath });\n  }\n\n  async addRemote(options: {\n    dir: string;\n    remote: string;\n    url: string;\n    force?: boolean;\n  }): Promise<void> {\n    const { dir, url, remote, force } = options;\n    this.config.logger?.info(\n      `Creating new remote {dir=${dir},remote=${remote},url=${url}}`,\n    );\n    return git.addRemote({ fs, dir, remote, url, force });\n  }\n\n  async deleteRemote(options: { dir: string; remote: string }): Promise<void> {\n    const { dir, remote } = options;\n    this.config.logger?.info(`Deleting remote {dir=${dir},remote=${remote}}`);\n    return git.deleteRemote({ fs, dir, remote });\n  }\n\n  async checkout(options: { dir: string; ref: string }): Promise<void> {\n    const { dir, ref } = options;\n    this.config.logger?.info(`Checking out branch {dir=${dir},ref=${ref}}`);\n\n    return git.checkout({ fs, dir, ref });\n  }\n\n  async branch(options: { dir: string; ref: string }): Promise<void> {\n    const { dir, ref } = options;\n    this.config.logger?.info(`Creating branch {dir=${dir},ref=${ref}`);\n\n    return git.branch({ fs, dir, ref });\n  }\n\n  async commit(options: {\n    dir: string;\n    message: string;\n    author: { name: string; email: string };\n    committer: { name: string; email: string };\n    signingKey?: string;\n  }): Promise<string> {\n    const { dir, message, author, committer, signingKey } = options;\n    this.config.logger?.info(\n      `Committing file to repo {dir=${dir},message=${message}}`,\n    );\n    return git.commit({\n      fs,\n      dir,\n      message,\n      author,\n      committer,\n      signingKey,\n      onSign: signingKey ? pgp.sign : undefined,\n    });\n  }\n\n  /** https://isomorphic-git.org/docs/en/clone */\n  async clone(options: {\n    url: string;\n    dir: string;\n    ref?: string;\n    depth?: number;\n    noCheckout?: boolean;\n  }): Promise<void> {\n    const { url, dir, ref, depth, noCheckout } = options;\n    this.config.logger?.info(`Cloning repo {dir=${dir},url=${url}}`);\n\n    try {\n      return await git.clone({\n        fs,\n        http,\n        url,\n        dir,\n        ref,\n        singleBranch: true,\n        depth: depth ?? 1,\n        noCheckout,\n        onProgress: this.onProgressHandler(),\n        headers: this.headers,\n        onAuth: this.onAuth,\n      });\n    } catch (ex) {\n      this.config.logger?.error(`Failed to clone repo {dir=${dir},url=${url}}`);\n      if (ex.data) {\n        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);\n      }\n      throw ex;\n    }\n  }\n\n  /** https://isomorphic-git.org/docs/en/currentBranch */\n  async currentBranch(options: {\n    dir: string;\n    fullName?: boolean;\n  }): Promise<string | undefined> {\n    const { dir, fullName = false } = options;\n    return git.currentBranch({ fs, dir, fullname: fullName }) as Promise<\n      string | undefined\n    >;\n  }\n\n  /** https://isomorphic-git.org/docs/en/fetch */\n  async fetch(options: {\n    dir: string;\n    remote?: string;\n    tags?: boolean;\n  }): Promise<void> {\n    const { dir, remote = 'origin', tags = false } = options;\n    this.config.logger?.info(\n      `Fetching remote=${remote} for repository {dir=${dir}}`,\n    );\n\n    try {\n      await git.fetch({\n        fs,\n        http,\n        dir,\n        remote,\n        tags,\n        onProgress: this.onProgressHandler(),\n        headers: this.headers,\n        onAuth: this.onAuth,\n      });\n    } catch (ex) {\n      this.config.logger?.error(\n        `Failed to fetch repo {dir=${dir},remote=${remote}}`,\n      );\n      if (ex.data) {\n        throw new Error(`${ex.message} {data=${JSON.stringify(ex.data)}}`);\n      }\n      throw ex;\n    }\n  }\n\n  async init(options: { dir: string; defaultBranch?: string }): Promise<void> {\n    const { dir, defaultBranch = 'master' } = options;\n    this.config.logger?.info(`Init git repository {dir=${dir}}`);\n\n    return git.init({\n      fs,\n      dir,\n      defaultBranch,\n    });\n  }\n\n  /** https://isomorphic-git.org/docs/en/merge */\n  async merge(options: {\n    dir: string;\n    theirs: string;\n    ours?: string;\n    author: { name: string; email: string };\n    committer: { name: string; email: string };\n    signingKey?: string;\n  }): Promise<MergeResult> {\n    const { dir, theirs, ours, author, committer, signingKey } = options;\n    this.config.logger?.info(\n      `Merging branch '${theirs}' into '${ours}' for repository {dir=${dir}}`,\n    );\n\n    // If ours is undefined, current branch is used.\n    return git.merge({\n      fs,\n      dir,\n      ours,\n      theirs,\n      author,\n      committer,\n      signingKey,\n      onSign: signingKey ? pgp.sign : undefined,\n    });\n  }\n\n  async push(options: {\n    dir: string;\n    remote: string;\n    remoteRef?: string;\n    url?: string;\n    force?: boolean;\n  }) {\n    const { dir, remote, url, remoteRef, force } = options;\n    this.config.logger?.info(\n      `Pushing directory to remote {dir=${dir},remote=${remote}}`,\n    );\n    try {\n      return await this.retryOnTransientError({\n        name: 'Git push',\n        fn: () =>\n          git.push({\n            fs,\n            dir,\n            http,\n            onProgress: this.onProgressHandler(),\n            remoteRef,\n            force,\n            headers: this.headers,\n            remote,\n            url,\n            onAuth: this.onAuth,\n            corsProxy: '',\n          }),\n      });\n    } catch (ex) {\n      this.config.logger?.error(\n        `Failed to push to repo {dir=${dir}, remote=${remote}}`,\n      );\n      if (isError(ex) && 'data' in ex) {\n        let serializedData: string;\n        try {\n          serializedData = JSON.stringify(ex.data);\n        } catch {\n          serializedData = '[unserializable data]';\n        }\n        throw new Error(`${ex.message} {data=${serializedData}}`);\n      }\n      throw ex;\n    }\n  }\n\n  /** https://isomorphic-git.org/docs/en/readCommit */\n  async readCommit(options: {\n    dir: string;\n    sha: string;\n  }): Promise<ReadCommitResult> {\n    const { dir, sha } = options;\n    return git.readCommit({ fs, dir, oid: sha });\n  }\n\n  /** https://isomorphic-git.org/docs/en/remove */\n  async remove(options: { dir: string; filepath: string }): Promise<void> {\n    const { dir, filepath } = options;\n    this.config.logger?.info(\n      `Removing file from git index {dir=${dir},filepath=${filepath}}`,\n    );\n    return git.remove({ fs, dir, filepath });\n  }\n\n  /** https://isomorphic-git.org/docs/en/resolveRef */\n  async resolveRef(options: { dir: string; ref: string }): Promise<string> {\n    const { dir, ref } = options;\n    return git.resolveRef({ fs, dir, ref });\n  }\n\n  /** https://isomorphic-git.org/docs/en/log */\n  async log(options: {\n    dir: string;\n    ref?: string;\n  }): Promise<ReadCommitResult[]> {\n    const { dir, ref } = options;\n    return git.log({\n      fs,\n      dir,\n      ref: ref ?? 'HEAD',\n    });\n  }\n\n  private onAuth: AuthCallback;\n\n  private static readonly nonTransientPatterns = [\n    /auth/i,\n    /permission/i,\n    /forbidden/i,\n    /401/,\n    /403/,\n  ];\n\n  private async retryOnTransientError<T>(operation: {\n    /** The name of the operation */\n    name: string;\n    /** The operation to be executed */\n    fn: () => Promise<T>;\n  }): Promise<T> {\n    const maxRetries = 5;\n    const baseDelayMs = 2000;\n\n    for (let attempt = 0; attempt <= maxRetries; attempt++) {\n      try {\n        return await operation.fn();\n      } catch (ex) {\n        const errorMsg = isError(ex) ? ex.message : String(ex);\n        let errorData = '';\n        if (isError(ex) && 'data' in ex) {\n          try {\n            errorData = JSON.stringify(ex.data);\n          } catch {\n            errorData = '[unserializable data]';\n          }\n        }\n        const fullError = `${errorMsg} ${errorData}`;\n        const isNonTransient = Git.nonTransientPatterns.some(p =>\n          p.test(fullError),\n        );\n\n        if (isNonTransient || attempt >= maxRetries) {\n          throw ex;\n        }\n\n        const delayMs = baseDelayMs * Math.pow(2, attempt);\n        const jitterMs = Math.floor(\n          Math.random() * Math.max(1, Math.floor(delayMs * 0.1)),\n        );\n        this.config.logger?.warn(\n          `${operation.name} failed (attempt ${attempt + 1}/${\n            maxRetries + 1\n          }), retrying in ${delayMs + jitterMs}ms: ${errorMsg}`,\n        );\n        await new Promise(resolve => setTimeout(resolve, delayMs + jitterMs));\n      }\n    }\n\n    throw new Error(\n      `${operation.name} failed after ${maxRetries + 1} attempts`,\n    );\n  }\n\n  private onProgressHandler = (): ProgressCallback => {\n    let currentPhase = '';\n\n    return event => {\n      if (currentPhase !== event.phase) {\n        currentPhase = event.phase;\n        this.config.logger?.info(event.phase);\n      }\n      const total = event.total\n        ? `${Math.round((event.loaded / event.total) * 100)}%`\n        : event.loaded;\n      this.config.logger?.debug(`status={${event.phase},total={${total}}}`);\n    };\n  };\n\n  static fromAuth = (options: StaticAuthOptions | AuthCallbackOptions) => {\n    if (isAuthCallbackOptions(options)) {\n      const { onAuth, logger } = options;\n      return new Git({ onAuth, logger });\n    }\n\n    const { username, password, token, logger } = options;\n    return new Git({ onAuth: () => ({ username, password }), token, logger });\n  };\n}\n"],"names":["git","fs","pgp","http","isError","logger"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node",
-  "version": "0.13.4-next.0",
+  "version": "0.13.5-next.0",
   "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "node-library",
@@ -70,13 +70,13 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "1.9.2-next.0",
+    "@backstage/backend-plugin-api": "1.9.3-next.0",
     "@backstage/catalog-model": "1.9.0",
     "@backstage/errors": "1.3.1",
-    "@backstage/integration": "2.0.3-next.0",
+    "@backstage/integration": "2.0.3",
     "@backstage/plugin-permission-common": "0.9.9",
-    "@backstage/plugin-permission-node": "0.11.1-next.0",
-    "@backstage/plugin-scaffolder-common": "2.2.1-next.0",
+    "@backstage/plugin-permission-node": "0.11.2-next.0",
+    "@backstage/plugin-scaffolder-common": "2.2.1",
     "@backstage/types": "1.2.2",
     "@isomorphic-git/pgp-plugin": "^0.0.7",
     "concat-stream": "^2.0.0",
@@ -93,14 +93,14 @@
     "zod-to-json-schema": "^3.25.1"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.11.4-next.0",
-    "@backstage/cli": "0.36.3-next.0",
+    "@backstage/backend-test-utils": "1.11.5-next.0",
+    "@backstage/cli": "0.36.4-next.0",
     "@backstage/config": "1.3.8",
     "@types/lodash": "^4.14.151",
     "msw": "^1.0.0"
   },
   "peerDependencies": {
-    "@backstage/backend-test-utils": "1.11.4-next.0"
+    "@backstage/backend-test-utils": "1.11.5-next.0"
   },
   "peerDependenciesMeta": {
     "@backstage/backend-test-utils": {