@docupace/pipeline 1.0.7-alpha.ervins1.9 → 1.0.7-beta.2

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.7-alpha.ervins1.9",
+  "version": "1.0.7-beta.2",
   "description": "",
   "main": "index.js",
   "type": "module",
   "bin": {
     "dp-changeset-cli": "src/changeset/cli.js",
-    "dp-next-cli": "src/next/cli.js",
-    "dp-auth0-cli": "src/auth0/cli.js"
+    "dp-next-cli": "src/next/cli.js"
   },
   "keywords": [
     "bash"
@@ -16,7 +15,6 @@
   "license": "ISC",
   "dependencies": {
     "@changesets/cli": "^2.27.10",
-    "auth0-deploy-cli": "^7.24.3",
     "axios": "^1.7.9",
     "commander": "^12.1.0",
     "dotenv": "^16.4.7",
@@ -24,7 +22,7 @@
     "lodash": "^4.17.21",
     "openai": "^4.76.3",
     "zod": "^3.24.1",
-    "zx": "^8.3.0"
+    "zx": "^8.2.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",

package/src/next/cli.js

@@ -7,10 +7,6 @@ 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'] });
@@ -19,9 +15,8 @@ const program = new Command();
 
 // GIT SHA computation
 import { $ } from 'zx';
-import { deployCore } from './jenkins.js';
+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
@@ -38,39 +33,6 @@ program
     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')
-  .action(async (options) => {
-    const { siteName,  } = options;
-    await vaultAddSiteData(siteName);
-  });
-
 program
   .command('publish')
   .description('Publish a Docker image')
@@ -107,6 +69,15 @@ program
     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')
@@ -121,8 +92,7 @@ program
     });
   });
 
-
-  program
+program
   .command('copy')
   .description('Copy a Docker image between registries')
   .requiredOption('-a, --application <application>', 'Application name')

package/src/next/config.js

@@ -2,29 +2,25 @@ export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
 
 export const environmentConfig = {
   dev: {
-    newUrl: (site) => `${site}.dev.dpai.tech`,
+    newUrl: (site) => `https://${site}.dev.dpai.tech`,
     oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.dev.docupaceinc.com',
   },
   qa: {
-    newUrl: (site) => `${site}.qa.dpai.tech`,
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
     oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.preprod.docupaceinc.com',
   },
   uat: {
-    newUrl: (site) => `${site}.qa.dpai.tech`,
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
-    docupaceHost: () => 'www2.paperout.com',
   },
   stage: {
-    newUrl: (site) => `${site}.stage.dpai.tech`,
+    newUrl: (site) => `https://${site}.stage.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
-    docupaceHost: () => 'www2.paperout.com',
   },
+
   prod: {
-    newUrl: (site) => `${site}.dpai.tech`,
+    newUrl: (site) => `https://${site}.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}`,
-    docupaceHost: () => 'www2.paperout.com',
   },
 };
 
@@ -69,16 +65,8 @@ export const getBitbucketInfo = () => {
 
 export const getRepUrl = (repoName) => {
   const { username, password, workspace } = getBitbucketInfo();
-  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+  const repoUrl = `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+  return repoUrl;
 };
 
 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/deploy.js

@@ -22,56 +22,27 @@ function getRepoLocalPath(env) {
   return { repoPath, repoName };
 }
 
-function getRepoLocalPathByRepoSlug(repoSlug) {
-  const repoName = `${repoSlug}`;
-  const repoPath = path.join(process.cwd(), repoName);
-  return { repoPath, repoName };
-}
-
-function cleanUpRepoPath(repoPath) {
-  // Check and handle repo directory
-  if (fs.existsSync(repoPath)) {
-    console.log(`${repoPath} directory exists. Removing it...`);
-    fs.rmSync(repoPath, {
-      recursive: true,
-      force: true
-    });
-  }
-}
-
-export async function cloneEnvRepository(env) {
+async function cloneEnvRepository(env) {
   const { repoPath, repoName } = getRepoLocalPath(env);
   const repoUrl = getRepUrl(repoName);
   console.log(`Cloning repository: ${repoName}`);
-  await $`git clone --depth 1 ${repoUrl}`;
+  await $`git clone ${repoUrl}`;
   console.log(`Repository cloned to: ${repoPath}`);
   return repoPath;
 }
 
-export async function cloneRepository(repoSlug) {
-  const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
-  const repoUrl = getRepUrl(repoName);
-
-  await cleanUpRepoPath(repoPath)
-
-  console.log(`Cloning repository: ${repoName}`);
-  await $`git clone --depth 1 ${repoUrl}`;
-  console.log(`Repository cloned to: ${repoPath}`);
-  return repoPath;
-}
-
-function getConfigPath(application, env, site) {
+function getConfigPath(application, env, site, name) {
   const { repoPath } = getRepoLocalPath(env);
   const deployConfigFilePath = path.join(
     repoPath,
-    `dp/${site}/${application}.values.yaml`,
+    `dp/${site}/${application}.${name}.yaml`,
   );
 
   return { repoPath, deployConfigFilePath };
 }
 
-export async function readDeployConfig(application, env, site) {
-  const { deployConfigFilePath } = getConfigPath(application, env, site);
+async function readDeployConfig(application, env, site, name) {
+  const { deployConfigFilePath } = getConfigPath(application, env, site, name);
 
   let deployConfig;
   try {
@@ -92,6 +63,7 @@ export async function cloneAndReadDeployConfig(application, env, site) {
     application,
     env,
     site,
+    'values',
   );
 
   return { repoPath, deployConfigFilePath, deployConfig };
@@ -147,7 +119,7 @@ export async function pushDeployConfig(repoPath, commitMessage) {
   console.log('✅ Cleanup complete.');
 }
 
-function writeDeployConfig(repPath, deployConfigFilePath, deployConfig) {
+function writeDeployConfig(deployConfigFilePath, deployConfig) {
   try {
     fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
     console.log(`✅ Updated YAML file saved at: ${deployConfigFilePath}`);
@@ -163,7 +135,7 @@ export async function writeAndPushDeployConfig(
   deployConfig,
   commitMessage,
 ) {
-  writeDeployConfig(repoPath, deployConfigFilePath, deployConfig);
+  writeDeployConfig(deployConfigFilePath, deployConfig);
   await pushDeployConfig(repoPath, commitMessage);
 }
 
@@ -273,7 +245,9 @@ export async function deployFromSite(
 ) {
   if (isDeployCore === 'true') {
     const branchName = await getCoreBranchName(fromEnv, fromSite);
-    await deployCore(toEnv, toSite, 'true', branchName);
+
+    const coreEnv = toEnv == 'qa' ? 'preprod' : toEnv;
+    await deployCore(coreEnv, toSite, 'true', branchName);
 
     // To be added back when splitting between on prem and in cloud
     /*await runPipeline('site-deploy', 'deploy-core', 'main', {
@@ -301,6 +275,7 @@ export async function deployFromSite(
       application,
       fromEnv,
       fromSite,
+      'values',
     );
 
     if (fromEnv !== toEnv) {
@@ -311,7 +286,7 @@ export async function deployFromSite(
     const {
       deployConfig: toDeployConfig,
       deployConfigFilePath: toDeployConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite);
+    } = await readDeployConfig(application, toEnv, toSite, 'values');
 
     // Update target configuration using attributes specified in appInfo
     for (const attribute of appDetails.deployAttributes) {
@@ -324,8 +299,18 @@ export async function deployFromSite(
       }
     }
 
+    const {
+      deployConfig: toDeployAppConfig,
+      deployConfigFilePath: toDeployAppConfigFilePath,
+    } = await readDeployConfig(application, toEnv, toSite, 'app');
+
+    toDeployAppConfig.revision = fromDeployConfig.image.tag;
+
     // Write updated configuration to the target YAML file
-    writeDeployConfig(toRepoPath, toDeployConfigFilePath, toDeployConfig);
+    writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
+
+    writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+
   }
 
   // Push all changes if any updates were made

package/src/next/jenkins.js

@@ -1,9 +1,14 @@
 import axios from 'axios';
 
-const JENKINS_URL = 'http://devops.corp.docupace.com';
-const JOB_NAME = 'auto-deploy-site';
-const USERNAME = process.env.CORE_JENKINS_USERNAME;
-const API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
+const CORE_JENKINS_URL = 'http://devops.corp.docupace.com';
+const CORE_JOB_NAME = 'auto-deploy-site';
+const CORE_USERNAME = process.env.CORE_JENKINS_USERNAME;
+const CORE_API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
+
+const CONNECT_JENKINS_URL = 'http://usdoc-s-buildui.corp.docupace.com/jenkins';
+const CONNECT_JOB_NAME = 'docupace_build_and_run_site_v2';
+const CONNECT_USERNAME = process.env.CONNECT_JENKINS_USERNAME;
+const CONNECT_API_TOKEN = process.env.CONNECT_JENKINS_API_TOKEN;
 
 export async function deployCore(env, site, liquibase, gitBranch) {
   const parameters = {
@@ -13,14 +18,43 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     gitBranch,
   };
 
+  return callJenkinsJob({
+    jenkinsUrl: CORE_JENKINS_URL,
+    jobName: CORE_JOB_NAME,
+    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
+    parameters,
+  });
+}
+
+export async function deployConnect(env, site, liquibase, branch) {
+  const parameters = {
+    BUILD_ENVIRONMENT: env,
+    BUILD_SITE: site,
+    RUN_LIQUIBASE: liquibase,
+  };
+
+  return callJenkinsJob({
+    jenkinsUrl: CONNECT_JENKINS_URL,
+    jobName: CONNECT_JOB_NAME,
+    auth: { username: CONNECT_USERNAME, password: CONNECT_API_TOKEN },
+    parameters,
+  });
+}
+
+export async function callJenkinsJob({
+  jenkinsUrl,
+  jobName,
+  auth,
+  parameters,
+}) {
   try {
     // Trigger the job
     console.log('Triggering Jenkins job...');
     const buildResponse = await axios.post(
-      `${JENKINS_URL}/job/${JOB_NAME}/buildWithParameters`,
+      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
       new URLSearchParams(parameters),
       {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
       },
@@ -33,7 +67,7 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     let jobUrl = null;
     while (!jobUrl) {
       const queueResponse = await axios.get(`${queueUrl}api/json`, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
       });
       jobUrl = queueResponse.data.executable?.url || null;
 
@@ -54,7 +88,7 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     console.log('Streaming job output...');
     while (true) {
       const consoleResponse = await axios.get(consoleUrl, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
         responseType: 'text',
       });
 
@@ -65,16 +99,16 @@ export async function deployCore(env, site, liquibase, gitBranch) {
 
       // Check job status
       const jobResponse = await axios.get(`${jobUrl}api/json`, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
       });
       const result = jobResponse.data.result;
 
       if (result) {
         console.log(`\nJob completed with result: ${result}`);
         if (result === 'SUCCESS') {
-          process.exit(0);
+          return;
         } else {
-          process.exit(1);
+          throw new Error('Jenkins job failed');
         }
       }
 
@@ -83,6 +117,6 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     }
   } catch (error) {
     console.error('Error:', error.message);
-    process.exit(1);
+    throw error;
   }
 }

package/src/auth0/cli.js

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-import {
-  configureFromSite
-} from './configure.js';
-import {
-  getVaultSecrets
-} from './vault.js'
-
-import dotenv from 'dotenv';
-
-dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-
-const program = new Command();
-
-program
-    .command('configureFromSite <fromSite> <toSite> <env> <deployUI> <deployGraphQLServer> <useNewDomain>')
-    .description('Configure the Auth0 tenants in env for the given site')
-    .action(async (fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) => {
-        await configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain);
-    });
-
-program
-  .command('getVaultSecrets <vaultPath>')
-  .description('Get Secrets for Vault PATH')
-  .action(async (vaultPath) => {
-    await getVaultSecrets(vaultPath);
-  });
-
-program.parse(process.argv);