@docupace/pipeline 1.0.35 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/changeset/cli.js

@@ -249,14 +249,24 @@ program
       }
       const jiraTicketId = jiraTicketMatch[0];
 
-      // Step 3: Fetch Jira ticket information
-      const jiraTicketData = await makeJiraRequest(
-        `/rest/api/2/issue/${jiraTicketId}`,
-      );
+      const jiraBaseUrl = 'https://docupacellc.atlassian.net';
+      const jiraEmail = process.env.JIRA_API_EMAIL;
+      const jiraApiKey = process.env.JIRA_API_KEY;
+      const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
+      const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
+      const jiraResponse = await fetch(jiraUrl, {
+        headers: {
+          Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
+          'Content-Type': 'application/json',
+        },
+      });
 
-      if (jiraTicketData.fields.customfield_10107?.value !== 'Product') {
-        throw new Error('Issue Type of Work must be Product');
+      if (!jiraResponse.ok) {
+        throw new Error(
+            `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
+        );
       }
+      const jiraTicketData = await jiraResponse.json();
 
       const jiraSummary = jiraTicketData.fields.summary;
 

package/src/next/cli.js

@@ -4,7 +4,12 @@ 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 {
+  deployAppWithTag,
+  deployFromSite,
+  getDefaultDeploySite,
+  getDeployTag,
+} from './deploy.js';
 import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
@@ -101,10 +106,30 @@ program
   });
 
 program
-  .command('deployTemplate <site>')
+  .command('deploy-template')
   .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(site);
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deployTemplate')
+  .description('Deploy an application for a specific site')
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deploy-app <application>')
+  .description('Deploy an application for a specific site')
+  .action(async (application) => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployAppWithTag(application, env, site, deployTag);
   });
 
 program

package/src/next/copy.js

@@ -30,6 +30,9 @@ export async function copy(application, fromEnv, toEnv, tag) {
 }
 
 export async function copy2(repositoryName, fromEnv, toEnv, tag) {
+  console.log(
+    `Copying repository ${repositoryName} from ${fromEnv} to ${toEnv} for tag ${tag}`,
+  );
   const envInfo = getEnvInfo();
   const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
   const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
@@ -49,4 +52,4 @@ export async function copy2(repositoryName, fromEnv, toEnv, tag) {
   // 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

@@ -266,7 +266,7 @@ export async function writeAndPushDeployConfig(
  * @param {string} site - The site name.
  */
 
-async function getDeployTag() {
+export async function getDeployTag() {
   const gitTag = (
     await $`git tag --points-at HEAD | grep '^v' | head -n 1`
   ).stdout.trim();
@@ -274,12 +274,17 @@ async function getDeployTag() {
   return deployTag;
 }
 
-export async function deployTemplate(site) {
-  const deployTag = await getDeployTag();
+export async function getDefaultDeploySite(deployTag) {
+  const env = deployTag.includes('alpha') ? 'dev' : 'qa';
+  const site = env === 'dev' ? 'financialdev' : 'qa';
+  return { env, site };
+}
+
+export async function deployTemplate(env, site, deployTag) {
   console.log(`Deploying standard template for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
   const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig('graphql-server', 'dev', site);
+    await cloneAndReadDeployConfig('graphql-server', env, site);
 
   deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
 
@@ -292,14 +297,17 @@ export async function deployTemplate(site) {
   console.log('Deployment completed successfully.');
 }
 
-export async function deploy(application, site) {
-  const deployTag = getDeployTag();
-
+export async function deployAppWithTag(application, env, site, deployTag) {
   console.log(`Deploying application: ${application} for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
 
+  if (env !== 'dev') {
+    const appDetails = appInfo[application];
+    await copy2(appDetails.repositoryName, 'dev', env, deployTag);
+  }
+
   const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig(application, 'dev', site);
+    await cloneAndReadDeployConfig(application, env, site);
   const updatedConfigData = setTag(deployConfig, deployTag);
   await writeAndPushDeployConfig(
     repoPath,

package/src/next/jira.js

@@ -74,10 +74,7 @@ export async function updateComponentVersion(issueKey, packageName, version) {
  */
 export async function makeJiraRequest(endpoint, options = {}) {
   try {
-    const response = await jiraClient({
-      url: endpoint,
-      ...options,
-    });
+    const response = await jiraClient.get(endpoint, options);
     return response.data;
   } catch (error) {
     console.error(`Error making Jira request: ${error.message}`);