@docupace/pipeline 1.0.26-alpha-3 → 1.0.26

package/src/next/deploy.js

@@ -4,10 +4,9 @@ import yaml from 'js-yaml';
 import { $ } from 'zx';
 import lodash from 'lodash';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
-import { copy } from './copy.js';
+import { copy2 } from './copy.js';
 import axios from 'axios';
-import { runPipeline } from './pipline.js';
-import { deployCore } from './jenkins.js';
+import { deployCore, deployConnect } from './jenkins.js';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -22,6 +21,80 @@ function getRepoLocalPath(env) {
   return { repoPath, repoName };
 }
 
+async function updateAndCommitConnectVersion(
+  toEnv,
+  toSite,
+  getComparedVersion,
+  connectDeployPath,
+) {
+  const filePath = path.join(
+    connectDeployPath,
+    'envs',
+    toEnv,
+    toSite,
+    'dock.sh',
+  );
+
+  try {
+    let content = fs.readFileSync(filePath, 'utf8');
+    content = content.replace(
+      /IMAGE_VERSION=.*/,
+      `IMAGE_VERSION=git-commit-${getComparedVersion}`,
+    );
+    fs.writeFileSync(filePath, content, 'utf8');
+
+    // Git commands to stage, commit and push changes
+    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 {
+    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]*)/);
+
+    if (fromMatch && fromMatch[1] && toMatch && toMatch[1]) {
+      if (fromMatch[1] !== toMatch[1]) {
+        return fromMatch[1];
+      }
+    }
+    return false;
+  } catch (error) {
+    console.error('Error fetching Connect versions:', error);
+    throw error;
+  }
+}
 function getRepoLocalPathByRepoSlug(repoSlug) {
   const repoName = `${repoSlug}`;
   const repoPath = path.join(process.cwd(), repoName);
@@ -34,7 +107,7 @@ function cleanUpRepoPath(repoPath) {
     console.log(`${repoPath} directory exists. Removing it...`);
     fs.rmSync(repoPath, {
       recursive: true,
-      force: true
+      force: true,
     });
   }
 }
@@ -53,7 +126,7 @@ export async function cloneRepository(repoSlug) {
   const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
   const repoUrl = getRepUrl(repoName);
 
-  await cleanUpRepoPath(repoPath)
+  await cleanUpRepoPath(repoPath);
 
   console.log(`Cloning repository: ${repoName}`);
   await $`git clone --depth 1 ${repoUrl}`;
@@ -71,6 +144,23 @@ function getConfigPath(application, env, site, name) {
   return { repoPath, deployConfigFilePath };
 }
 
+function getAppTypesFromRepo(env, site) {
+  const { repoPath } = getRepoLocalPath(env);
+  const deployConfigFilePath = path.join(repoPath, `dp/${site}`);
+  const applications = [];
+  if (fs.existsSync(deployConfigFilePath)) {
+    const files = fs.readdirSync(deployConfigFilePath);
+    files.forEach((file) => {
+      if (file.includes('.values.yaml')) {
+        const appName = file.split('.')[0];
+        applications.push(appName);
+      }
+    });
+  }
+
+  return { applications };
+}
+
 export async function readDeployConfig(application, env, site, name) {
   const { deployConfigFilePath } = getConfigPath(application, env, site, name);
 
@@ -266,12 +356,72 @@ async function getCoreBranchName(fromEnv, fromSite) {
   return branchName;
 }
 
+export async function deployApp(
+  application,
+  appDetails,
+  fromEnv,
+  fromSite,
+  toEnv,
+  toSite,
+) {
+  let changesMade = false;
+  console.log(`Processing application: ${application}`);
+
+  // Read the deployment configuration for the source environment and site
+  const { deployConfig: fromDeployConfig } = await readDeployConfig(
+    application,
+    fromEnv,
+    fromSite,
+    'values',
+  );
+
+  if (fromEnv !== toEnv) {
+    await copy2(
+      appDetails.repositoryName,
+      fromEnv,
+      toEnv,
+      fromDeployConfig.image.tag,
+    );
+  }
+
+  // Read the deployment configuration for the target environment and site
+  const {
+    deployConfig: toDeployConfig,
+    deployConfigFilePath: toDeployConfigFilePath,
+  } = await readDeployConfig(application, toEnv, toSite, 'values');
+
+  // Update target configuration using attributes specified in appInfo
+  for (const attribute of appDetails.deployAttributes) {
+    const sourceValue = lodash.get(fromDeployConfig, attribute);
+
+    if (sourceValue !== undefined) {
+      // Update the target configuration with the source value
+      lodash.set(toDeployConfig, attribute, sourceValue);
+      changesMade = true;
+    }
+  }
+
+  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(toDeployConfigFilePath, toDeployConfig);
+
+  writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+  return changesMade;
+}
+
 export async function deployFromSite(
   fromEnv,
   fromSite,
   toEnv,
   toSite,
   isDeployCore,
+  isDeployConnect,
 ) {
   if (isDeployCore === 'true') {
     const branchName = await getCoreBranchName(fromEnv, fromSite);
@@ -288,6 +438,30 @@ export async function deployFromSite(
     });*/
   }
 
+  if (isDeployConnect === 'true') {
+    const branch = '';
+    const getComparedVersion = await compareGetConnectSiteVersions(
+      fromEnv,
+      fromSite,
+      toEnv,
+      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(
+        toEnv,
+        toSite,
+        getComparedVersion,
+        connectDeployPath,
+      );
+      // save and deploy
+      const runLiquibase = true;
+      await deployConnect(toEnv, toSite, runLiquibase, branch);
+    }
+  }
+
   // Clone repositories for source and target environments
   const fromRepoPath = await cloneEnvRepository(fromEnv);
   const toRepoPath =
@@ -295,52 +469,53 @@ export async function deployFromSite(
 
   // Initialize a flag to track changes
   let changesMade = false;
-
+  const applications = await getAppTypesFromRepo(toEnv, toSite);
+  console.log(applications);
   // Iterate over applications in appInfo
-  for (const [application, appDetails] of Object.entries(appInfo)) {
-    console.log(`Processing application: ${application}`);
 
-    // Read the deployment configuration for the source environment and site
-    const { deployConfig: fromDeployConfig } = await readDeployConfig(
-      application,
-      fromEnv,
+  let appInfoLocal = Object.fromEntries(
+    applications.applications
+      .filter((application) =>
+        Object.prototype.hasOwnProperty.call(appInfo, application),
+      )
+      .map((application) => [application, appInfo[application]]),
+  );
+
+  // let appInfoLocal = {};
+  // for (const application of applications.applications) {
+  //   if (Object.prototype.hasOwnProperty.call(appInfo, application)) {
+  //     appInfoLocal[application] = appInfo[application];
+  //   }
+  // }
+
+  if (Object.keys(appInfoLocal).length === 0) {
+    const { deployConfig: toDeployAppConfig } = await readDeployConfig(
       fromSite,
-      'values',
+      toEnv,
+      toSite,
+      'app',
     );
 
-    if (fromEnv !== toEnv) {
-      await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
-    }
-
-    // Read the deployment configuration for the target environment and site
-    const {
-      deployConfig: toDeployConfig,
-      deployConfigFilePath: toDeployConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'values');
+    appInfoLocal[fromSite] = {
+      repositoryName: toDeployAppConfig.repo,
+      deployAttributes: ['image.tag'],
+    };
+  }
 
-    // Update target configuration using attributes specified in appInfo
-    for (const attribute of appDetails.deployAttributes) {
-      const sourceValue = lodash.get(fromDeployConfig, attribute);
+  console.log('appinfoLocal', appInfoLocal);
 
-      if (sourceValue !== undefined) {
-        // Update the target configuration with the source value
-        lodash.set(toDeployConfig, attribute, sourceValue);
-        changesMade = true;
-      }
+  for (const [application, appDetails] of Object.entries(appInfoLocal)) {
+    let cm = await deployApp(
+      application,
+      appDetails,
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+    );
+    if (cm) {
+      changesMade = true;
     }
-
-    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(toDeployConfigFilePath, toDeployConfig);
-
-    writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
-
   }
 
   // Push all changes if any updates were made

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;
+  }
+}