@docupace/pipeline 1.0.56 → 1.0.58

package/src/next/haproxy.js

@@ -1,75 +1,75 @@
-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 stash
-  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 stash
+  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/jira.js

@@ -1,84 +1,84 @@
-import axios from 'axios';
-
-// Create preconfigured axios instance for Jira
-const jiraClient = axios.create({
-  baseURL: 'https://docupacellc.atlassian.net',
-  auth: {
-    username: process.env.JIRA_API_EMAIL,
-    password: process.env.JIRA_API_KEY,
-  },
-  headers: {
-    'Content-Type': 'application/json',
-  },
-});
-
-/**
- * Updates the component version custom field in Jira
- * @param {string} issueKey - The Jira issue key
- * @param {string} packageName - The package name
- * @param {string} version - The version to set
- */
-export async function updateComponentVersion(issueKey, packageName, version) {
-  const component = packageName.includes('/')
-    ? packageName.split('/')[1]
-    : packageName;
-  console.log(
-    `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
-  );
-  try {
-    // First get current field value
-    const response = await jiraClient.get(
-      `/rest/api/2/issue/${issueKey}?fields=customfield_10458`,
-    );
-
-    let currentValue = response.data.fields.customfield_10458 || '';
-    let components = new Map();
-
-    try {
-      // Parse existing components
-      if (currentValue) {
-        currentValue.split(';').forEach((entry) => {
-          const [comp, ver] = entry.split(':');
-          components.set(comp, ver);
-        });
-      }
-      // Update or add new component version
-    } catch {
-      console.log('Patch version has incorrect data overriding');
-    }
-
-    components.set(component, version);
-
-    // Convert back to string format
-    const newValue = Array.from(components.entries())
-      .map(([comp, ver]) => `${comp}:${ver}`)
-      .join(';');
-
-    // Update the field
-    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, {
-      fields: {
-        customfield_10458: newValue,
-      },
-    });
-
-    console.log(`Updated component versions for ${issueKey}: ${newValue}`);
-  } catch (error) {
-    console.error(`Error updating Jira component version: ${error.message}`);
-  }
-}
-
-/**
- * Makes a request to the Jira API using preconfigured client
- * @param {string} endpoint - The API endpoint (starting with /)
- * @param {Object} options - Request options (method, body, etc)
- * @returns {Promise<any>} The response data
- */
-export async function makeJiraRequest(endpoint, options = {}) {
-  try {
-    const response = await jiraClient.get(endpoint, options);
-    return response.data;
-  } catch (error) {
-    console.error(`Error making Jira request: ${error.message}`);
-    throw error;
-  }
-}
+import axios from 'axios';
+
+// Create preconfigured axios instance for Jira
+const jiraClient = axios.create({
+  baseURL: 'https://docupacellc.atlassian.net',
+  auth: {
+    username: process.env.JIRA_API_EMAIL,
+    password: process.env.JIRA_API_KEY,
+  },
+  headers: {
+    'Content-Type': 'application/json',
+  },
+});
+
+/**
+ * Updates the component version custom field in Jira
+ * @param {string} issueKey - The Jira issue key
+ * @param {string} packageName - The package name
+ * @param {string} version - The version to set
+ */
+export async function updateComponentVersion(issueKey, packageName, version) {
+  const component = packageName.includes('/')
+    ? packageName.split('/')[1]
+    : packageName;
+  console.log(
+    `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
+  );
+  try {
+    // First get current field value
+    const response = await jiraClient.get(
+      `/rest/api/2/issue/${issueKey}?fields=customfield_10458`,
+    );
+
+    let currentValue = response.data.fields.customfield_10458 || '';
+    let components = new Map();
+
+    try {
+      // Parse existing components
+      if (currentValue) {
+        currentValue.split(';').forEach((entry) => {
+          const [comp, ver] = entry.split(':');
+          components.set(comp, ver);
+        });
+      }
+      // Update or add new component version
+    } catch {
+      console.log('Patch version has incorrect data overriding');
+    }
+
+    components.set(component, version);
+
+    // Convert back to string format
+    const newValue = Array.from(components.entries())
+      .map(([comp, ver]) => `${comp}:${ver}`)
+      .join(';');
+
+    // Update the field
+    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, {
+      fields: {
+        customfield_10458: newValue,
+      },
+    });
+
+    console.log(`Updated component versions for ${issueKey}: ${newValue}`);
+  } catch (error) {
+    console.error(`Error updating Jira component version: ${error.message}`);
+  }
+}
+
+/**
+ * Makes a request to the Jira API using preconfigured client
+ * @param {string} endpoint - The API endpoint (starting with /)
+ * @param {Object} options - Request options (method, body, etc)
+ * @returns {Promise<any>} The response data
+ */
+export async function makeJiraRequest(endpoint, options = {}) {
+  try {
+    const response = await jiraClient.get(endpoint, options);
+    return response.data;
+  } catch (error) {
+    console.error(`Error making Jira request: ${error.message}`);
+    throw error;
+  }
+}

package/src/next/logger.js

@@ -1,17 +1,17 @@
-import { $ as original$ } from 'zx';
-
-// Wrapped version of $
-export const $ = async (strings, ...values) => {
-  const command = strings.reduce(
-    (acc, str, i) => acc + str + (values[i] ?? ''),
-    '',
-  );
-  console.log(`Executing: ${command}`);
-  try {
-    const result = await original$(strings, ...values);
-    return result;
-  } catch (error) {
-    console.error(`Error executing: ${command}`, error);
-    throw error;
-  }
-};
+import { $ as original$ } from 'zx';
+
+// Wrapped version of $
+export const $ = async (strings, ...values) => {
+  const command = strings.reduce(
+    (acc, str, i) => acc + str + (values[i] ?? ''),
+    '',
+  );
+  console.log(`Executing: ${command}`);
+  try {
+    const result = await original$(strings, ...values);
+    return result;
+  } catch (error) {
+    console.error(`Error executing: ${command}`, error);
+    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);
+  }
+}