@docupace/pipeline 1.0.2-3.test9 → 1.0.2-5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.23.test9",
+  "version": "1.0.25.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,185 +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')
-  .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);
+#!/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

@@ -79,6 +79,6 @@ export const getVaultSecretsConfigs = (site) => {
     commonSecretsPath: 'secret/data/common/config',
     siteCommonSecretsPath: `secret/data/${site}/common/config`,
     graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
-    uiSecretsPath: `secret/data/${site}/ui/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

package/src/next/copy.js

@@ -1,52 +1,52 @@
-import { $ } from 'zx';
-import { appInfo, getEnvInfo, jfRegistryUrl } from './config.js';
-
-/*
-    TARGET_ENV
-    PUBLISH_TAG
-    REPOSITORY_NAME
- */
-export async function copy(application, fromEnv, toEnv, tag) {
-  const envInfo = getEnvInfo();
-  const repositoryName = appInfo[application].repositoryName;
-  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
-  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
-  const fromFullImageName = `${fromRegistry}/${imageName}`;
-  const toFullImageName = `${toRegistry}/${imageName}`;
-
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
-
-  // Login to source registry
-  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker pull ${fromFullImageName}`;
-  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
-
-  // Login to target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
-}
-
-export async function copy2(repositoryName, fromEnv, toEnv, tag) {
-  const envInfo = getEnvInfo();
-  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
-  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
-  const fromFullImageName = `${fromRegistry}/${imageName}`;
-  const toFullImageName = `${toRegistry}/${imageName}`;
-
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
-
-  // Login to source registry
-  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker pull ${fromFullImageName}`;
-  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
-
-  // Login to target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
+import { $ } from 'zx';
+import { appInfo, getEnvInfo, jfRegistryUrl } from './config.js';
+
+/*
+    TARGET_ENV
+    PUBLISH_TAG
+    REPOSITORY_NAME
+ */
+export async function copy(application, fromEnv, toEnv, tag) {
+  const envInfo = getEnvInfo();
+  const repositoryName = appInfo[application].repositoryName;
+  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
+  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
+  const imageName = `${repositoryName}:${tag}`;
+  const fromFullImageName = `${fromRegistry}/${imageName}`;
+  const toFullImageName = `${toRegistry}/${imageName}`;
+
+  console.log(
+    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
+  );
+
+  // Login to source registry
+  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker pull ${fromFullImageName}`;
+  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
+
+  // Login to target registry
+  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker push ${toFullImageName}`;
+}
+
+export async function copy2(repositoryName, fromEnv, toEnv, tag) {
+  const envInfo = getEnvInfo();
+  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
+  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
+  const imageName = `${repositoryName}:${tag}`;
+  const fromFullImageName = `${fromRegistry}/${imageName}`;
+  const toFullImageName = `${toRegistry}/${imageName}`;
+
+  console.log(
+    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
+  );
+
+  // Login to source registry
+  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker pull ${fromFullImageName}`;
+  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
+
+  // Login to target registry
+  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker push ${toFullImageName}`;
 }

package/src/next/deploy.js

@@ -39,29 +39,47 @@ async function updateAndCommitConnectVersion(
     let content = fs.readFileSync(filePath, 'utf8');
     content = content.replace(
       /IMAGE_VERSION=.*/,
-      `IMAGE_VERSION=${getComparedVersion}`,
+      `IMAGE_VERSION=git-commit-${getComparedVersion}`,
     );
     fs.writeFileSync(filePath, content, 'utf8');
 
     // Git commands to stage, commit and push changes
-    await $`cd ${connectDeployPath}`;
-    await $`git add ${filePath}`;
-    await $`git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}"`;
-    await $`git push`;
+    await $`cd ${connectDeployPath} && git config user.email "gitops@docupace.com"`;
+    await $`cd ${connectDeployPath} && git add .`;
+    await $`cd ${connectDeployPath} && git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}"`;
+    await $`cd ${connectDeployPath} && git push`;
+
+    console.log('🧹 Cleaning up...');
+    await $`rm -rf ${connectDeployPath}`;
+    console.log('✅ Cleanup complete.');
   } catch (error) {
     console.error('Error updating Connect version:', error);
     throw error;
   }
 }
 
+async function fetchLoginFooter(env, site, isNewUrl) {
+  const url = isNewUrl
+    ? environmentConfig[env].newUrl(site)
+    : environmentConfig[env].oldUrl(site);
+  const endpoint = isNewUrl ? '/connect/loginFooter' : '_ui/loginFooter';
+  return await axios.get(`${url}${endpoint}`);
+}
+
 async function compareGetConnectSiteVersions(fromEnv, fromSite, toEnv, toSite) {
   try {
-    const fromResponse = await axios.get(
-      `https://${fromSite}.${fromEnv}.dpai.tech/connect/loginFooter`,
-    );
-    const toResponse = await axios.get(
-      `https://${toSite}.${toEnv}.dpai.tech/connect/loginFooter`,
-    );
+    let fromResponse, toResponse;
+    try {
+      fromResponse = await fetchLoginFooter(fromEnv, fromSite, true);
+    } catch {
+      fromResponse = await fetchLoginFooter(fromEnv, fromSite, false);
+    }
+
+    try {
+      toResponse = await fetchLoginFooter(toEnv, toSite, true);
+    } catch {
+      toResponse = await fetchLoginFooter(toEnv, toSite, false);
+    }
 
     const fromMatch = fromResponse.data.match(/UI Build: ([a-f0-9]*)/);
     const toMatch = toResponse.data.match(/UI Build: ([a-f0-9]*)/);
@@ -429,6 +447,7 @@ export async function deployFromSite(
       toSite,
     );
     if (getComparedVersion) {
+      console.log('Version to deploy is: ', getComparedVersion);
       const connectDeployPath = await cloneRepository('connect-deploy');
       // update target version set to git-commit-${getCommparedVersion}}
       await updateAndCommitConnectVersion(
@@ -450,7 +469,7 @@ export async function deployFromSite(
 
   // Initialize a flag to track changes
   let changesMade = false;
-  const applications = await getAppTypesFromRepo(fromEnv, fromSite);
+  const applications = await getAppTypesFromRepo(toEnv, toSite);
   console.log(applications);
   // Iterate over applications in appInfo
 

package/src/next/jenkins.js

@@ -1,122 +1,123 @@
-import axios from 'axios';
-
-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 = {
-    environment: env,
-    site: site.toUpperCase(),
-    runLiquibase: liquibase,
-    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(
-      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
-      new URLSearchParams(parameters),
-      {
-        auth,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
-      },
-    );
-
-    const queueUrl = buildResponse.headers.location;
-    console.log(`Job queued at: ${queueUrl}`);
-
-    // Poll queue for executable URL
-    let jobUrl = null;
-    while (!jobUrl) {
-      const queueResponse = await axios.get(`${queueUrl}api/json`, {
-        auth,
-      });
-      jobUrl = queueResponse.data.executable?.url || null;
-
-      if (!jobUrl) {
-        console.log('Waiting for job to start...');
-        await new Promise((resolve) => setTimeout(resolve, 5000));
-      }
-    }
-
-    jobUrl = jobUrl.replaceAll('https', 'http');
-
-    console.log(`Job started at: ${jobUrl}`);
-
-    // Stream console output
-    const consoleUrl = `${jobUrl}consoleText`;
-    let lastSize = 0;
-
-    console.log('Streaming job output...');
-    while (true) {
-      const consoleResponse = await axios.get(consoleUrl, {
-        auth,
-        responseType: 'text',
-      });
-
-      const consoleText = consoleResponse.data;
-      const newOutput = consoleText.slice(lastSize);
-      process.stdout.write(newOutput); // Write new output to console
-      lastSize = consoleText.length;
-
-      // Check job status
-      const jobResponse = await axios.get(`${jobUrl}api/json`, {
-        auth,
-      });
-      const result = jobResponse.data.result;
-
-      if (result) {
-        console.log(`\nJob completed with result: ${result}`);
-        if (result === 'SUCCESS') {
-          return;
-        } else {
-          throw new Error('Jenkins job failed');
-        }
-      }
-
-      // Wait before polling again
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    }
-  } catch (error) {
-    console.error('Error:', error.message);
-    throw error;
-  }
-}
+import axios from 'axios';
+
+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 = {
+    environment: env,
+    site: site.toUpperCase(),
+    runLiquibase: liquibase,
+    gitBranch,
+  };
+
+  return callJenkinsJob({
+    jenkinsUrl: CORE_JENKINS_URL,
+    jobName: CORE_JOB_NAME,
+    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
+    parameters,
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+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(
+      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
+      new URLSearchParams(parameters),
+      {
+        auth,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
+      },
+    );
+
+    const queueUrl = buildResponse.headers.location;
+    console.log(`Job queued at: ${queueUrl}`);
+
+    // Poll queue for executable URL
+    let jobUrl = null;
+    while (!jobUrl) {
+      const queueResponse = await axios.get(`${queueUrl}api/json`, {
+        auth,
+      });
+      jobUrl = queueResponse.data.executable?.url || null;
+
+      if (!jobUrl) {
+        console.log('Waiting for job to start...');
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+      }
+    }
+
+    jobUrl = jobUrl.replaceAll('https', 'http');
+
+    console.log(`Job started at: ${jobUrl}`);
+
+    // Stream console output
+    const consoleUrl = `${jobUrl}consoleText`;
+    let lastSize = 0;
+
+    console.log('Streaming job output...');
+    while (true) {
+      const consoleResponse = await axios.get(consoleUrl, {
+        auth,
+        responseType: 'text',
+      });
+
+      const consoleText = consoleResponse.data;
+      const newOutput = consoleText.slice(lastSize);
+      process.stdout.write(newOutput); // Write new output to console
+      lastSize = consoleText.length;
+
+      // Check job status
+      const jobResponse = await axios.get(`${jobUrl}api/json`, {
+        auth,
+      });
+      const result = jobResponse.data.result;
+
+      if (result) {
+        console.log(`\nJob completed with result: ${result}`);
+        if (result === 'SUCCESS') {
+          return;
+        } else {
+          throw new Error('Jenkins job failed');
+        }
+      }
+
+      // Wait before polling again
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    }
+  } catch (error) {
+    console.error('Error:', error.message);
+    throw error;
+  }
+}

package/src/next/pipline.js

@@ -1,114 +1,114 @@
-import axios from 'axios';
-import { getBitbucketInfo } from './config.js';
-
-const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
-
-const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
-
-async function triggerPipelineByName(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  const payload = {
-    target: {
-      type: 'pipeline_ref_target',
-      ref_type: 'branch',
-      ref_name: branch,
-      selector: {
-        type: 'custom',
-        pattern: pipelineName,
-      },
-    },
-    variables: variables
-      ? Object.entries(variables).map(([key, value]) => ({
-          key,
-          value,
-          secured: false, // Set to true if the variable should be secure
-        }))
-      : undefined,
-  };
-
-  try {
-    const response = await axios.post(url, payload, { auth });
-    return response.data;
-  } catch (error) {
-    console.error(
-      'Error triggering custom pipeline:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-async function getPipelineStatus(repository, pipelineUUID) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  try {
-    const response = await axios.get(url, { auth });
-    return response.data.state.name;
-  } catch (error) {
-    console.error(
-      'Error fetching pipeline status:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-export async function runPipeline(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-  wait = false,
-) {
-  try {
-    console.log(
-      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
-    );
-    const pipeline = await triggerPipelineByName(
-      repository,
-      pipelineName,
-      branch,
-      variables,
-    );
-
-    const pipelineUUID = pipeline.uuid;
-    const buildNumber = pipeline.build_number;
-
-    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
-    console.log(
-      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
-    );
-
-    if (!wait) {
-      return;
-    }
-
-    let status = '';
-    do {
-      console.log('Checking pipeline status...');
-      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
-      status = await getPipelineStatus(repository, pipelineUUID);
-      console.log(`Pipeline status: ${status}`);
-    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
-
-    console.log(`Pipeline completed with status: ${status}`);
-  } catch (error) {
-    console.error('Error monitoring pipeline:', error.message);
-  }
-}
+import axios from 'axios';
+import { getBitbucketInfo } from './config.js';
+
+const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
+
+const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
+
+async function triggerPipelineByName(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  const payload = {
+    target: {
+      type: 'pipeline_ref_target',
+      ref_type: 'branch',
+      ref_name: branch,
+      selector: {
+        type: 'custom',
+        pattern: pipelineName,
+      },
+    },
+    variables: variables
+      ? Object.entries(variables).map(([key, value]) => ({
+          key,
+          value,
+          secured: false, // Set to true if the variable should be secure
+        }))
+      : undefined,
+  };
+
+  try {
+    const response = await axios.post(url, payload, { auth });
+    return response.data;
+  } catch (error) {
+    console.error(
+      'Error triggering custom pipeline:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+async function getPipelineStatus(repository, pipelineUUID) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  try {
+    const response = await axios.get(url, { auth });
+    return response.data.state.name;
+  } catch (error) {
+    console.error(
+      'Error fetching pipeline status:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+export async function runPipeline(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+  wait = false,
+) {
+  try {
+    console.log(
+      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
+    );
+    const pipeline = await triggerPipelineByName(
+      repository,
+      pipelineName,
+      branch,
+      variables,
+    );
+
+    const pipelineUUID = pipeline.uuid;
+    const buildNumber = pipeline.build_number;
+
+    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
+    console.log(
+      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
+    );
+
+    if (!wait) {
+      return;
+    }
+
+    let status = '';
+    do {
+      console.log('Checking pipeline status...');
+      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
+      status = await getPipelineStatus(repository, pipelineUUID);
+      console.log(`Pipeline status: ${status}`);
+    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
+
+    console.log(`Pipeline completed with status: ${status}`);
+  } catch (error) {
+    console.error('Error monitoring pipeline:', error.message);
+  }
+}