@docupace/pipeline 1.0.85 → 1.0.87

package/src/merge/cli-merge.js

@@ -2,7 +2,7 @@ import { execSync } from 'child_process';
 import { createBitbucketPR } from './pr.js';
 import { autoResolveConflicts } from './cli-resolve.js';
 import { getPackageNames } from '../changeset/package-util.js';
-import { writeChangesetFile } from '../changeset/create.js';
+import { writeChangesetFile } from '../changeset/create-simple.js';
 import { BuildResults } from './common.js';
 
 /**
@@ -83,7 +83,7 @@ function attemptMerge(sourceBranch, targetBranch, verbose = false) {
       if (verbose) console.log('✅ Merge completed with changes, no conflicts');
       return { hasConflicts: false, hasChanges: true };
     }
-  } catch (error) {
+  } catch {
     if (verbose) console.log('⚠️  Merge conflicts detected');
     return { hasConflicts: true, hasChanges: true };
   }
@@ -141,7 +141,7 @@ function runBuild(buildScript, verbose = false) {
     });
     if (verbose) console.log('✅ Build passed');
     return true;
-  } catch (error) {
+  } catch {
     if (verbose) console.log('❌ Build failed');
     return false;
   }
@@ -283,7 +283,7 @@ function cleanupFailedMerge(verbose = false) {
   try {
     execSync('git merge --abort', { stdio: 'pipe' });
     if (verbose) console.log('🧹 Cleaned up failed merge');
-  } catch (cleanupError) {
+  } catch {
     // Ignore cleanup errors
   }
 }

package/src/merge/merge-changelog.js

@@ -72,7 +72,7 @@ export function mergeChangelogFile(filePath) {
     try {
       execSync(`git add ${filePath}`);
       console.log('📝 File added to git staging area');
-    } catch (error) {
+    } catch {
       console.log(
         '⚠️  Could not add file to git (may not be in a git repository)',
       );

package/src/merge/pr.js

@@ -40,7 +40,7 @@ export async function getExistingPRsWithDescription(
     // Check each repository for matching PRs
     for (const repo of repositories) {
       try {
-        const match = repo.url.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+        const match = repo.url.match(/bitbucket\.org[/:]([^/]+)\/([^/.]+)/);
 
         if (!match) {
           console.warn(`Could not parse repository URL: ${repo.url}`);
@@ -104,7 +104,7 @@ export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
     const remoteUrl = execSync('git config --get remote.origin.url', {
       encoding: 'utf-8',
     }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+    const match = remoteUrl.match(/bitbucket\.org[/:]([^/]+)\/([^/.]+)/);
 
     if (!match) {
       throw new Error(
@@ -165,7 +165,7 @@ export async function createBitbucketPR(
     const remoteUrl = execSync('git config --get remote.origin.url', {
       encoding: 'utf-8',
     }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+    const match = remoteUrl.match(/bitbucket\.org[/:]([^/]+)\/([^/.]+)/);
 
     if (!match) {
       throw new Error(

package/src/next/connect.js

@@ -2,7 +2,6 @@ import 'zx/globals'; // npm i zx
 import fs from 'fs-extra';
 import path from 'path';
 import { $ } from 'zx';
-import { getAuth0Metadata } from '../auth0/metadata.js';
 import { getVaultSecrets } from '../auth0/vault.js';
 
 process.env.COMMON_VAULT_PATH =
@@ -12,14 +11,6 @@ process.env.CONNECT_DIR = process.env.CONNECT_DIR || 'connect';
 const vaultToken = process.env.VAULT_TOKEN;
 const vaultAddr = process.env.VAULT_ADDR;
 
-const connectUIEnvMap = {
-  dev: 'dev',
-  qa: 'preprod',
-  stage: 'stg',
-  uat: 'uat',
-  prod: 'prod-www3',
-};
-
 const siteSettingsEnvMap = {
   dev: 'dev',
   preprod: 'preprod',

package/src/next/deploy.js

@@ -306,14 +306,14 @@ export async function getDeployTag(prefix = 'v') {
 }
 
 function getDeploymentTargets(tag, config) {
-  const semverRegex = /^v?(\d+)\.(\d+)\.(\d+)(?:-([\w.\-]+))?$/;
+  const semverRegex = /^v?(\d+)\.(\d+)\.(\d+)(?:-([\w.-]+))?$/;
   const match = tag.match(semverRegex);
 
   if (!match) {
     throw new Error(`Invalid tag format: ${tag}`);
   }
 
-  const [_, major, minor, patch, preRelease] = match;
+  const [major, minor, preRelease] = match;
   const isAlpha = preRelease && preRelease.toLowerCase().includes('alpha');
 
   return config
@@ -564,7 +564,14 @@ export async function deployFromSite(
     `Deploying changes from ${fromSite} in ${fromEnv} to ${toSite} in ${toEnv}${jiraTicket ? ` approved by JIRA ticket ${jiraTicket}` : ''}`,
   );
 
-  if (jiraTicket) {
+  if (toEnv === 'prod') {
+    if (!jiraTicket) {
+      console.error(
+        'The deployment to prod environment requires a JIRA ticket to be provided',
+      );
+      process.exit(1);
+    }
+
     try {
       const response = await makeJiraRequest(`/rest/api/2/issue/${jiraTicket}`);
       const docupacecInstance = response.fields.customfield_10045.value;
@@ -595,34 +602,59 @@ export async function deployFromSite(
         process.exit(1);
       }
 
-      if (toEnv === 'prod') {
-        if (docupacecInstance !== 'Production') {
-          console.error(
-            `The deployment to prod environment requires Docupace Instance to be "Production", but got "${docupacecInstance}"`,
-          );
-          console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
-          process.exit(1);
-        }
-
-        if (fromSite !== toSite) {
-          console.error(
-            `The deployment to prod environment requires fromSite and toSite to be equal, but fromSite: "${fromSite}", toSite: "${toSite}"`,
-          );
-          console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
-          process.exit(1);
-        }
-
-        console.log('Production deployment validations passed');
+      if (docupacecInstance !== 'Production') {
+        console.error(
+          `The deployment to prod environment requires Docupace Instance to be "Production", but got "${docupacecInstance}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      if (fromSite !== toSite) {
+        console.error(
+          `The deployment to prod environment requires fromSite and toSite to be equal, but fromSite: "${fromSite}", toSite: "${toSite}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      console.log('Production deployment validations passed');
+    } catch (error) {
+      console.error(`Failed to make a Jira request: ${error.message}`);
+      process.exit(1);
+    }
+  } else if (jiraTicket) {
+    try {
+      const response = await makeJiraRequest(`/rest/api/2/issue/${jiraTicket}`);
+      const siteUrl = response.fields.customfield_10041;
+      const status = response.fields.status.name;
+      const jiraBaseUrl = response.self.split('/rest/api')[0];
+      const jiraTicketUrl = `${jiraBaseUrl}/browse/${response.key}`;
+
+      console.log(`Docupace Site URL: ${siteUrl}`);
+      console.log(`JIRA Ticket Status: ${status}`);
+      console.log(`JIRA Ticket URL: ${jiraTicketUrl}`);
+
+      const allowedStatuses = ['To Do', 'In Progress'];
+      if (!allowedStatuses.includes(status)) {
+        console.error(
+          `The JIRA ticket status must be "To Do" or "In Progress", but got "${status}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      if (!siteUrl.includes(toSite)) {
+        console.error(
+          `The toSite "${toSite}" must be present in the Docupace Site URL: "${siteUrl}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
       }
     } catch (error) {
       console.error(`Failed to make a Jira request: ${error.message}`);
       process.exit(1);
     }
-  } else if (toEnv === 'prod') {
-    console.error(
-      'The deployment to prod environment requires a JIRA ticket to be provided',
-    );
-    process.exit(1);
   }
 
   if (isDeployCore === 'true') {

package/src/next/jira.js

@@ -12,6 +12,57 @@ const jiraClient = axios.create({
   },
 });
 
+export async function getJiraReleaseNotes(issueKey) {
+  try {
+    const response = await jiraClient.get(
+      `/rest/api/2/issue/${issueKey}?fields=customfield_10108,customfield_11625`,
+    );
+
+    const releaseNotesField = response.data.fields.customfield_10108;
+    const url = response.data.fields.customfield_11625;
+
+    // Extract text from the document structure
+
+    return { summary: releaseNotesField, url };
+  } catch (error) {
+    console.error(
+      `Error getting Jira release notes for ${issueKey}: ${error.message}`,
+    );
+    throw error;
+  }
+}
+
+/**
+ * Updates the release notes in the Jira issue's custom field
+ * @param {string} issueKey - The Jira issue key
+ * @param {string} text - The release notes text to set
+ */
+export async function updateJiraReleaseNotes(
+  issueKey,
+  text,
+  url,
+  jiraVersions,
+) {
+  try {
+    const payload = {
+      fields: {
+        customfield_10108: text,
+        customfield_11625: url,
+        fixVersions: jiraVersions.map((version) => ({ name: version })),
+      },
+    };
+
+    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, payload);
+
+    console.log(`Updated release notes for ${issueKey}`);
+  } catch (error) {
+    console.error(
+      `Error updating Jira release notes for ${issueKey}: ${error.message}`,
+    );
+    throw error;
+  }
+}
+
 /**
  * Updates the component version custom field in Jira
  * @param {string} issueKey - The Jira issue key

package/src/next/util.js

@@ -85,7 +85,7 @@ export async function getChangedAppPackages() {
 }
 
 export async function setGitInfo() {
-  if (!process.env.IS_DEV) {
+  if (process.env.SET_GITOPS_USER) {
     await $`git config --global user.email "gitops@docupace.com"`;
     await $`git config --global user.name "Gitops"`;
     const repoUrl = `git@bitbucket.org:dp-cloud/${process.env.BITBUCKET_REPO_SLUG}.git`;

package/testCanny.sh

@@ -0,0 +1,4 @@
+
+
+curl https://canny.io/api/v1/tags/list -X POST \
+    -d apiKey=c2aa36c6-8789-aac0-2f22-cbcfdf488b4c