@docupace/pipeline 1.0.74 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -16,8 +16,8 @@
   "license": "ISC",
   "dependencies": {
     "@changesets/cli": "^2.27.10",
-    "@docupace/core-client": "^0.1.94",
-    "@docupace/pipeline": "^1.0.33-alpha-2",
+    "@docupace/core-client": "^1.0.1",
+    "@docupace/pipeline": "^1.0.12",
     "@jest/globals": "^30.1.2",
     "auth0-deploy-cli": "^8.8.0",
     "axios": "^1.7.9",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.12",
     "eslint": "^9.34.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-node": "^0.3.9",

package/src/auth0/cli.js

@@ -73,10 +73,10 @@ program
   });
 
 program
-  .command('getAuth0Metadata <site> <env> [auth0Tenant]')
+  .command('getAuth0Metadata <site> <env> [auth0Tenant] [jiraTicket]')
   .description('Get Auth0 metadata for the given site')
-  .action(async (site, env, auth0Tenant = '') => {
-    await getAuth0Metadata(site, env, auth0Tenant);
+  .action(async (site, env, auth0Tenant = '', jiraTicket = '') => {
+    await getAuth0Metadata(site, env, auth0Tenant, jiraTicket);
   });
 
 program.parse(process.argv);

package/src/auth0/metadata.js

@@ -6,7 +6,7 @@ import { getAuth0AuthToken } from './configure.js';
 import { getVaultSecrets } from './vault.js';
 import { getVaultSecretsConfigs } from '../next/config.js';
 
-export async function getAuth0Metadata(site, env, auth0Tenant) {
+export async function getAuth0Metadata(site, env, auth0Tenant, jiraTicket) {
   try {
     const connectDeployRepoPath = await cloneRepository('connect-deploy');
 
@@ -129,10 +129,11 @@ export async function getAuth0Metadata(site, env, auth0Tenant) {
     await fs.writeFile(configPath, newConfig);
     console.log('The application.conf has been updated.');
 
-    await pushDeployConfig(
-      connectDeployRepoPath,
-      `Auth0 SAML metadata update for site: (${site}) in env: (${env})`,
-    );
+    const commitMessage = jiraTicket
+      ? `${jiraTicket} Auth0 SAML metadata update for site: (${site}) in env: (${env})`
+      : `Auth0 SAML metadata update for site: (${site}) in env: (${env})`;
+    console.log('Commit message:', commitMessage);
+    await pushDeployConfig(connectDeployRepoPath, commitMessage);
   } catch (error) {
     console.error('Error:', error.message);
     process.exit(1);

package/src/merge/cli-merge-all.js

@@ -306,6 +306,7 @@ async function runFollowUpPhase(prepareResults, verbose = false) {
         console.log(`✅ ${result.configName}: ${action} completed`);
       } else {
         console.log(`❌ ${result.configName}: ${action} failed`);
+        process.exit(1);
       }
     }
   }
@@ -387,7 +388,9 @@ async function mergeAll(verbose = false) {
       );
       if (verbose) {
         existingPRs.forEach((pr) => {
-          console.log(`  - PR #${pr.id}: ${pr.title} in ${pr.repositoryName || 'unknown repo'} (${pr.links.html.href})`);
+          console.log(
+            `  - PR #${pr.id}: ${pr.title} in ${pr.repositoryName || 'unknown repo'} (${pr.links.html.href})`,
+          );
         });
       }
       process.exit(1);

package/src/merge/pr.js

@@ -13,7 +13,10 @@ import { execSync } from 'child_process';
  * @param {string} descriptionPattern - Pattern to match in PR descriptions
  * @returns {Promise<Object[]>} - Array of matching PRs
  */
-export async function getExistingPRsWithDescription(descriptionPattern, repositories) {
+export async function getExistingPRsWithDescription(
+  descriptionPattern,
+  repositories,
+) {
   // If no repositories provided, fall back to current repo behavior for backward compatibility
   if (!repositories || !Array.isArray(repositories)) {
     return getExistingPRsFromCurrentRepo(descriptionPattern);
@@ -38,14 +41,14 @@ export async function getExistingPRsWithDescription(descriptionPattern, reposito
     for (const repo of repositories) {
       try {
         const match = repo.url.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-        
+
         if (!match) {
           console.warn(`Could not parse repository URL: ${repo.url}`);
           continue;
         }
 
         const [, workspace, repoSlug] = match;
-        
+
         const response = await fetch(
           `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
           {
@@ -59,24 +62,29 @@ export async function getExistingPRsWithDescription(descriptionPattern, reposito
 
         if (!response.ok) {
           const error = await response.text();
-          console.warn(`Bitbucket API error for ${repo.name}: ${response.status} - ${error}`);
+          console.warn(
+            `Bitbucket API error for ${repo.name}: ${response.status} - ${error}`,
+          );
           continue;
         }
 
         const data = await response.json();
-        const matchingPRs = data.values.filter(pr => 
-          pr.description && pr.description.startsWith(descriptionPattern)
+        const matchingPRs = data.values.filter(
+          (pr) =>
+            pr.description && pr.description.startsWith(descriptionPattern),
         );
 
         // Add repository info to each PR for context
-        matchingPRs.forEach(pr => {
+        matchingPRs.forEach((pr) => {
           pr.repositoryName = repo.name;
           pr.repositoryUrl = repo.url;
         });
 
         allMatchingPRs.push(...matchingPRs);
       } catch (error) {
-        console.warn(`Failed to check PRs for repository ${repo.name}: ${error.message}`);
+        console.warn(
+          `Failed to check PRs for repository ${repo.name}: ${error.message}`,
+        );
       }
     }
 
@@ -135,8 +143,8 @@ export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
     }
 
     const data = await response.json();
-    const matchingPRs = data.values.filter(pr => 
-      pr.description && pr.description.startsWith(descriptionPattern)
+    const matchingPRs = data.values.filter(
+      (pr) => pr.description && pr.description.startsWith(descriptionPattern),
     );
 
     return matchingPRs;

package/src/micro/deploy-microservice.js

@@ -1,6 +1,7 @@
 import { $ } from '../next/logger.js';
 import fs from 'fs';
 import path from 'path';
+import axios from 'axios';
 
 export async function deployMicroservice(
   appName,
@@ -80,7 +81,19 @@ export async function deployMicroservice(
     console.log(`New: ${newDir}`);
 
     await $`cd ${repoName} && git config user.email "pipeline@bitbucket.org"`;
-    await $`cd ${repoName} && git config user.name "Bitbucket Pipeline"`;
+
+    if (process.env.BITBUCKET_STEP_TRIGGERER_UUID) {
+      try {
+        const response = await axios.get(
+          `https://api.bitbucket.org/2.0/users/${process.env.BITBUCKET_STEP_TRIGGERER_UUID}`,
+        );
+        const triggererUsername = response.data.display_name;
+        console.log(`📌 Run triggered by: ${triggererUsername}`);
+        await $`cd ${repoName} && git config user.name ${triggererUsername}`;
+      } catch (error) {
+        console.warn('Failed to fetch Bitbucket user info:', error.message);
+      }
+    }
 
     console.log(`Attempting to checkout branch: ${gitopsBranch}`);
     await $`cd ${repoName} && git checkout ${gitopsBranch}`;

package/src/next/deploy.js

@@ -48,6 +48,20 @@ async function updateAndCommitConnectVersion(
 
     // Git commands to stage, commit and push changes
     await $`cd ${connectDeployPath} && git config user.email "gitops@docupace.com"`;
+
+    if (process.env.BITBUCKET_STEP_TRIGGERER_UUID) {
+      try {
+        const response = await axios.get(
+          `https://api.bitbucket.org/2.0/users/${process.env.BITBUCKET_STEP_TRIGGERER_UUID}`,
+        );
+        const triggererUsername = response.data.display_name;
+        console.log(`📌 Run triggered by: ${triggererUsername}`);
+        await $`cd ${connectDeployPath} && git config user.name ${triggererUsername}`;
+      } catch (error) {
+        console.warn('Failed to fetch Bitbucket user info:', error.message);
+      }
+    }
+
     await $`cd ${connectDeployPath} && git add .`;
     await $`cd ${connectDeployPath} && git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}" || echo "No changes to commit"`;
     await $`cd ${connectDeployPath} && git push`;
@@ -232,6 +246,20 @@ export async function pushDeployConfig(repoPath, commitMessage) {
 
   console.log('📌 Committing changes to the repository...');
   await $`cd ${repoPath} && git config user.email "gitops@docupace.com"`;
+
+  if (process.env.BITBUCKET_STEP_TRIGGERER_UUID) {
+    try {
+      const response = await axios.get(
+        `https://api.bitbucket.org/2.0/users/${process.env.BITBUCKET_STEP_TRIGGERER_UUID}`,
+      );
+      const triggererUsername = response.data.display_name;
+      console.log(`📌 Run triggered by: ${triggererUsername}`);
+      await $`cd ${repoPath} && git config user.name ${triggererUsername}`;
+    } catch (error) {
+      console.warn('Failed to fetch Bitbucket user info:', error.message);
+    }
+  }
+
   await $`cd ${repoPath} && git add .`;
   await $`cd ${repoPath} && git commit -m ${commitMessage}`;
   await $`cd ${repoPath} && git push`;