@docupace/pipeline 1.0.115 → 1.0.117

package/package.json

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

package/src/changeset/changelog.js

@@ -83,6 +83,9 @@ function getJiraVersions(changes) {
   return versions;
 }
 
+// Prevents concurrent calls for the same ticket from uploading to Canny more than once
+const cannyUploadCache = new Map();
+
 async function getLabelIDs(labels) {
   let cannyConfig;
   try {
@@ -133,17 +136,21 @@ async function fetchNewLink(oldLink, params) {
       return;
     }
 
-    const uploadToCannyInternal = async () => {
-      const changes = getChanges(params);
-      const jiraVersions = getJiraVersions(changes);
-      const labels = getLabels(changes);
-      const labelIDs = await getLabelIDs([...labels, ...jiraVersions]);
-      if (labelIDs.length > 0) {
-        const data = await uploadToCanny(releaseNote, labelIDs);
-        return data;
-      } else {
-        return null;
+    const uploadToCannyInternal = () => {
+      if (!cannyUploadCache.has(mainTicketId)) {
+        const uploadPromise = (async () => {
+          const changes = getChanges(params);
+          const jiraVersions = getJiraVersions(changes);
+          const labels = getLabels(changes);
+          const labelIDs = await getLabelIDs([...labels, ...jiraVersions]);
+          if (labelIDs.length > 0) {
+            return uploadToCanny(releaseNote, labelIDs);
+          }
+          return null;
+        })();
+        cannyUploadCache.set(mainTicketId, uploadPromise);
       }
+      return cannyUploadCache.get(mainTicketId);
     };
 
     const uploadToJiraInternal = async (ticketId, url) => {

package/src/changeset/version.js

@@ -27,7 +27,7 @@ const getChangeSetPackage = (installLatest = false) => `{
   "license": "ISC",
   "dependencies": {},
   "devDependencies": {
-    "@changesets/cli": "^2.27.10",
+    "@changesets/cli": "2.27.10",
     "@docupace/pipeline": "${installLatest ? 'latest' : getPackageVersion()}"
   }
 }

package/src/micro/ms-deploy.js

@@ -121,7 +121,7 @@ export async function deployMicroservice(
     process.env.BITBUCKET_USERNAME &&
     process.env.BITBUCKET_APP_PASSWORD
   ) {
-    repoUrl = `https://${process.env.BITBUCKET_USERNAME}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
+    repoUrl = `https://${encodeURIComponent(process.env.BITBUCKET_USERNAME)}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
   } else {
     throw new Error(
       'No authentication credentials found for GitOps repository',
@@ -302,7 +302,7 @@ export async function microserviceBuildPushImage(repoName, options = {}) {
     const imageExists = await checkLocalImage(TAG_IMAGE_NAME);
     let SHA_IMAGE_NAME = '';
     if (!imageExists) {
-      const repoUrl = `https://${process.env.BITBUCKET_USERNAME}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
+      const repoUrl = `https://${encodeURIComponent(process.env.BITBUCKET_USERNAME)}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
       await $`git clone --branch ${options.tag} --depth 1 ${repoUrl} ${repoName}`;
 
       console.log('Checking if directory exists...');

package/src/next/config.js

@@ -133,7 +133,8 @@ export const getBitbucketInfo = () => {
 
 export const getRepUrl = (repoName) => {
   const { username, password, workspace } = getBitbucketInfo();
-  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+  const encodedUsername = encodeURIComponent(username);
+  return `https://${encodedUsername}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
 };
 
 export const jfRegistryUrl = 'registry.paperout.com';

package/src/next/connect.js

@@ -63,7 +63,7 @@ async function gitCheckout(repository, destDir, branch = 'master') {
   const password = process.env.BITBUCKET_APP_PASSWORD;
 
   // Construct clone command
-  const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
+  const cloneUrl = `https://${encodeURIComponent(username)}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
 
   log(`Perform cloning`);
   await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;