@docupace/pipeline 1.0.77 → 1.0.79

package/src/merge/pr.js

@@ -1,231 +1,231 @@
-/**
- * Create a Bitbucket pull request
- * @param {string} sourceBranch - Source branch name
- * @param {string} targetBranch - Target branch name
- * @param {string} title - PR title
- * @param {string} description - PR description
- * @returns {Promise<Object>} - PR creation result
- */
-import { execSync } from 'child_process';
-
-/**
- * Check for existing pull requests with specific description pattern
- * @param {string} descriptionPattern - Pattern to match in PR descriptions
- * @returns {Promise<Object[]>} - Array of matching PRs
- */
-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);
-  }
-
-  try {
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
-      );
-      return [];
-    }
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const allMatchingPRs = [];
-
-    // Check each repository for matching PRs
-    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`,
-          {
-            method: 'GET',
-            headers: {
-              Authorization: `Basic ${auth}`,
-              'Content-Type': 'application/json',
-            },
-          },
-        );
-
-        if (!response.ok) {
-          const error = await response.text();
-          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),
-        );
-
-        // Add repository info to each PR for context
-        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}`,
-        );
-      }
-    }
-
-    return allMatchingPRs;
-  } catch (error) {
-    console.error(`Failed to get existing PRs: ${error.message}`);
-    return [];
-  }
-}
-
-/**
- * Legacy function for backward compatibility - checks PRs in current repo only
- */
-export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
-  try {
-    // Get Bitbucket workspace and repo from git remote
-    const remoteUrl = execSync('git config --get remote.origin.url', {
-      encoding: 'utf-8',
-    }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-
-    if (!match) {
-      throw new Error(
-        'Could not parse Bitbucket workspace and repository from remote URL',
-      );
-    }
-
-    const [, workspace, repoSlug] = match;
-
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
-      );
-      return [];
-    }
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const response = await fetch(
-      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
-      {
-        method: 'GET',
-        headers: {
-          Authorization: `Basic ${auth}`,
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
-    }
-
-    const data = await response.json();
-    const matchingPRs = data.values.filter(
-      (pr) => pr.description && pr.description.startsWith(descriptionPattern),
-    );
-
-    return matchingPRs;
-  } catch (error) {
-    console.error(`Failed to get existing PRs: ${error.message}`);
-    return [];
-  }
-}
-
-export async function createBitbucketPR(
-  sourceBranch,
-  targetBranch,
-  title,
-  description,
-) {
-  try {
-    // Get Bitbucket workspace and repo from git remote
-    const remoteUrl = execSync('git config --get remote.origin.url', {
-      encoding: 'utf-8',
-    }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-
-    if (!match) {
-      throw new Error(
-        'Could not parse Bitbucket workspace and repository from remote URL',
-      );
-    }
-
-    const [, workspace, repoSlug] = match;
-
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found in environment variables.`,
-      );
-      console.log(
-        'Please set BITBUCKET_USERNAME and BITBUCKET_APP_PASSWORD to auto-create PR.',
-      );
-      console.log(
-        `Manual PR creation URL: https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
-      );
-      return {
-        success: false,
-        manual: true,
-        url: `https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
-      };
-    }
-
-    // Create PR via Bitbucket API
-    const prData = {
-      title,
-      description,
-      source: { branch: { name: sourceBranch } },
-      destination: { branch: { name: targetBranch } },
-    };
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const response = await fetch(
-      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests`,
-      {
-        method: 'POST',
-        headers: {
-          Authorization: `Basic ${auth}`,
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(prData),
-      },
-    );
-
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
-    }
-
-    const pr = await response.json();
-    return { success: true, pr, url: pr.links.html.href };
-  } catch (error) {
-    console.error(`Failed to create Bitbucket PR: ${error.message}`);
-    return { success: false, error: error.message };
-  }
-}
+/**
+ * Create a Bitbucket pull request
+ * @param {string} sourceBranch - Source branch name
+ * @param {string} targetBranch - Target branch name
+ * @param {string} title - PR title
+ * @param {string} description - PR description
+ * @returns {Promise<Object>} - PR creation result
+ */
+import { execSync } from 'child_process';
+
+/**
+ * Check for existing pull requests with specific description pattern
+ * @param {string} descriptionPattern - Pattern to match in PR descriptions
+ * @returns {Promise<Object[]>} - Array of matching PRs
+ */
+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);
+  }
+
+  try {
+    // Check for Bitbucket credentials
+    const username = process.env.BITBUCKET_USERNAME;
+    const password = process.env.BITBUCKET_APP_PASSWORD;
+
+    if (!username || !password) {
+      console.log(
+        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
+      );
+      return [];
+    }
+
+    const auth = Buffer.from(`${username}:${password}`).toString('base64');
+    const allMatchingPRs = [];
+
+    // Check each repository for matching PRs
+    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`,
+          {
+            method: 'GET',
+            headers: {
+              Authorization: `Basic ${auth}`,
+              'Content-Type': 'application/json',
+            },
+          },
+        );
+
+        if (!response.ok) {
+          const error = await response.text();
+          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),
+        );
+
+        // Add repository info to each PR for context
+        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}`,
+        );
+      }
+    }
+
+    return allMatchingPRs;
+  } catch (error) {
+    console.error(`Failed to get existing PRs: ${error.message}`);
+    return [];
+  }
+}
+
+/**
+ * Legacy function for backward compatibility - checks PRs in current repo only
+ */
+export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
+  try {
+    // Get Bitbucket workspace and repo from git remote
+    const remoteUrl = execSync('git config --get remote.origin.url', {
+      encoding: 'utf-8',
+    }).trim();
+    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+
+    if (!match) {
+      throw new Error(
+        'Could not parse Bitbucket workspace and repository from remote URL',
+      );
+    }
+
+    const [, workspace, repoSlug] = match;
+
+    // Check for Bitbucket credentials
+    const username = process.env.BITBUCKET_USERNAME;
+    const password = process.env.BITBUCKET_APP_PASSWORD;
+
+    if (!username || !password) {
+      console.log(
+        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
+      );
+      return [];
+    }
+
+    const auth = Buffer.from(`${username}:${password}`).toString('base64');
+    const response = await fetch(
+      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
+      {
+        method: 'GET',
+        headers: {
+          Authorization: `Basic ${auth}`,
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
+    }
+
+    const data = await response.json();
+    const matchingPRs = data.values.filter(
+      (pr) => pr.description && pr.description.startsWith(descriptionPattern),
+    );
+
+    return matchingPRs;
+  } catch (error) {
+    console.error(`Failed to get existing PRs: ${error.message}`);
+    return [];
+  }
+}
+
+export async function createBitbucketPR(
+  sourceBranch,
+  targetBranch,
+  title,
+  description,
+) {
+  try {
+    // Get Bitbucket workspace and repo from git remote
+    const remoteUrl = execSync('git config --get remote.origin.url', {
+      encoding: 'utf-8',
+    }).trim();
+    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+
+    if (!match) {
+      throw new Error(
+        'Could not parse Bitbucket workspace and repository from remote URL',
+      );
+    }
+
+    const [, workspace, repoSlug] = match;
+
+    // Check for Bitbucket credentials
+    const username = process.env.BITBUCKET_USERNAME;
+    const password = process.env.BITBUCKET_APP_PASSWORD;
+
+    if (!username || !password) {
+      console.log(
+        `\n⚠️  Bitbucket credentials not found in environment variables.`,
+      );
+      console.log(
+        'Please set BITBUCKET_USERNAME and BITBUCKET_APP_PASSWORD to auto-create PR.',
+      );
+      console.log(
+        `Manual PR creation URL: https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
+      );
+      return {
+        success: false,
+        manual: true,
+        url: `https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
+      };
+    }
+
+    // Create PR via Bitbucket API
+    const prData = {
+      title,
+      description,
+      source: { branch: { name: sourceBranch } },
+      destination: { branch: { name: targetBranch } },
+    };
+
+    const auth = Buffer.from(`${username}:${password}`).toString('base64');
+    const response = await fetch(
+      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests`,
+      {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${auth}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(prData),
+      },
+    );
+
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
+    }
+
+    const pr = await response.json();
+    return { success: true, pr, url: pr.links.html.href };
+  } catch (error) {
+    console.error(`Failed to create Bitbucket PR: ${error.message}`);
+    return { success: false, error: error.message };
+  }
+}

package/src/micro/deploy-microservice.js

@@ -0,0 +1,153 @@
+import { $ } from '../next/logger.js';
+import fs from 'fs';
+import path from 'path';
+import axios from 'axios';
+
+export async function deployMicroservice(
+  appName,
+  helmPath,
+  environment = 'dev',
+  tag = null,
+) {
+  if (!appName || !helmPath) {
+    throw new Error(
+      'Missing required parameters. Usage: deployMicroservice(appName, helmPath, [environment], [tag])',
+    );
+  }
+
+  let deployTag = tag;
+  if (!deployTag) {
+    deployTag =
+      process.env.VERSION_TAG ||
+      process.env.BITBUCKET_TAG ||
+      (process.env.BITBUCKET_BUILD_NUMBER
+        ? `build-${process.env.BITBUCKET_BUILD_NUMBER}`
+        : null);
+  }
+
+  if (!deployTag) {
+    throw new Error(
+      'No tag specified and no default tag available from environment variables',
+    );
+  }
+
+  const repoName = `gitops-${environment}`;
+  const filePath = `dp/${helmPath}/${appName}.values.yaml`;
+
+  const gitopsBranch =
+    environment === 'dev' || environment === 'uat'
+      ? process.env.GITOPS_BRANCH || 'master'
+      : process.env.GITOPS_BRANCH || 'main';
+
+  let repoUrl;
+  if (environment === 'dev' && process.env.GITOPS_REP_TOKEN) {
+    repoUrl = `https://x-token-auth:${process.env.GITOPS_REP_TOKEN}@bitbucket.org/dp-cloud/${repoName}.git`;
+  } else if (
+    process.env.BITBUCKET_USERNAME &&
+    process.env.BITBUCKET_APP_PASSWORD
+  ) {
+    repoUrl = `https://${process.env.BITBUCKET_USERNAME}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
+  } else {
+    throw new Error(
+      'No authentication credentials found for GitOps repository',
+    );
+  }
+
+  console.log('=========================================');
+  console.log('Microservice Deployment Configuration');
+  console.log('=========================================');
+  console.log(`Application: ${appName}`);
+  console.log(`Environment: ${environment}`);
+  console.log(`Tag: ${deployTag}`);
+  console.log(`GitOps Repo: ${repoName}`);
+  console.log(`Values File: ${filePath}`);
+  console.log(`Branch: ${gitopsBranch}`);
+  console.log('=========================================');
+
+  try {
+    console.log('Cloning GitOps repository...');
+    await $`git clone --depth 1 ${repoUrl} ${repoName}`;
+
+    console.log('Checking if directory exists...');
+    await $`ls -la ${repoName}`;
+
+    console.log(`Changing to directory: ${repoName}`);
+    const originalDir = process.cwd();
+    process.chdir(repoName);
+
+    console.log('Verifying directory change...');
+    const newDir = process.cwd();
+    console.log(`Original: ${originalDir}`);
+    console.log(`New: ${newDir}`);
+
+    await $`cd ${repoName} && git config user.email "pipeline@bitbucket.org"`;
+
+    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}`;
+
+    const fullFilePath = path.resolve(filePath);
+    console.log(`Looking for file at: ${fullFilePath}`);
+    if (!fs.existsSync(fullFilePath)) {
+      throw new Error(
+        `Values file ${filePath} does not exist in ${repoName} on branch ${gitopsBranch}`,
+      );
+    }
+
+    console.log(`Updating image tag to ${deployTag}...`);
+
+    let fileContent = fs.readFileSync(fullFilePath, 'utf8');
+
+    const tagRegex = /^ {2}tag: .*/gm;
+    const newContent = fileContent.replace(tagRegex, `  tag: ${deployTag}`);
+
+    if (fileContent === newContent) {
+      console.log(`No changes detected - tag is already ${deployTag}`);
+      return;
+    }
+
+    fs.writeFileSync(fullFilePath, newContent, 'utf8');
+
+    console.log('Changes to be committed:');
+    await $`cd ${repoName} && git diff ${filePath}`;
+
+    await $`cd ${repoName} && git add ${filePath}`;
+    await $`cd ${repoName} && git commit -m "Update ${appName} image tag to ${deployTag} in ${environment} environment"`;
+
+    console.log('Pushing changes to GitOps repository...');
+    await $`cd ${repoName} && git push origin ${gitopsBranch}`;
+
+    console.log('=========================================');
+    console.log(
+      `✅ Successfully deployed ${appName}:${deployTag} to ${environment}`,
+    );
+    console.log('=========================================');
+  } catch (error) {
+    console.error('Error during microservice deployment:', error.message);
+    throw error;
+  } finally {
+    try {
+      process.chdir('..');
+      await $`rm -rf ${repoName}`;
+    } catch (cleanupError) {
+      console.warn(
+        'Warning: Failed to clean up temporary directory:',
+        cleanupError.message,
+      );
+    }
+  }
+}
+
+export default deployMicroservice;

package/src/micro/{ms-publish.js → publish-ms.js}

@@ -11,19 +11,21 @@ import { $ } from '../next/logger.js';
  * @param {string} options.password - JFrog password
  * @param {string} options.buildNumber - Build number
  */
-export async function publishMicroservice(serviceName, options = {}) {
+export async function publishMicroservice(gitSha, options = {}) {
   // Use environment variables as defaults, but allow overrides
-
-  const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
-
   const config = {
-    imageName: serviceName,
+    imageName:
+      options.imageName || process.env.IMAGE_NAME || process.env.APP_NAME,
     registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
     repoName: options.repoName || process.env.JF_REGISTRY_REPO_NAME,
     username: options.username || process.env.JF_REGISTRY_USER_DEV,
     password: options.password || process.env.JF_REGISTRY_PASSWORD_DEV,
     buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
-    tag: options.tag || process.env.VERSION_TAG,
+    tag:
+      options.tag ||
+      process.env.TAG ||
+      process.env.BITBUCKET_TAG ||
+      process.env.VERSION_TAG,
   };
 
   // Validate required fields