@docupace/pipeline 1.0.77-alpha.2 → 1.0.77

package/src/next/git-to-semver.js

@@ -1,79 +1,79 @@
-/**
- * Converts git describe output to semantic versioning format
- *
- * Logic based on dash count:
- * - 2 dashes: Released version with commits (v1.2.3-4-g1234567 -> 1.2.3+4.g1234567)
- * - 3 dashes: Pre-release with commits (v1.2.3-rc.1-4-g1234567 -> 1.2.3-rc.1+4.g1234567)
- * - 1 dash: Pre-release tag only (v1.2.3-rc.1 -> 1.2.3-rc.1)
- * - 0 dashes: Clean tag (v1.2.3 -> 1.2.3)
- *
- * @param {string} gitDescribe - The output from git describe
- * @return {string} Semver compatible version string
- */
-export function gitDescribeToSemver(gitDescribe) {
-  if (!gitDescribe || typeof gitDescribe !== 'string') {
-    throw new Error('Invalid input: git describe string required');
-  }
-
-  // Remove leading 'v' if present
-  let version = gitDescribe.trim();
-  if (version.startsWith('v') || version.startsWith('V')) {
-    version = version.substring(1);
-  }
-
-  // Count dashes to determine format
-  const dashCount = (version.match(/-/g) || []).length;
-
-  switch (dashCount) {
-    case 0:
-      // Clean tag: 1.2.3
-      return version;
-
-    case 1:
-      // Pre-release tag only: 1.2.3-rc.1
-      return version;
-
-    case 2: {
-      // Released version with commits: 1.2.3-4-g1234567
-      // Split: [1.2.3, 4, g1234567]
-      const parts = version.split('-');
-      const baseVersion = parts[0];
-      const commits = parts[1];
-      const hash = parts[2];
-      return `${baseVersion}+${commits}.${hash}`;
-    }
-
-    case 3: {
-      // Pre-release with commits: 1.2.3-rc.1-4-g1234567
-      // Split: [1.2.3, rc.1, 4, g1234567]
-      const parts = version.split('-');
-      const baseVersion = parts[0];
-      const prerelease = parts[1];
-      const commits = parts[2];
-      const hash = parts[3];
-      return `${baseVersion}-${prerelease}+${commits}.${hash}`;
-    }
-
-    default: {
-      // More than 3 dashes - handle complex pre-release tags
-      // e.g., 1.2.3-rc-1-beta-4-g1234567
-      // Assume last two parts are commits-hash
-      const parts = version.split('-');
-      if (
-        parts.length >= 3 &&
-        /^\d+$/.test(parts[parts.length - 2]) &&
-        /^g[a-f0-9]+$/.test(parts[parts.length - 1])
-      ) {
-        // Has commits and hash at the end
-        const commits = parts[parts.length - 2];
-        const hash = parts[parts.length - 1];
-        const versionParts = parts.slice(0, -2);
-        const baseVersion = versionParts[0];
-        const prerelease = versionParts.slice(1).join('-');
-        return `${baseVersion}-${prerelease}+${commits}.${hash}`;
-      }
-      // No commits/hash pattern found, treat as complex pre-release
-      return version;
-    }
-  }
-}
+/**
+ * Converts git describe output to semantic versioning format
+ *
+ * Logic based on dash count:
+ * - 2 dashes: Released version with commits (v1.2.3-4-g1234567 -> 1.2.3+4.g1234567)
+ * - 3 dashes: Pre-release with commits (v1.2.3-rc.1-4-g1234567 -> 1.2.3-rc.1+4.g1234567)
+ * - 1 dash: Pre-release tag only (v1.2.3-rc.1 -> 1.2.3-rc.1)
+ * - 0 dashes: Clean tag (v1.2.3 -> 1.2.3)
+ *
+ * @param {string} gitDescribe - The output from git describe
+ * @return {string} Semver compatible version string
+ */
+export function gitDescribeToSemver(gitDescribe) {
+  if (!gitDescribe || typeof gitDescribe !== 'string') {
+    throw new Error('Invalid input: git describe string required');
+  }
+
+  // Remove leading 'v' if present
+  let version = gitDescribe.trim();
+  if (version.startsWith('v') || version.startsWith('V')) {
+    version = version.substring(1);
+  }
+
+  // Count dashes to determine format
+  const dashCount = (version.match(/-/g) || []).length;
+
+  switch (dashCount) {
+    case 0:
+      // Clean tag: 1.2.3
+      return version;
+
+    case 1:
+      // Pre-release tag only: 1.2.3-rc.1
+      return version;
+
+    case 2: {
+      // Released version with commits: 1.2.3-4-g1234567
+      // Split: [1.2.3, 4, g1234567]
+      const parts = version.split('-');
+      const baseVersion = parts[0];
+      const commits = parts[1];
+      const hash = parts[2];
+      return `${baseVersion}+${commits}.${hash}`;
+    }
+
+    case 3: {
+      // Pre-release with commits: 1.2.3-rc.1-4-g1234567
+      // Split: [1.2.3, rc.1, 4, g1234567]
+      const parts = version.split('-');
+      const baseVersion = parts[0];
+      const prerelease = parts[1];
+      const commits = parts[2];
+      const hash = parts[3];
+      return `${baseVersion}-${prerelease}+${commits}.${hash}`;
+    }
+
+    default: {
+      // More than 3 dashes - handle complex pre-release tags
+      // e.g., 1.2.3-rc-1-beta-4-g1234567
+      // Assume last two parts are commits-hash
+      const parts = version.split('-');
+      if (
+        parts.length >= 3 &&
+        /^\d+$/.test(parts[parts.length - 2]) &&
+        /^g[a-f0-9]+$/.test(parts[parts.length - 1])
+      ) {
+        // Has commits and hash at the end
+        const commits = parts[parts.length - 2];
+        const hash = parts[parts.length - 1];
+        const versionParts = parts.slice(0, -2);
+        const baseVersion = versionParts[0];
+        const prerelease = versionParts.slice(1).join('-');
+        return `${baseVersion}-${prerelease}+${commits}.${hash}`;
+      }
+      // No commits/hash pattern found, treat as complex pre-release
+      return version;
+    }
+  }
+}

package/src/next/haproxy.js

@@ -1,76 +1,76 @@
-import { $ } from 'zx';
-import fs from 'fs-extra';
-import path from 'path';
-
-export async function haproxySync() {
-  const cluster = process.env.HAPROXY_CLUSTER;
-  if (cluster !== 'preprod' && cluster !== 'stage' && cluster !== 'prod-www3') {
-    console.log('Error: Cluster must be preprod or stage');
-    process.exit(1);
-  }
-
-  const repoPath = '/root/repo/docupace-ansible';
-  const inventory = path.join(repoPath, `inventories/${cluster}/inventory`);
-
-  // Create haproxy.sh
-  const cluserHostMap = {
-    preprod: {
-      host: '10.10.28.198',
-      branch: 'master',
-    },
-    stage: {
-      host: '10.12.28.10',
-      branch: 'master',
-    },
-    'prod-www2': {
-      host: ' 10.13.28.43',
-      branch: 'master',
-    },
-    'prod-www3': {
-      host: '10.13.28.45',
-      branch: 'master',
-    },
-  };
-
-  const scriptContent = `
-  #!/bin/bash
-  
-  [[ ! -f ${inventory} ]] && ( echo "Alert: no inventory file: ${inventory}" ; exit 1 )
-  cd ${repoPath}
-  pwd
-  git reset --hard
-  git clean -fd
-  git fetch --all
-  git pull origin master
-  git checkout ${cluserHostMap[cluster].branch}
-  git submodule update --remote
-  git submodule foreach --recursive git checkout master
-  git submodule foreach --recursive git pull origin master
-  
-  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}  -e build=true"
-  
-  echo "proceeding"
-  echo "committing changes"
-  git add ${cluster}-haproxy.cfg
-  git commit -m "Sync haproxy"
-  git push origin master
-  `;
-
-  await fs.writeFile('haproxy.sh', scriptContent);
-
-  // Private key
-  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
-  if (!haproxyPrivateKey) {
-    console.log('Error: HAPROXY_PRIVATE_KEY not set.');
-    process.exit(1);
-  }
-
-  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
-  await fs.chmod('private.key', 0o600);
-
-  // Copy script to remote
-  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster].host}:/tmp/haproxy.sh`;
-
-  // Execute script on remote
-  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster].host} "bash /tmp/haproxy.sh"`;
-}
+import { $ } from 'zx';
+import fs from 'fs-extra';
+import path from 'path';
+
+export async function haproxySync() {
+  const cluster = process.env.HAPROXY_CLUSTER;
+  if (cluster !== 'preprod' && cluster !== 'stage' && cluster !== 'prod-www3') {
+    console.log('Error: Cluster must be preprod or stage');
+    process.exit(1);
+  }
+
+  const repoPath = '/root/repo/docupace-ansible';
+  const inventory = path.join(repoPath, `inventories/${cluster}/inventory`);
+
+  // Create haproxy.sh
+  const cluserHostMap = {
+    preprod: {
+      host: '10.10.28.198',
+      branch: 'master',
+    },
+    stage: {
+      host: '10.12.28.10',
+      branch: 'master',
+    },
+    'prod-www2': {
+      host: ' 10.13.28.43',
+      branch: 'master',
+    },
+    'prod-www3': {
+      host: '10.13.28.45',
+      branch: 'master',
+    },
+  };
+
+  const scriptContent = `
+  #!/bin/bash
+  
+  [[ ! -f ${inventory} ]] && ( echo "Alert: no inventory file: ${inventory}" ; exit 1 )
+  cd ${repoPath}
+  pwd
+  git reset --hard
+  git clean -fd
+  git fetch --all
+  git pull origin master
+  git checkout ${cluserHostMap[cluster].branch}
+  git submodule update --remote
+  git submodule foreach --recursive git checkout master
+  git submodule foreach --recursive git pull origin master
+  
+  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}  -e build=true"
+  
+  echo "proceeding"
+  echo "committing changes"
+  git add ${cluster}-haproxy.cfg
+  git commit -m "Sync haproxy"
+  git push origin master
+  `;
+
+  await fs.writeFile('haproxy.sh', scriptContent);
+
+  // Private key
+  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
+  if (!haproxyPrivateKey) {
+    console.log('Error: HAPROXY_PRIVATE_KEY not set.');
+    process.exit(1);
+  }
+
+  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
+  await fs.chmod('private.key', 0o600);
+
+  // Copy script to remote
+  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster].host}:/tmp/haproxy.sh`;
+
+  // Execute script on remote
+  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster].host} "bash /tmp/haproxy.sh"`;
+}

package/src/next/jenkins.js

@@ -1,123 +1,123 @@
-import axios from 'axios';
-
-const CORE_JENKINS_URL = process.env.CORE_JENKINS_URL;
-const CORE_JOB_NAME = process.env.CORE_JENKINS_JOB_NAME;
-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;
-  }
-}
+import axios from 'axios';
+
+const CORE_JENKINS_URL = process.env.CORE_JENKINS_URL;
+const CORE_JOB_NAME = process.env.CORE_JENKINS_JOB_NAME;
+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;
+  }
+}