@docupace/pipeline 1.0.66-alpha.0 → 1.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.67",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/auth0/cli.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
   .command(
-    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3Ui> <deployCCUI> <useS3Gq> ',
+    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3Ui> <deployCCUI> <useS3Gq> [auth0Tenant]',
   )
   .description('Configure the Auth0 tenants in env for the given site')
   .action(
@@ -30,6 +30,7 @@ program
       useS3Ui,
       deployCCUI,
       useS3Gq,
+      auth0Tenant = '',
     ) => {
       await configureFromSite(
         fromSite,
@@ -42,6 +43,7 @@ program
         useS3Ui === 'true' || useS3Ui === true,
         deployCCUI,
         useS3Gq === 'true' || useS3Gq === true,
+        auth0Tenant,
       );
     },
   );

package/src/auth0/configure.js

@@ -674,6 +674,7 @@ export async function configureFromSite(
   useS3Ui,
   deployCCUI,
   useS3Gq,
+  auth0Tenant,
 ) {
   console.log(
     `Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`,
@@ -688,8 +689,13 @@ export async function configureFromSite(
     getVaultSecretsConfigs(toSite).siteCommonSecretsPath;
   console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`);
   const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
+  let auth0Domain;
+  if (auth0Tenant === '') {
+    auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`;
+  } else {
+    auth0Domain = `${auth0Tenant}.us.auth0.com`;
+  }
 
-  const auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`;
   const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
   const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
   const auth0Token = await getAuth0AuthToken(

package/src/next/deploy.js

@@ -7,6 +7,8 @@ import { appInfo, environmentConfig, getRepUrl } from './config.js';
 import { copy2 } from './copy.js';
 import axios from 'axios';
 import { deployConnect, deployCore } from './jenkins.js';
+import { gitDescribeToSemver } from './git-to-semver.js';
+import semver from 'semver';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -377,24 +379,27 @@ async function getAppInfo(coreUrl) {
   return await axios.get(url);
 }
 
-function getBranchNameFromVersion(version) {
-  const match = version.match(/(\d+\.\d+\.[^\-]+)(?:-(\d+)-g([a-f0-9]+))?/);
-
-  if (!match) {
-    throw new Error(`Invalid version format: ${version}`);
-  }
-
-  const fullVersion = match[1]; // e.g., 24.19.19, 24.20.alpha3, etc.
-  const customBranch = match[2]; // e.g., 4, 58, or 0
-  const commitHash = match[3]; // e.g., 668edef58e, 634cf6c904, etc.
-
-  // If "alpha" is in the version or customBranch is non-zero, use the commit hash
-  if (fullVersion.includes('alpha') || (customBranch && customBranch !== '0')) {
-    return commitHash;
+export function getBranchNameFromVersion(version) {
+  let parsed;
+  try {
+    const semverVersion = gitDescribeToSemver(version);
+    parsed = semver.parse(semverVersion);
+    let newVersion;
+    if (parsed.prerelease.length > 0) {
+      newVersion = parsed.build[1].slice(1);
+    } else if (parsed.build[0] != '0') {
+      console.error(`❌ This version is a custom branch. Deployment canceled.`);
+      process.exit(1);
+    } else {
+      newVersion = 'v' + parsed.version;
+    }
+    console.log(`Extracted version ${newVersion} from ${version}`);
+    return newVersion;
+  } catch {
+    console.log(`Error parsing version : ${version}`);
+    console.log('Parsed Object:');
+    console.log(parsed);
   }
-
-  // Otherwise, use the full version
-  return 'v' + fullVersion;
 }
 
 async function getCoreBranchName(fromEnv, fromSite) {

package/src/next/git-to-semver.js

@@ -0,0 +1,79 @@
+/**
+ * Converts git describe output to semantic versioning format
+ *
+ * Logic based on dash count:
+ * - 2 dashes: Released version with commits (v1.2.3-4-g1234567 -> 1.2.3+4.g1234567)
+ * - 3 dashes: Pre-release with commits (v1.2.3-rc.1-4-g1234567 -> 1.2.3-rc.1+4.g1234567)
+ * - 1 dash: Pre-release tag only (v1.2.3-rc.1 -> 1.2.3-rc.1)
+ * - 0 dashes: Clean tag (v1.2.3 -> 1.2.3)
+ *
+ * @param {string} gitDescribe - The output from git describe
+ * @return {string} Semver compatible version string
+ */
+export function gitDescribeToSemver(gitDescribe) {
+  if (!gitDescribe || typeof gitDescribe !== 'string') {
+    throw new Error('Invalid input: git describe string required');
+  }
+
+  // Remove leading 'v' if present
+  let version = gitDescribe.trim();
+  if (version.startsWith('v') || version.startsWith('V')) {
+    version = version.substring(1);
+  }
+
+  // Count dashes to determine format
+  const dashCount = (version.match(/-/g) || []).length;
+
+  switch (dashCount) {
+    case 0:
+      // Clean tag: 1.2.3
+      return version;
+
+    case 1:
+      // Pre-release tag only: 1.2.3-rc.1
+      return version;
+
+    case 2: {
+      // Released version with commits: 1.2.3-4-g1234567
+      // Split: [1.2.3, 4, g1234567]
+      const parts = version.split('-');
+      const baseVersion = parts[0];
+      const commits = parts[1];
+      const hash = parts[2];
+      return `${baseVersion}+${commits}.${hash}`;
+    }
+
+    case 3: {
+      // Pre-release with commits: 1.2.3-rc.1-4-g1234567
+      // Split: [1.2.3, rc.1, 4, g1234567]
+      const parts = version.split('-');
+      const baseVersion = parts[0];
+      const prerelease = parts[1];
+      const commits = parts[2];
+      const hash = parts[3];
+      return `${baseVersion}-${prerelease}+${commits}.${hash}`;
+    }
+
+    default: {
+      // More than 3 dashes - handle complex pre-release tags
+      // e.g., 1.2.3-rc-1-beta-4-g1234567
+      // Assume last two parts are commits-hash
+      const parts = version.split('-');
+      if (
+        parts.length >= 3 &&
+        /^\d+$/.test(parts[parts.length - 2]) &&
+        /^g[a-f0-9]+$/.test(parts[parts.length - 1])
+      ) {
+        // Has commits and hash at the end
+        const commits = parts[parts.length - 2];
+        const hash = parts[parts.length - 1];
+        const versionParts = parts.slice(0, -2);
+        const baseVersion = versionParts[0];
+        const prerelease = versionParts.slice(1).join('-');
+        return `${baseVersion}-${prerelease}+${commits}.${hash}`;
+      }
+      // No commits/hash pattern found, treat as complex pre-release
+      return version;
+    }
+  }
+}

package/src/next/test.js

@@ -0,0 +1,5 @@
+import { getBranchNameFromVersion } from './deploy.js';
+
+getBranchNameFromVersion('25.2.0-alpha.18-3-g4e0e088aa0');
+getBranchNameFromVersion('25.1.13-0-g7798cf7138');
+getBranchNameFromVersion('25.1.13-3-g7798cf7138');