change regex for latest patch to match whole jsons parts of download …

…page per version
camunda · Oct 11, 2024 · 9ac5a59 · 9ac5a59
1 parent c4d6a61
commit 9ac5a59
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 12 deletions.
diff --git a/common/dist/index.js b/common/dist/index.js
@@ -163780,6 +163780,7 @@ module.exports = async function () {
 
     const getVersionLabels = async function (potentialLabels, latestMinorVersion) {
         const promises = potentialLabels.map(async potentialLabel => {
+
             const minorVersion = getMinorFromPotentialLabel(potentialLabel);
 
             if (minorVersion === latestMinorVersion) {
@@ -163796,10 +163797,10 @@ module.exports = async function () {
             if (!latestPatchVersion) {
                 const calculatedVersionLabel = getVersionLabelFromPotential(potentialLabel); // fallback if GitHub is down, pom version is wrong, error at parsing
                 console.log(`No latest patch version found for potential label: ${potentialLabel}, returning calculated version ${calculatedVersionLabel}`);
-                return calculatedVersionLabel;
+                return getNextPatchVersion(calculatedVersionLabel);
             }
 
-            return latestPatchVersion;
+            return getNextPatchVersion(calculatedVersionLabel);;
         });
 
         // Wait for all promises to settle and filter out null values
@@ -163859,6 +163860,12 @@ module.exports = async function () {
         return match ? match[1] : null;
     }
 
+    const getNextPatchVersion = function (currentVersion) {
+        const versionParts = currentVersion.split('.');
+        versionParts[2] = parseInt(versionParts[2]) + 1;
+        return versionParts.join('.');
+    }
+
     const getLatestPatchVersion = async function (potentialLabel) {
         console.log(`Get latest patch version for issue: #${issueNumber} for potential label:`, potentialLabel);
         try {
@@ -163871,11 +163878,24 @@ module.exports = async function () {
                 console.log(`Minor version found: ${minorVersion}`);
             }
 
-            const patchVersionRegex = new RegExp(`camDownloads\\.branches\\['${minorVersion}'\\]\\s*=\\s*\\[\\s*\\{\\s*number:\\s*'(\\d+\\.\\d+\\.\\d+)'`);
-            const match = downloadPage.match(patchVersionRegex);
+            const patchVersionRegex = new RegExp(`(camDownloads\\.branches\\['${minorVersion}'\\]\\s*=\\s*)(\\[[\\s\\S]*?\\])(\\s*;)`);
+            const matchJson = downloadPage.match(patchVersionRegex);
 
             // Return the version if found, otherwise return null
-            return match ? match[1] : null;
+            let versionsJsonString = matchJson ? matchJson[2] : null;
+
+            if (versionsJsonString == null) {
+                console.log(`No patch version could be extracted for potential label: ${potentialLabel}. Returning null.`);
+                return null;
+            }
+
+            console.log(`Patch Versions to fetch first element:`, versionsJsonString);
+            const extractFirstPatchVersionFromJson = new RegExp(`(\\"number\\":\\")(.*)(\\"\\,)`);
+            const matchFirstPatch = downloadPage.match(extractFirstPatchVersionFromJson);
+            let firstPatchVersion = matchFirstPatch ? matchFirstPatch[1] : null;
+
+            console.log(`The latest version is: ${firstPatchVersion}`);
+            return firstPatchVersion;
         } catch (error) {
             console.error("Error fetching the XML document:", error);
             return null;
@@ -163959,7 +163979,6 @@ module.exports = async function () {
     console.log(`Latest minor version: ${latestVersion}`);
 
     const versionLabels = await getVersionLabels(potentialLabels, latestVersion);
-    console.log(versionLabels);
 
     await setLabels(owner, repoName, issueNumber, versionLabels);
     await removeLabels(owner, repoName, issueNumber, potentialLabels);

diff --git a/common/src/set-version-labels.js b/common/src/set-version-labels.js
@@ -8,6 +8,7 @@ module.exports = async function () {
 
     const getVersionLabels = async function (potentialLabels, latestMinorVersion) {
         const promises = potentialLabels.map(async potentialLabel => {
+
             const minorVersion = getMinorFromPotentialLabel(potentialLabel);
 
             if (minorVersion === latestMinorVersion) {
@@ -24,10 +25,10 @@ module.exports = async function () {
             if (!latestPatchVersion) {
                 const calculatedVersionLabel = getVersionLabelFromPotential(potentialLabel); // fallback if GitHub is down, pom version is wrong, error at parsing
                 console.log(`No latest patch version found for potential label: ${potentialLabel}, returning calculated version ${calculatedVersionLabel}`);
-                return calculatedVersionLabel;
+                return getNextPatchVersion(calculatedVersionLabel);
             }
 
-            return latestPatchVersion;
+            return getNextPatchVersion(calculatedVersionLabel);;
         });
 
         // Wait for all promises to settle and filter out null values
@@ -87,6 +88,12 @@ module.exports = async function () {
         return match ? match[1] : null;
     }
 
+    const getNextPatchVersion = function (currentVersion) {
+        const versionParts = currentVersion.split('.');
+        versionParts[2] = parseInt(versionParts[2]) + 1;
+        return versionParts.join('.');
+    }
+
     const getLatestPatchVersion = async function (potentialLabel) {
         console.log(`Get latest patch version for issue: #${issueNumber} for potential label:`, potentialLabel);
         try {
@@ -99,11 +106,24 @@ module.exports = async function () {
                 console.log(`Minor version found: ${minorVersion}`);
             }
 
-            const patchVersionRegex = new RegExp(`camDownloads\\.branches\\['${minorVersion}'\\]\\s*=\\s*\\[\\s*\\{\\s*number:\\s*'(\\d+\\.\\d+\\.\\d+)'`);
-            const match = downloadPage.match(patchVersionRegex);
+            const patchVersionRegex = new RegExp(`(camDownloads\\.branches\\['${minorVersion}'\\]\\s*=\\s*)(\\[[\\s\\S]*?\\])(\\s*;)`);
+            const matchJson = downloadPage.match(patchVersionRegex);
 
             // Return the version if found, otherwise return null
-            return match ? match[1] : null;
+            let versionsJsonString = matchJson ? matchJson[2] : null;
+
+            if (versionsJsonString == null) {
+                console.log(`No patch version could be extracted for potential label: ${potentialLabel}. Returning null.`);
+                return null;
+            }
+
+            console.log(`Patch Versions to fetch first element:`, versionsJsonString);
+            const extractFirstPatchVersionFromJson = new RegExp(`(\\"number\\":\\")(.*)(\\"\\,)`);
+            const matchFirstPatch = downloadPage.match(extractFirstPatchVersionFromJson);
+            let firstPatchVersion = matchFirstPatch ? matchFirstPatch[1] : null;
+
+            console.log(`The latest version is: ${firstPatchVersion}`);
+            return firstPatchVersion;
         } catch (error) {
             console.error("Error fetching the XML document:", error);
             return null;
@@ -187,7 +207,6 @@ module.exports = async function () {
     console.log(`Latest minor version: ${latestVersion}`);
 
     const versionLabels = await getVersionLabels(potentialLabels, latestVersion);
-    console.log(versionLabels);
 
     await setLabels(owner, repoName, issueNumber, versionLabels);
     await removeLabels(owner, repoName, issueNumber, potentialLabels);