@docupace/pipeline 1.0.2-3.test8 → 1.0.2-4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.23.test8",
+  "version": "1.0.24.1",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/vault.js

@@ -7,16 +7,16 @@ import axios from 'axios';
  */
 export async function getVaultSecrets(vaultPath) {
   if (!vaultPath) {
-    console.error("Error: VAULT_PATH is required.");
-    throw new Error("VAULT_PATH is required.");
+    console.error('Error: VAULT_PATH is required.');
+    throw new Error('VAULT_PATH is required.');
   }
 
   const vaultToken = process.env.VAULT_TOKEN;
   const vaultAddr = process.env.VAULT_ADDR;
 
   if (!vaultToken || !vaultAddr) {
-    console.error("Error: VAULT_TOKEN and VAULT_ADDR must be set.");
-    throw new Error("VAULT_TOKEN and VAULT_ADDR must be set.");
+    console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
+    throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
   }
 
   try {
@@ -38,8 +38,8 @@ export async function getVaultSecrets(vaultPath) {
       // console.log(`Secrets fetched successfully from Vault at ${JSON.stringify(data.data.data)})`);
       return data.data.data;
     } else {
-      console.error("Error: Invalid JSON received from Vault.");
-      throw new Error("Invalid JSON received from Vault.");
+      console.error('Error: Invalid JSON received from Vault.');
+      throw new Error('Invalid JSON received from Vault.');
     }
   } catch (error) {
     if (error.response) {
@@ -61,16 +61,16 @@ export async function getVaultSecrets(vaultPath) {
  */
 export async function updateVaultSecrets(vaultPath, secretData) {
   if (!vaultPath || !secretData) {
-    console.error("Usage: updateVaultSecret(vaultPath, secretData)");
-    throw new Error("Both vaultPath and secretData are required.");
+    console.error('Usage: updateVaultSecret(vaultPath, secretData)');
+    throw new Error('Both vaultPath and secretData are required.');
   }
 
   const vaultToken = process.env.VAULT_TOKEN;
   const vaultAddr = process.env.VAULT_ADDR;
 
   if (!vaultToken || !vaultAddr) {
-    console.error("Error: VAULT_TOKEN and VAULT_ADDR must be set.");
-    throw new Error("VAULT_TOKEN and VAULT_ADDR must be set.");
+    console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
+    throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
   }
 
   try {

package/src/next/cli.js

@@ -1,176 +1,185 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-import { pull } from './pull.js';
-import { sonar } from './sonar.js';
-import { publish } from './publish.js';
-import { deployFromSite } from './deploy.js';
-import { deployTemplate } from './deploy.js';
-import { copy } from './copy.js';
-import { vaultAddSiteData } from './vault.js';
-import { addApacheSite } from './apache.js';
-import { haproxySync } from './haproxy.js';
-import { connectClone } from './connect.js';
-import dotenv from 'dotenv';
-
-dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-
-const program = new Command();
-
-import { $ } from 'zx';
-import { deployConnect, deployCore } from './jenkins.js';
-import { runPipeline } from './pipline.js';
-
-const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
-
-program
-  .command('pull <imageName>')
-  .description('Pull a Docker image from the registry')
-  .action(async (imageName) => {
-    await pull(imageName);
-  });
-
-program
-  .command('sonar')
-  .description('Run Sonar analysis')
-  .action(async () => {
-    await sonar(GIT_SHA);
-  });
-
-program
-  .command('addApacheSite')
-  .description('Add site to apache')
-  .action(async () => {
-    await addApacheSite();
-  });
-
-program
-  .command('connectClone')
-  .description('Clone connect site')
-  .action(async () => {
-    await connectClone();
-  });
-
-program
-  .command('haproxySync')
-  .description('Sync haproxy config')
-  .action(async () => {
-    await haproxySync();
-  });
-
-program
-  .command('vaultAddSiteData')
-  .description('Add m2m auth0 data to vault')
-  .requiredOption('-s, --site-name <siteName>', 'Site name')
-  .requiredOption(
-    '-p, --site-config-remote-path <siteConfigRemotePath>',
-    'Site Config Remote Path',
-  )
-  .action(async (options) => {
-    const { siteName, siteConfigRemotePath } = options;
-    await vaultAddSiteData(siteName, siteConfigRemotePath);
-  });
-
-program
-  .command('publish')
-  .description('Publish a Docker image')
-  .action(async () => {
-    await publish(GIT_SHA);
-  });
-
-program
-  .command('deploy-from-site')
-  .description('Deploy an application for a specific site')
-  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
-  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
-  .requiredOption('-F, --from-site <fromSite>', 'Source site')
-  .requiredOption('-T, --to-site <toSite>', 'Target site')
-  .option('-c, --deploy-core <deployCore>', 'Deploy Core', 'false')
-  .action(async (options) => {
-    const { fromEnv, fromSite, toEnv, toSite, deployCore } = options;
-    await deployFromSite(fromEnv, fromSite, toEnv, toSite, deployCore);
-  });
-
-program
-  .command('deployTemplate <site>')
-  .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(site);
-  });
-
-program
-  .command('deploy-core <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await deployCore(env, site, options.liquibase, options.branch);
-  });
-
-program
-  .command('deploy-connect <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await deployConnect(env, site, options.liquibase, options.branch);
-  });
-
-program
-  .command('deploy-core-pipeline <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await runPipeline('site-deploy', 'deploy-core', 'main', {
-      ENV: env,
-      SITE: site,
-      LIQUIBASE: options.liquibase,
-      BRANCH: options.branch,
-    });
-  });
-
-program
-  .command('copy')
-  .description('Copy a Docker image between registries')
-  .requiredOption('-a, --application <application>', 'Application name')
-  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
-  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
-  .requiredOption('-g, --tag <tag>', 'Image tag')
-  .action(async (options) => {
-    const { application, fromEnv, toEnv, tag } = options;
-    await copy(application, fromEnv, toEnv, tag);
-  });
-
-program
-  .command('run-pipeline')
-  .description('Trigger a pipeline by name')
-  .requiredOption('-r, --repository <repository>', 'Repository name')
-  .requiredOption('-p, --pipeline-name <pipelineName>', 'Pipeline name')
-  .requiredOption('-b, --branch <branch>', 'Branch name')
-  .option(
-    '-v, --variables <key=value>',
-    'Pipeline variable as key=value pair',
-    (value, previous) => {
-      const [key, val] = value.split('=');
-      if (!key || val === undefined) {
-        throw new Error(`Invalid variable format: ${value}. Use key=value.`);
-      }
-      return { ...previous, [key]: val };
-    },
-    {},
-  )
-  .option('-w, --wait', 'Wait for the pipeline to complete', false) // Defaults to false
-  .action(async (cmdObj) => {
-    try {
-      const { repository, pipelineName, branch, variables, wait } = cmdObj;
-
-      // Call the triggerPipelineByName function
-      await runPipeline(repository, pipelineName, branch, variables, wait);
-    } catch (error) {
-      console.error('Error triggering pipeline:', error.message);
-      process.exit(1);
-    }
-  });
-
-program.parse(process.argv);
+#!/usr/bin/env node
+
+import { Command } from 'commander';
+import { pull } from './pull.js';
+import { sonar } from './sonar.js';
+import { publish } from './publish.js';
+import { deployFromSite } from './deploy.js';
+import { deployTemplate } from './deploy.js';
+import { copy } from './copy.js';
+import { vaultAddSiteData } from './vault.js';
+import { addApacheSite } from './apache.js';
+import { haproxySync } from './haproxy.js';
+import { connectClone } from './connect.js';
+import dotenv from 'dotenv';
+
+dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
+
+const program = new Command();
+
+import { $ } from 'zx';
+import { deployConnect, deployCore } from './jenkins.js';
+import { runPipeline } from './pipline.js';
+
+const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
+
+program
+  .command('pull <imageName>')
+  .description('Pull a Docker image from the registry')
+  .action(async (imageName) => {
+    await pull(imageName);
+  });
+
+program
+  .command('sonar')
+  .description('Run Sonar analysis')
+  .action(async () => {
+    await sonar(GIT_SHA);
+  });
+
+program
+  .command('addApacheSite')
+  .description('Add site to apache')
+  .action(async () => {
+    await addApacheSite();
+  });
+
+program
+  .command('connectClone')
+  .description('Clone connect site')
+  .action(async () => {
+    await connectClone();
+  });
+
+program
+  .command('haproxySync')
+  .description('Sync haproxy config')
+  .action(async () => {
+    await haproxySync();
+  });
+
+program
+  .command('vaultAddSiteData')
+  .description('Add m2m auth0 data to vault')
+  .requiredOption('-s, --site-name <siteName>', 'Site name')
+  .requiredOption(
+    '-p, --site-config-remote-path <siteConfigRemotePath>',
+    'Site Config Remote Path',
+  )
+  .action(async (options) => {
+    const { siteName, siteConfigRemotePath } = options;
+    await vaultAddSiteData(siteName, siteConfigRemotePath);
+  });
+
+program
+  .command('publish')
+  .description('Publish a Docker image')
+  .action(async () => {
+    await publish(GIT_SHA);
+  });
+
+program
+  .command('deploy-from-site')
+  .description('Deploy an application for a specific site')
+  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
+  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
+  .requiredOption('-F, --from-site <fromSite>', 'Source site')
+  .requiredOption('-T, --to-site <toSite>', 'Target site')
+  .option('-c, --deploy-core <deployCore>', 'Deploy Core', 'false')
+  .option('-C, --deploy-connect <deployConnect>', 'Deploy Connect', 'false')
+  .action(async (options) => {
+    const { fromEnv, fromSite, toEnv, toSite, deployCore, deployConnect } =
+      options;
+    await deployFromSite(
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+      deployCore,
+      deployConnect,
+    );
+  });
+
+program
+  .command('deployTemplate <site>')
+  .description('Deploy an application for a specific site')
+  .action(async (site) => {
+    await deployTemplate(site);
+  });
+
+program
+  .command('deploy-core <env> <site>')
+  .description('Deploy Core')
+  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
+  .option('-b, --branch <branch>', 'Branch', 'master')
+  .action(async (env, site, options) => {
+    await deployCore(env, site, options.liquibase, options.branch);
+  });
+
+program
+  .command('deploy-connect <env> <site>')
+  .description('Deploy Core')
+  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
+  .option('-b, --branch <branch>', 'Branch', 'master')
+  .action(async (env, site, options) => {
+    await deployConnect(env, site, options.liquibase, options.branch);
+  });
+
+program
+  .command('deploy-core-pipeline <env> <site>')
+  .description('Deploy Core')
+  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
+  .option('-b, --branch <branch>', 'Branch', 'master')
+  .action(async (env, site, options) => {
+    await runPipeline('site-deploy', 'deploy-core', 'main', {
+      ENV: env,
+      SITE: site,
+      LIQUIBASE: options.liquibase,
+      BRANCH: options.branch,
+    });
+  });
+
+program
+  .command('copy')
+  .description('Copy a Docker image between registries')
+  .requiredOption('-a, --application <application>', 'Application name')
+  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
+  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
+  .requiredOption('-g, --tag <tag>', 'Image tag')
+  .action(async (options) => {
+    const { application, fromEnv, toEnv, tag } = options;
+    await copy(application, fromEnv, toEnv, tag);
+  });
+
+program
+  .command('run-pipeline')
+  .description('Trigger a pipeline by name')
+  .requiredOption('-r, --repository <repository>', 'Repository name')
+  .requiredOption('-p, --pipeline-name <pipelineName>', 'Pipeline name')
+  .requiredOption('-b, --branch <branch>', 'Branch name')
+  .option(
+    '-v, --variables <key=value>',
+    'Pipeline variable as key=value pair',
+    (value, previous) => {
+      const [key, val] = value.split('=');
+      if (!key || val === undefined) {
+        throw new Error(`Invalid variable format: ${value}. Use key=value.`);
+      }
+      return { ...previous, [key]: val };
+    },
+    {},
+  )
+  .option('-w, --wait', 'Wait for the pipeline to complete', false) // Defaults to false
+  .action(async (cmdObj) => {
+    try {
+      const { repository, pipelineName, branch, variables, wait } = cmdObj;
+
+      // Call the triggerPipelineByName function
+      await runPipeline(repository, pipelineName, branch, variables, wait);
+    } catch (error) {
+      console.error('Error triggering pipeline:', error.message);
+      process.exit(1);
+    }
+  });
+
+program.parse(process.argv);

package/src/next/config.js

@@ -1,84 +1,84 @@
-export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
-
-export const environmentConfig = {
-  dev: {
-    newUrl: (site) => `https://${site}.dev.dpai.tech`,
-    oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.dev.docupaceinc.com',
-  },
-  qa: {
-    newUrl: (site) => `https://${site}.qa.dpai.tech`,
-    oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.preprod.docupaceinc.com',
-  },
-  uat: {
-    newUrl: (site) => `https://${site}.qa.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-  stage: {
-    newUrl: (site) => `https://${site}.stage.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-  prod: {
-    newUrl: (site) => `https://${site}.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-};
-
-export const appInfo = {
-  'graphql-server': {
-    repositoryName: 'docupace-graphql-server',
-    deployAttributes: [
-      'image.tag',
-      'graphqlServer.siteConfigRemoteBranch',
-      'graphqlServer.standardConfigRemoteBranch',
-    ],
-  },
-  ui: {
-    repositoryName: 'docupace-ui-main',
-    deployAttributes: ['image.tag'],
-  },
-};
-
-export const getEnvInfo = () => {
-  const envInfo = Object.fromEntries(
-    environments.map((env) => [
-      env,
-      {
-        jfrog: {
-          username: process.env[`JF_REGISTRY_${env.toUpperCase()}_USERNAME`],
-          password: process.env[`JF_REGISTRY_${env.toUpperCase()}_PASSWORD`],
-        },
-      },
-    ]),
-  );
-
-  return envInfo;
-};
-
-export const getBitbucketInfo = () => {
-  return {
-    username: process.env.BITBUCKET_USERNAME,
-    password: process.env.BITBUCKET_APP_PASSWORD,
-    workspace: 'dp-cloud',
-  };
-};
-
-export const getRepUrl = (repoName) => {
-  const { username, password, workspace } = getBitbucketInfo();
-  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
-};
-
-export const jfRegistryUrl = 'registry.paperout.com';
-
-export const getVaultSecretsConfigs = (site) => {
-  return {
-    commonSecretsPath: 'secret/data/common/config',
-    siteCommonSecretsPath: `secret/data/${site}/common/config`,
-    graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
-    uiSecretsPath: `secret/data/${site}/ui/config`
-  }
-};
+export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
+
+export const environmentConfig = {
+  dev: {
+    newUrl: (site) => `https://${site}.dev.dpai.tech`,
+    oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
+    docupaceHost: () => 'www.dev.docupaceinc.com',
+  },
+  qa: {
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
+    oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
+    docupaceHost: () => 'www.preprod.docupaceinc.com',
+  },
+  uat: {
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
+    docupaceHost: () => 'www2.paperout.com',
+  },
+  stage: {
+    newUrl: (site) => `https://${site}.stage.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
+    docupaceHost: () => 'www2.paperout.com',
+  },
+  prod: {
+    newUrl: (site) => `https://${site}.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}`,
+    docupaceHost: () => 'www2.paperout.com',
+  },
+};
+
+export const appInfo = {
+  'graphql-server': {
+    repositoryName: 'docupace-graphql-server',
+    deployAttributes: [
+      'image.tag',
+      'graphqlServer.siteConfigRemoteBranch',
+      'graphqlServer.standardConfigRemoteBranch',
+    ],
+  },
+  ui: {
+    repositoryName: 'docupace-ui-main',
+    deployAttributes: ['image.tag'],
+  },
+};
+
+export const getEnvInfo = () => {
+  const envInfo = Object.fromEntries(
+    environments.map((env) => [
+      env,
+      {
+        jfrog: {
+          username: process.env[`JF_REGISTRY_${env.toUpperCase()}_USERNAME`],
+          password: process.env[`JF_REGISTRY_${env.toUpperCase()}_PASSWORD`],
+        },
+      },
+    ]),
+  );
+
+  return envInfo;
+};
+
+export const getBitbucketInfo = () => {
+  return {
+    username: process.env.BITBUCKET_USERNAME,
+    password: process.env.BITBUCKET_APP_PASSWORD,
+    workspace: 'dp-cloud',
+  };
+};
+
+export const getRepUrl = (repoName) => {
+  const { username, password, workspace } = getBitbucketInfo();
+  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+};
+
+export const jfRegistryUrl = 'registry.paperout.com';
+
+export const getVaultSecretsConfigs = (site) => {
+  return {
+    commonSecretsPath: 'secret/data/common/config',
+    siteCommonSecretsPath: `secret/data/${site}/common/config`,
+    graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
+    uiSecretsPath: `secret/data/${site}/ui/config`,
+  };
+};

package/src/next/connect.js

@@ -124,6 +124,12 @@ export async function connectClone() {
         // Execute the shell command
         const result =
           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`;
+        await $`cd ${cloneTo} && git status`;
+        await $`cd ${cloneTo} && git add . ../sites.sh`;
+
         console.log('Command succeeded:');
         console.log('stdout:', result.stdout); // Standard output
         console.log('stderr:', result.stderr); // Standard error
@@ -162,11 +168,7 @@ export async function connectClone() {
   await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
 
   // 8) Git add, commit, push
-  await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
-  await $`cd ${cloneTo} && git remote -v`;
-  await $`cd ${cloneTo} && git branch`;
-  await $`cd ${cloneTo} && git status`;
-  await $`cd ${cloneTo} && git add . ../sites.sh`;
+  await $`cd ${cloneTo} && git add ./conf/application.conf ./conf/saml/auth0.xml`;
   await $`cd ${cloneTo} && git status`;
 
   const numChanges = (await $`cd ${cloneTo} && git diff-index HEAD`).stdout