@docupace/pipeline 1.0.35-matttest.4 → 1.0.35

package/package.json

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

package/src/changeset/cli.js

@@ -249,29 +249,14 @@ program
       }
       const jiraTicketId = jiraTicketMatch[0];
 
-      console.debug('JIRA_API_EMAIL:', process.env.JIRA_API_EMAIL);
-      console.debug('JIRA_API_KEY:', process.env.JIRA_API_KEY);
-      const url = `/rest/api/2/issue/${jiraTicketId}`;
-      console.debug('url: ', url);
-
-      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',
-        },
-      });
+      // Step 3: Fetch Jira ticket information
+      const jiraTicketData = await makeJiraRequest(
+        `/rest/api/2/issue/${jiraTicketId}`,
+      );
 
-      if (!jiraResponse.ok) {
-        throw new Error(
-            `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
-        );
+      if (jiraTicketData.fields.customfield_10107?.value !== 'Product') {
+        throw new Error('Issue Type of Work must be Product');
       }
-      const jiraTicketData = await jiraResponse.json();
 
       const jiraSummary = jiraTicketData.fields.summary;
 

package/src/next/cli.js

@@ -4,12 +4,7 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import {
-  deployAppWithTag,
-  deployFromSite,
-  getDefaultDeploySite,
-  getDeployTag,
-} from './deploy.js';
+import { deployFromSite } from './deploy.js';
 import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
@@ -106,30 +101,10 @@ program
   });
 
 program
-  .command('deploy-template')
+  .command('deployTemplate <site>')
   .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('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);
+  .action(async (site) => {
+    await deployTemplate(site);
   });
 
 program

package/src/next/deploy.js

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

package/src/next/jira.js

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