@docupace/pipeline 1.0.61 → 1.0.62

package/bitbucket-pipelines.yml

@@ -0,0 +1,28 @@
+clone:
+  depth: 2
+
+pipelines:
+  pull-requests:
+    '**':
+      - step:
+          runs-on:
+            - linux.shell
+            - onprem
+          name: On Pull Request
+          script:
+            - pnpm config set //registry.npmjs.org/:_authToken $DOCUPACE_NPM_TOKEN
+            - pnpm install --frozen-lockfile
+            - >
+              npx eslint . --rule "no-unused-vars: warn" --rule "no-useless-escape: warn" --color
+  custom:
+    scheduled-tests:
+      - step:
+          runs-on:
+            - linux.shell
+            - onprem
+          name: Manual
+          script:
+            - pnpm config set //registry.npmjs.org/:_authToken $DOCUPACE_NPM_TOKEN
+            - pnpm install --frozen-lockfile
+            - >
+              npx eslint . --rule "no-unused-vars: warn" --rule "no-useless-escape: warn" --color

package/eslint.config.js

@@ -2,6 +2,7 @@ import globals from 'globals';
 import pluginJs from '@eslint/js';
 import prettierConfig from 'eslint-config-prettier';
 import prettierPlugin from 'eslint-plugin-prettier';
+import importPlugin from 'eslint-plugin-import';
 
 /** @type {import('eslint').Linter.Config[]} */
 export default [
@@ -10,17 +11,28 @@ export default [
       globals: {
         ...globals.browser,
         ...globals.node, // Add Node.js globals
-      },g
+      },
     },
   },
   pluginJs.configs.recommended,
   {
     plugins: {
       prettier: prettierPlugin,
+      import: importPlugin,
+    },
+    settings: {
+      'import/resolver': {
+        node: { extensions: ['.js', '.mjs', '.cjs'] },
+        typescript: {},
+      },
     },
     rules: {
       ...prettierConfig.rules,
       'prettier/prettier': 'error',
+      // Import-related rules
+      'import/no-unresolved': 'error',
+      'import/named': 'error',
+      'import/no-extraneous-dependencies': 'error',
     },
   },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.61",
+  "version": "1.0.62",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -16,29 +16,32 @@
   "license": "ISC",
   "dependencies": {
     "@changesets/cli": "^2.27.10",
-    "@docupace/core-client": "^0.1.59",
+    "@docupace/core-client": "^0.1.94",
     "@docupace/pipeline": "^1.0.33-alpha-2",
     "auth0-deploy-cli": "^8.8.0",
     "axios": "^1.7.9",
     "commander": "^12.1.0",
     "dotenv": "^16.4.7",
+    "eslint-plugin-import": "^2.32.0",
     "fs-extra": "^11.3.0",
     "inquirer": "^12.6.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "openai": "^4.76.3",
     "semver": "^7.7.2",
-    "zod": "^3.24.1",
-    "zx": "^8.3.0"
+    "zod": "^3.24.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
     "esbuild": "^0.24.0",
-    "eslint": "^9.17.0",
+    "eslint": "^9.34.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-prettier": "^5.2.1",
     "globals": "^15.14.0",
-    "prettier": "^3.4.2"
+    "prettier": "^3.4.2",
+    "zx": "^8.8.1"
   },
   "scripts": {
     "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",

package/src/auth0/configure.js

@@ -10,10 +10,7 @@ import {
   readDeployConfig,
 } from '../next/deploy.js';
 
-import {
-  getVaultSecrets,
-  updateVaultSecrets
-} from './vault.js';
+import { getVaultSecrets, updateVaultSecrets } from './vault.js';
 import {
   coreSiteEnvMap,
   environmentConfig,
@@ -22,7 +19,7 @@ import {
 
 async function ensureDirectoryExists(dirPath) {
   try {
-    await fs.promises.mkdir(dirPath, {recursive: true});
+    await fs.promises.mkdir(dirPath, { recursive: true });
     console.log(`Directory created or already exists: ${dirPath}`);
   } catch (err) {
     console.error(`Failed to create directory: ${err.message}`);
@@ -85,7 +82,7 @@ async function configureUI(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: {authorization: `Bearer ${auth0Token}`},
+        headers: { authorization: `Bearer ${auth0Token}` },
       },
     );
 
@@ -121,13 +118,14 @@ async function configureUI(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
+    const awsS3Vars =
+      useS3 === true || useS3 === 'true'
+        ? `
     AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
     AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
     AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
     AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
-      : '';
+        : '';
 
     // Prepare ui.app.yaml
     const uiAppYaml = `
@@ -151,13 +149,17 @@ uiMain:
 image:
   repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/enterprise-ui-app
   tag: ${imageTag}
-${useS3 === true || useS3 === 'true' ? `
+${
+  useS3 === true || useS3 === 'true'
+    ? `
 serviceAccount:
   create: true
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "-10"
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket` : ''}
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`
+    : ''
+}
 imagePullSecrets:
   - name: jf-artifactory
 ingress:
@@ -222,7 +224,9 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log(`File ${repoPath}/dp/${site}/ui.app.yaml written successfully.`);
+          console.log(
+            `File ${repoPath}/dp/${site}/ui.app.yaml written successfully.`,
+          );
         }
       },
     );
@@ -234,7 +238,9 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log(`File ${repoPath}/dp/${site}/ui.values.yaml written successfully.`);
+          console.log(
+            `File ${repoPath}/dp/${site}/ui.values.yaml written successfully.`,
+          );
         }
       },
     );
@@ -274,7 +280,7 @@ async function configureCCUI(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: {authorization: `Bearer ${auth0Token}`},
+        headers: { authorization: `Bearer ${auth0Token}` },
       },
     );
 
@@ -310,15 +316,20 @@ async function configureCCUI(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
+    const awsS3Vars =
+      useS3 === true || useS3 === 'true'
+        ? `
     AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
     AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
     AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
     AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
-      : '';
+        : '';
+
+    const uiCCAppYaml = `
+repo: docupace-ui-main
+revision: ${revision}
+`.trim();
 
-    // Prepare cc.app.yaml
     const uiCCValuesYaml = `
 uiMain:
   auth0BaseUrl: https://${ccUrl}
@@ -354,13 +365,17 @@ ingress:
     - hosts:
         - ${ccUrl}
       secretName: dp-cc-ui-cert
-${useS3 === true || useS3 === 'true' ? `
+${
+  useS3 === true || useS3 === 'true'
+    ? `
 serviceAccount:
   create: true
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "-10"
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket` : ''}
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`
+    : ''
+}
 `.trim();
 
     console.log('Writing configuration files...');
@@ -371,9 +386,14 @@ serviceAccount:
       uiCCAppYaml,
       (err) => {
         if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/cc.app.yaml file:`, err);
+          console.error(
+            `Failed to write ${repoPath}/dp/${site}/cc.app.yaml file:`,
+            err,
+          );
         } else {
-          console.log(`File ${repoPath}/dp/${site}/cc.app.yaml written successfully.`);
+          console.log(
+            `File ${repoPath}/dp/${site}/cc.app.yaml written successfully.`,
+          );
         }
       },
     );
@@ -383,9 +403,14 @@ serviceAccount:
       uiCCValuesYaml,
       (err) => {
         if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/cc.values.yaml file:`, err);
+          console.error(
+            `Failed to write ${repoPath}/dp/${site}/cc.values.yaml file:`,
+            err,
+          );
         } else {
-          console.log(`File ${repoPath}/dp/${site}/cc.values.yaml written successfully.`);
+          console.log(
+            `File ${repoPath}/dp/${site}/cc.values.yaml written successfully.`,
+          );
         }
       },
     );
@@ -406,7 +431,10 @@ export async function cleanAndWritePropertiesFile(configPath, content) {
     await fs.writeFile(configPath, cleanedContent, 'utf8');
     console.log(`Cleaned and written file to: ${configPath}`);
   } catch (error) {
-    console.error(`Error writing properties file to ${configPath}:`, error.message);
+    console.error(
+      `Error writing properties file to ${configPath}:`,
+      error.message,
+    );
     process.exit(1);
   }
 }
@@ -427,7 +455,12 @@ export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
 
     let siteAWSSecrets = null;
 
-    if (useS3Ui === true || useS3Ui === 'true' || useS3Gq === true || useS3Gq === 'true') {
+    if (
+      useS3Ui === true ||
+      useS3Ui === 'true' ||
+      useS3Gq === true ||
+      useS3Gq === 'true'
+    ) {
       const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
       siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
@@ -435,11 +468,13 @@ export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
 
     const coreSiteConfig = `
         ${
-      siteAWSSecrets
-        ? `
+          siteAWSSecrets
+            ? `
 com.docupace.imports.files.FilesImportConfig.aws.accessKeyId=${siteAWSSecrets.AWS_ACCESS_KEY_ID}
 com.docupace.imports.files.FilesImportConfig.aws.accessKeySecret=${siteAWSSecrets.AWS_SECRET_ACCESS_KEY}
-com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}`.trim() : ''}
+com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}`.trim()
+            : ''
+        }
 `;
 
     await fs.ensureDir(path.join(coreSiteConfigRepoPath, site.toUpperCase()));
@@ -482,7 +517,7 @@ async function configureGraphQLServer(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: {authorization: `Bearer ${auth0Token}`},
+        headers: { authorization: `Bearer ${auth0Token}` },
       },
     );
 
@@ -525,13 +560,14 @@ async function configureGraphQLServer(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
+    const awsS3Vars =
+      useS3 === true || useS3 === 'true'
+        ? `
     AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
     AWS_S3_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
     AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
     AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`.trim()
-      : '';
+        : '';
     // Prepare graphql-server.app.yaml
     const graphQLServerAppYaml = `
 repo: docupace-graphql-server
@@ -556,15 +592,16 @@ graphqlServer:
     AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
     AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
 ${
-      useS3 === true || useS3 === 'true'
-        ? `
+  useS3 === true || useS3 === 'true'
+    ? `
 serviceAccount:
   create: true
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "-10"
     eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`.trim()
-        : ''}
+    : ''
+}
 image:
   repository: registry.paperout.com/docupace-graphql-server-${env}-docker-local/docupace-graphql-server
   tag: ${imageTag}
@@ -609,9 +646,14 @@ ingress:
       graphQLServerValuesYaml,
       (err) => {
         if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/graphql-server.values.yaml file:`, err);
+          console.error(
+            `Failed to write ${repoPath}/dp/${site}/graphql-server.values.yaml file:`,
+            err,
+          );
         } else {
-          console.log(`File ${repoPath}/dp/${site}/graphql-server.values.yaml written successfully.`);
+          console.log(
+            `File ${repoPath}/dp/${site}/graphql-server.values.yaml written successfully.`,
+          );
         }
       },
     );
@@ -686,13 +728,13 @@ export async function configureFromSite(
   let uiImageTag, uiRevision;
   if (deployUI === true || deployUI === 'true') {
     // Read deploy configs
-    const {deployConfig: deployUIConfig} = await readDeployConfig(
+    const { deployConfig: deployUIConfig } = await readDeployConfig(
       'ui',
       fromEnv,
       fromSite,
       'values',
     );
-    const {deployConfig: deployUiRevisionConfig} = await readDeployConfig(
+    const { deployConfig: deployUiRevisionConfig } = await readDeployConfig(
       'ui',
       fromEnv,
       fromSite,
@@ -707,14 +749,14 @@ export async function configureFromSite(
 
   let ccImageTag, ccRevision;
   if (deployCCUI === true || deployCCUI === 'true') {
-    const {deployConfig: deployCCConfig} = await readDeployConfig(
+    const { deployConfig: deployCCConfig } = await readDeployConfig(
       'cc',
       fromEnv,
       fromSite,
       'values',
     );
 
-    const {deployConfig: deployCCRevisionConfig} = await readDeployConfig(
+    const { deployConfig: deployCCRevisionConfig } = await readDeployConfig(
       'cc',
       fromEnv,
       fromSite,
@@ -727,19 +769,15 @@ export async function configureFromSite(
     console.log(`Copying Latest CC Revision: ${ccRevision}`);
   }
 
-  const {deployConfig: deployGraphQLServerConfig} = await readDeployConfig(
+  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
     'graphql-server',
     fromEnv,
     fromSite,
     'values',
   );
 
-  const {deployConfig: deployGraphQLServerRevisionConfig} = await readDeployConfig(
-    'graphql-server',
-    fromEnv,
-    fromSite,
-    'app',
-  );
+  const { deployConfig: deployGraphQLServerRevisionConfig } =
+    await readDeployConfig('graphql-server', fromEnv, fromSite, 'app');
 
   const gqRevision = deployGraphQLServerRevisionConfig.revision;
 
@@ -767,11 +805,7 @@ export async function configureFromSite(
 
   const envConfig = environmentConfig[toEnv];
 
-  let CORE_URL,
-    SITE_HOST,
-    CORE_API_CONTEXT,
-    CONNECT_URL,
-    DOCUPACE_HOST;
+  let CORE_URL, SITE_HOST, CORE_API_CONTEXT, CONNECT_URL, DOCUPACE_HOST;
   const newUrl = envConfig.newUrl(toSite);
   const ccUrl = envConfig.ccUrl(toSite);
 

package/src/changeset/util.js

@@ -34,10 +34,10 @@ export async function getPackage(mainModulePath) {
  * @returns {JIRA-TicketID|null}
  */
 export function findJiraTicketId(str) {
-    if (!str) {
-        return null;
-    }
-    const regex = /([A-Z]{2,}-\d+)/;
-    const matches = str.match(regex);
-    return matches ? matches[0] : null;
+  if (!str) {
+    return null;
+  }
+  const regex = /([A-Z]{2,}-\d+)/;
+  const matches = str.match(regex);
+  return matches ? matches[0] : null;
 }

package/src/changeset/validate.js

@@ -17,31 +17,32 @@ function areArraysEqualIgnoringOrder(arr1, arr2) {
 }
 
 export async function validateChangesets() {
-    await setGitInfo();
-    const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
-    await $`git fetch origin ${destBranch}:${destBranch}`;
-    let releases;
-
-    try {
-      console.log('🔍 Validating changesets...');
-      releases = await versionStatus(destBranch);
-    }
-     catch(e) {
-       console.error(
-           '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
-       );
-       process.exit(-1);
-     }
-
-    if(!['master', 'main'].includes(destBranch)) {
-      if(releases.some(item => item.type !== 'patch')) {
-        console.error('❌ A changeset must be a patch for change to a release branch');
-        process.exit(-1);
-      }
-    }
+  await setGitInfo();
+  const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
+  await $`git fetch origin ${destBranch}:${destBranch}`;
+  let releases;
 
-    console.log('✅ Changeset validation passed.');
+  try {
+    console.log('🔍 Validating changesets...');
+    releases = await versionStatus(destBranch);
+  } catch (e) {
+    console.error(
+      '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
+      e,
+    );
+    process.exit(-1);
+  }
+
+  if (!['master', 'main'].includes(destBranch)) {
+    if (releases.some((item) => item.type !== 'patch')) {
+      console.error(
+        '❌ A changeset must be a patch for change to a release branch',
+      );
+      process.exit(-1);
+    }
+  }
 
+  console.log('✅ Changeset validation passed.');
 }
 
 export async function validateChangesetPath(directoryPath) {

package/src/micro/deploy-microservice.js

@@ -1,37 +1,55 @@
-import { $ } from '@docupace/pipeline/src/next/logger.js';
+import { $ } from '../next/logger.js';
 import fs from 'fs';
 import path from 'path';
 
-export async function deployMicroservice(appName, helmPath, environment = 'dev', tag = null) {
+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])');
+    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);
+    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');
+    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');
+
+  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) {
+  } 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');
+    throw new Error(
+      'No authentication credentials found for GitOps repository',
+    );
   }
 
   console.log('=========================================');
@@ -48,58 +66,61 @@ export async function deployMicroservice(appName, helmPath, environment = 'dev',
   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}`);
+      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 = /^  tag: .*/gm;
+
+    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(
+      `✅ Successfully deployed ${appName}:${deployTag} to ${environment}`,
+    );
     console.log('=========================================');
-    
   } catch (error) {
     console.error('Error during microservice deployment:', error.message);
     throw error;
@@ -108,7 +129,10 @@ export async function deployMicroservice(appName, helmPath, environment = 'dev',
       process.chdir('..');
       await $`rm -rf ${repoName}`;
     } catch (cleanupError) {
-      console.warn('Warning: Failed to clean up temporary directory:', cleanupError.message);
+      console.warn(
+        'Warning: Failed to clean up temporary directory:',
+        cleanupError.message,
+      );
     }
   }
 }

package/src/micro/publish-ms.js

@@ -1,4 +1,4 @@
-import { $ } from '@docupace/pipeline/src/next/logger.js';
+import { $ } from '../next/logger.js';
 
 /**
  * Publish Docker images for microservices with flexible naming
@@ -14,18 +14,25 @@ import { $ } from '@docupace/pipeline/src/next/logger.js';
 export async function publishMicroservice(gitSha, options = {}) {
   // Use environment variables as defaults, but allow overrides
   const config = {
-    imageName: options.imageName || process.env.IMAGE_NAME || process.env.APP_NAME,
+    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.TAG || process.env.BITBUCKET_TAG || process.env.VERSION_TAG
+    tag:
+      options.tag ||
+      process.env.TAG ||
+      process.env.BITBUCKET_TAG ||
+      process.env.VERSION_TAG,
   };
 
   // Validate required fields
   if (!config.imageName) {
-    throw new Error('Image name is required. Set IMAGE_NAME or APP_NAME environment variable.');
+    throw new Error(
+      'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
+    );
   }
 
   console.log('=== Docker Image Publishing Configuration ===');
@@ -38,7 +45,7 @@ export async function publishMicroservice(gitSha, options = {}) {
 
   const registryPath = `${config.registryUrl}/${config.repoName}`;
   const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
-  
+
   // Docker login
   await $`echo ${config.password} | docker login --username ${config.username} --password-stdin ${config.registryUrl}`;
 
@@ -74,25 +81,25 @@ export async function publishMicroservice(gitSha, options = {}) {
     if (config.tag) {
       // Handle various tag formats
       let version = config.tag;
-      
+
       // If tag contains @, extract version after it
       if (version.includes('@')) {
         version = 'v' + version.split('@')[1];
       }
-      
+
       // Ensure version starts with 'v' if it's a semver without it
       if (/^\d+\.\d+\.\d+/.test(version) && !version.startsWith('v')) {
         version = 'v' + version;
       }
-      
+
       const VERSION_IMAGE_NAME = `${config.imageName}:${version}`;
       const versionTag = `${registryPath}/${VERSION_IMAGE_NAME}`;
-      
+
       console.log(`Tagging and pushing version: ${versionTag}`);
       await $`docker tag ${SHA_IMAGE_NAME} ${versionTag}`;
       await $`docker push ${versionTag}`;
       tagsToPush.push(VERSION_IMAGE_NAME);
-      
+
       // Also push 'latest' tag when we have a version
       const LATEST_IMAGE_NAME = `${config.imageName}:latest`;
       const latestTag = `${registryPath}/${LATEST_IMAGE_NAME}`;
@@ -108,22 +115,22 @@ export async function publishMicroservice(gitSha, options = {}) {
         .trim()
         .split('\n')
         .filter(Boolean);
-      
+
       if (gitTags.length > 0) {
         console.log(`Found git tags at HEAD: ${gitTags.join(', ')}`);
-        
+
         for (const gitTag of gitTags) {
           // Skip if we already handled this tag above
           if (gitTag === config.tag) continue;
-          
+
           let version = gitTag;
           if (version.includes('@')) {
             version = 'v' + version.split('@')[1];
           }
-          
+
           const TAG_IMAGE_NAME = `${config.imageName}:${version}`;
           const gitTagPath = `${registryPath}/${TAG_IMAGE_NAME}`;
-          
+
           console.log(`Tagging and pushing git tag: ${gitTagPath}`);
           await $`docker tag ${SHA_IMAGE_NAME} ${gitTagPath}`;
           await $`docker push ${gitTagPath}`;
@@ -131,17 +138,19 @@ export async function publishMicroservice(gitSha, options = {}) {
         }
       }
     } catch (e) {
-      console.log('No git tags found at HEAD or error checking tags');
+      console.log('No git tags found at HEAD or error checking tags', e);
     }
 
     console.log('\n✅ Docker image published successfully!');
     console.log('=== Summary of pushed tags ===');
-    tagsToPush.forEach(tag => console.log(`  ✓ ${tag}`));
+    tagsToPush.forEach((tag) => console.log(`  ✓ ${tag}`));
     console.log('==============================\n');
-    
+
     // Verify the version tag if we expect one
     if (config.tag) {
-      const version = config.tag.includes('@') ? 'v' + config.tag.split('@')[1] : config.tag;
+      const version = config.tag.includes('@')
+        ? 'v' + config.tag.split('@')[1]
+        : config.tag;
       const expectedTag = `${registryPath}/${config.imageName}:${version}`;
       console.log(`Verifying version tag exists: ${expectedTag}`);
       try {
@@ -149,10 +158,9 @@ export async function publishMicroservice(gitSha, options = {}) {
         console.log('✅ Version tag verified in registry!');
       } catch (e) {
         console.error('❌ WARNING: Could not verify version tag in registry!');
-        console.error('ArgoCD may fail to pull this image.');
+        console.error('ArgoCD may fail to pull this image.', e);
       }
     }
-    
   } catch (error) {
     console.error('Error during image publishing:', error);
     throw error;
@@ -177,4 +185,4 @@ async function checkLocalImage(imageName) {
 // Backward compatibility wrapper
 export async function publishWithDefaults(gitSha) {
   return publishMicroservice(gitSha);
-}
+}

package/src/next/apache.js

@@ -8,7 +8,7 @@ function log(msg) {
 export async function addApacheSite() {
   if (
     !process.env.ENVIRONMENT ||
-    !['dev', 'qa', 'uat', 'stage','www3'].includes(process.env.ENVIRONMENT)
+    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
   ) {
     log('Error: wront ENVIRONMENT');
     process.exit(1);
@@ -69,7 +69,7 @@ export async function addApacheSite() {
     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`,

package/src/next/cli.js

@@ -4,7 +4,7 @@ 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';  // Add this import
+import { publishMicroservice } from '../micro/publish-ms.js';
 import {
   deployAppWithTag,
   deployFromSite,
@@ -132,7 +132,6 @@ program
     await deployTemplate(env, site, deployTag, 'siteConfigRemoteBranch');
   });
 
-
 program
   .command('deploy-app <application>')
   .description('Deploy an application for a specific site')
@@ -232,4 +231,4 @@ program
     }
   });
 
-program.parse(process.argv);
+program.parse(process.argv);

package/src/next/connect.js

@@ -20,7 +20,6 @@ const connectUIEnvMap = {
   prod: 'prod-www3',
 };
 
-
 const siteSettingsEnvMap = {
   dev: 'dev',
   preprod: 'preprod',
@@ -158,7 +157,7 @@ export async function connectClone() {
       try {
         // Execute the shell command
         const result =
-        await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+          await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
         await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
         await $`cd ${cloneTo} && git remote -v`;
         await $`cd ${cloneTo} && git branch`;