@docupace/pipeline 1.0.77-alpha.2 → 1.0.77

package/src/micro/ms-deploy.js

@@ -0,0 +1,271 @@
+import { $ } from '../next/logger.js';
+import { publishMicroservice } from './ms-publish.js';
+import { copy2 } from '../next/copy.js';
+import fs from 'fs';
+import path from 'path';
+/**
+ * Deploy microservice end-to-end: build, publish, and deploy
+ * @param {string} serviceName - Name of microservice (e.g., 'swp', 'fidelity', 'esp')
+ * @param {string} environment - Target environment (dev, qa, uat, stage, prod)
+ * @param {string} tag - Version tag (optional, defaults to BITBUCKET_TAG)
+ */
+export async function deployMicroserviceEndToEnd(
+  serviceName,
+  environment = '',
+  tag = null,
+) {
+  const registryUrl = process.env.JF_REGISTRY_URL || '';
+  const repoName = process.env.JF_REGISTRY_REPO_NAME || '';
+  const deployTag = tag || process.env.BITBUCKET_TAG || process.env.VERSION_TAG;
+  if (!deployTag) {
+    throw new Error(
+      'No tag provided. Set tag parameter or BITBUCKET_TAG/VERSION_TAG environment variable.',
+    );
+  }
+  console.log(`Starting ${serviceName} microservice deployment...`);
+  console.log(`Environment: ${environment}`);
+  console.log(`Tag: ${deployTag}`);
+  console.log('==========================================');
+  try {
+    // Step 1: Get Git SHA for image building
+    const gitSha = (
+      await $`git log ${deployTag} --pretty=format:'%h' -n 1`
+    ).stdout.trim();
+    console.log(`Git SHA: ${gitSha}`);
+    // Step 2: Publish Docker image with version tags
+    console.log('\nPublishing Docker image...');
+    await publishMicroservice(serviceName, {
+      tag: deployTag,
+    });
+    console.log('Docker image published successfully!');
+    // Step 3: Deploy to GitOps repository
+    console.log(`\nDeploying to ${environment} environment...`);
+    await deployMicroservice(serviceName, serviceName, environment, deployTag);
+    console.log(`Deployment to ${environment} completed successfully!`);
+    console.log(
+      `\n${serviceName} microservice deployment completed successfully!`,
+    );
+    console.log(
+      `Image: ${registryUrl}/${repoName}-${environment}-docker-local/${serviceName}:${deployTag}`,
+    );
+  } catch (error) {
+    console.error('\nDeployment failed:', error.message);
+    throw error;
+  }
+}
+/**
+ * Promote microservice image between environments
+ * @param {string} serviceName - Name of microservice
+ * @param {string} fromEnv - Source environment
+ * @param {string} toEnv - Target environment
+ * @param {string} tag - Image tag to promote
+ */
+export async function promoteMicroserviceImage(
+  serviceName,
+  fromEnv,
+  toEnv,
+  tag,
+) {
+  console.log(`Starting ${serviceName} image promotion...`);
+  console.log(`From: ${fromEnv} → To: ${toEnv}`);
+  console.log(`Tag: ${tag}`);
+  console.log('==========================================');
+  try {
+    // Step 1: Copy Docker image between registries
+    console.log('\nCopying Docker image...');
+    const repositoryName = `docupace-b2b-${serviceName}`;
+    await copy2(repositoryName, fromEnv, toEnv, tag, serviceName);
+    console.log('Docker image copied successfully!');
+    // Step 2: Deploy to target environment
+    console.log(`\nDeploying to ${toEnv} environment...`);
+    await deployMicroservice(serviceName, serviceName, toEnv, tag);
+    console.log(`Deployment to ${toEnv} completed successfully!`);
+    console.log(`\n${serviceName} image promotion completed successfully!`);
+  } catch (error) {
+    console.error('\nImage promotion failed:', error.message);
+    throw error;
+  }
+}
+/**
+ * Test deployment only (no image building)
+ * @param {string} serviceName - Name of microservice
+ * @param {string} environment - Target environment
+ * @param {string} tag - Version tag
+ */
+export async function testMicroserviceDeploy(
+  serviceName,
+  environment = 'dev',
+  tag = 'v0.1.0',
+) {
+  console.log(`Starting ${serviceName} test deployment...`);
+  console.log(`Environment: ${environment}`);
+  console.log(`Tag: ${tag}`);
+  console.log('==========================================');
+  try {
+    console.log(`\nTesting deployment to ${environment}...`);
+    await deployMicroservice(serviceName, serviceName, environment, tag);
+    console.log(`Test deployment to ${environment} completed successfully!`);
+  } catch (error) {
+    console.error('\nTest deployment failed:', error.message);
+    throw error;
+  }
+}
+/**
+ * Test Docker build and publish only (no deployment)
+ * @param {string} serviceName - Name of microservice
+ */
+export async function testMicroservicePublish(serviceName) {
+  console.log(`Starting ${serviceName} test publish...`);
+  console.log('==========================================');
+  try {
+    const gitSha = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
+    console.log(`Git SHA: ${gitSha}`);
+    console.log('\nTesting Docker build and publish...');
+    await publishMicroservice(gitSha, {
+      imageName: serviceName,
+    });
+    console.log('Test publish completed successfully!');
+  } catch (error) {
+    console.error('\nTest publish failed:', error.message);
+    throw error;
+  }
+}
+
+/////
+
+export async function deployMicroservice(
+  appName,
+  helmPath,
+  environment = '',
+  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"`;
+    await $`cd ${repoName} && git config user.name "Bitbucket Pipeline"`;
+
+    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/{publish-ms.js → ms-publish.js}

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

package/src/next/alias.js

@@ -1,53 +1,53 @@
-import { BasicAuth, DomainApi } from '@docupace/core-client';
-
-const userFilter = (userId) => {
-  return {
-    orSections: [
-      {
-        andSections: [
-          {
-            attrId: 9501,
-            '@type': 'string',
-            not: false,
-            orSections: [
-              { searchType: 'EXACT_MATCH', matchToValues: [userId] },
-            ],
-          },
-        ],
-      },
-    ],
-  };
-};
-
-/*
-Example:
-  await createAlias(
-    'https://www.dev.docupaceinc.com/financialdev',
-    'docupace',
-    'pw',
-    'Connect',
-    'qhnospjRjwUAeKFDhucHEabPsfihrGQQ@clients',
-  );
- */
-export async function createAlias(coreUrl, username, password, realm, alias) {
-  const coreInfo = {
-    url: coreUrl,
-  };
-
-  let auth = new BasicAuth(username, password);
-
-  const domainApi = new DomainApi(coreInfo, auth);
-
-  const userResults = await domainApi.listRecords(50, {
-    filter: JSON.stringify(userFilter(username)),
-  });
-
-  const record = {
-    domainId: 302,
-    '5001': userResults.records[0].id,
-    '9102': realm,
-    '9504': alias,
-  };
-
-  await domainApi.create(record);
-}
+import { BasicAuth, DomainApi } from '@docupace/core-client';
+
+const userFilter = (userId) => {
+  return {
+    orSections: [
+      {
+        andSections: [
+          {
+            attrId: 9501,
+            '@type': 'string',
+            not: false,
+            orSections: [
+              { searchType: 'EXACT_MATCH', matchToValues: [userId] },
+            ],
+          },
+        ],
+      },
+    ],
+  };
+};
+
+/*
+Example:
+  await createAlias(
+    'https://www.dev.docupaceinc.com/financialdev',
+    'docupace',
+    'pw',
+    'Connect',
+    'qhnospjRjwUAeKFDhucHEabPsfihrGQQ@clients',
+  );
+ */
+export async function createAlias(coreUrl, username, password, realm, alias) {
+  const coreInfo = {
+    url: coreUrl,
+  };
+
+  let auth = new BasicAuth(username, password);
+
+  const domainApi = new DomainApi(coreInfo, auth);
+
+  const userResults = await domainApi.listRecords(50, {
+    filter: JSON.stringify(userFilter(username)),
+  });
+
+  const record = {
+    domainId: 302,
+    '5001': userResults.records[0].id,
+    '9102': realm,
+    '9504': alias,
+  };
+
+  await domainApi.create(record);
+}

package/src/next/apache.js

@@ -1,81 +1,81 @@
-import fs from 'fs-extra';
-import { $ } from 'zx';
-
-function log(msg) {
-  console.log(`[*] ${msg}`);
-}
-
-export async function addApacheSite() {
-  if (
-    !process.env.ENVIRONMENT ||
-    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
-  ) {
-    log('Error: wront ENVIRONMENT');
-    process.exit(1);
-  }
-  if (!process.env.SITE) {
-    log('Error: SITE cannot be empty.');
-    process.exit(1);
-  }
-
-  const apacheEnvHostMap = {
-    dev: {
-      host1: 'dev-apalb01a.corp.docupace.com',
-      host2: 'dev-apalb01b.corp.docupace.com',
-      repo: 'iis-preprod',
-    },
-    qa: {
-      host1: 'qa-apalb01a.corp.docupace.com',
-      host2: 'qa-apalb01b.corp.docupace.com',
-      repo: 'iis-preprod',
-    },
-    uat: {
-      host1: 'uat-apalb01a.edc.docupace.internal',
-      host2: 'uat-apalb01b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-    stage: {
-      host1: 'stg-apalb01a.edc.docupace.internal',
-      host2: 'stg-apalb01b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-    www3: {
-      host1: 'prd-apalb05a.edc.docupace.internal',
-      host2: 'prd-apalb05b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-  };
-
-  // Save private key from base64
-  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
-  if (!haproxyPrivateKey) {
-    log('Error: HAPROXY_PRIVATE_KEY not set.');
-    process.exit(1);
-  }
-
-  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
-  await fs.chmod('private.key', 0o600);
-
-  console.log('Running command');
-  const sshCmd = (server, script) =>
-    $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
-
-  // The script is run twice in the Bash version
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
-    `/root/tomcat_repo_sync.sh`,
-  );
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
-    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
-    `/root/tomcat_repo_sync.sh`,
-  );
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
-    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-}
+import fs from 'fs-extra';
+import { $ } from 'zx';
+
+function log(msg) {
+  console.log(`[*] ${msg}`);
+}
+
+export async function addApacheSite() {
+  if (
+    !process.env.ENVIRONMENT ||
+    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
+  ) {
+    log('Error: wront ENVIRONMENT');
+    process.exit(1);
+  }
+  if (!process.env.SITE) {
+    log('Error: SITE cannot be empty.');
+    process.exit(1);
+  }
+
+  const apacheEnvHostMap = {
+    dev: {
+      host1: 'dev-apalb01a.corp.docupace.com',
+      host2: 'dev-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    qa: {
+      host1: 'qa-apalb01a.corp.docupace.com',
+      host2: 'qa-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    uat: {
+      host1: 'uat-apalb01a.edc.docupace.internal',
+      host2: 'uat-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    stage: {
+      host1: 'stg-apalb01a.edc.docupace.internal',
+      host2: 'stg-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    www3: {
+      host1: 'prd-apalb05a.edc.docupace.internal',
+      host2: 'prd-apalb05b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+  };
+
+  // Save private key from base64
+  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
+  if (!haproxyPrivateKey) {
+    log('Error: HAPROXY_PRIVATE_KEY not set.');
+    process.exit(1);
+  }
+
+  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
+  await fs.chmod('private.key', 0o600);
+
+  console.log('Running command');
+  const sshCmd = (server, script) =>
+    $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
+
+  // The script is run twice in the Bash version
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/tomcat_repo_sync.sh`,
+  );
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+  );
+
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/tomcat_repo_sync.sh`,
+  );
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+  );
+}

package/src/next/cli.js

@@ -4,7 +4,6 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import { publishMicroservice } from '../micro/publish-ms.js';
 import {
   deployAppWithTag,
   deployFromSite,
@@ -12,7 +11,7 @@ import {
   getDefaultDeploySite,
   getDeployTag,
 } from './deploy.js';
-import { copy, copy2 } from './copy.js';
+import { copy2 } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
 import { addApacheSite } from './apache.js';
 import { haproxySync } from './haproxy.js';
@@ -83,14 +82,6 @@ program
     await publish(GIT_SHA);
   });
 
-// Add the new publish-microservice command
-program
-  .command('publish-microservice')
-  .description('Publish a microservice Docker image with version tags')
-  .action(async () => {
-    await publishMicroservice(GIT_SHA);
-  });
-
 program
   .command('deploy-from-site')
   .description('Deploy an application for a specific site')