@docupace/pipeline 1.0.27 → 1.0.28-matttest.0

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/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

@@ -333,7 +333,7 @@ function getBranchNameFromVersion(version) {
   }
 
   // Otherwise, use the full version
-  return fullVersion;
+  return 'v' + fullVersion;
 }
 
 async function getCoreBranchName(fromEnv, fromSite) {

package/src/next/jira.js

@@ -0,0 +1,86 @@
+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',
+  },
+});
+
+const packageComponents = {
+  'docupace-ui': 'next-ui',
+  'docupace-graphql-server': 'graphql-server',
+  template: 'template',
+};
+/**
+ * Updates the component version custom field in Jira
+ * @param {string} issueKey - The Jira issue key
+ * @param {string} component - The component name
+ * @param {string} version - The version to set
+ */
+export async function updateComponentVersion(issueKey, packageName, version) {
+  const component = packageComponents[packageName] ?? 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();
+
+    // Parse existing components
+    if (currentValue) {
+      currentValue.split(';').forEach((entry) => {
+        const [comp, ver] = entry.split(':');
+        components.set(comp, ver);
+      });
+    }
+
+    // Update or add new component version
+    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({
+      url: endpoint,
+      ...options,
+    });
+    return response.data;
+  } catch (error) {
+    console.error(`Error making Jira request: ${error.message}`);
+    throw error;
+  }
+}