@docupace/pipeline 1.0.93 → 1.0.95

package/package.json

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

package/src/next/cli.js

@@ -135,9 +135,14 @@ program
 program
   .command('deploy-app <application>')
   .description('Deploy an application for a specific site')
-  .action(async (application) => {
+  .option('-e, --env <env>', 'Target environment (overrides default sites)')
+  .option('-s, --site <site>', 'Target site (overrides default sites)')
+  .action(async (application, options) => {
     const deployTag = await getDeployTag();
-    const sites = await getDefaultDeploySite(deployTag);
+    const sites =
+      options.env && options.site
+        ? [{ env: options.env, site: options.site }]
+        : await getDefaultDeploySite(deployTag);
     for (const { env, site } of sites) {
       await deployAppWithTag(application, env, site, deployTag);
     }
@@ -146,10 +151,15 @@ program
 program
   .command('deploy-mono-app <tag> <application>')
   .description('Deploy an mono application for a specific site')
-  .action(async (tag, application) => {
+  .option('-e, --env <env>', 'Target environment (overrides default sites)')
+  .option('-s, --site <site>', 'Target site (overrides default sites)')
+  .action(async (tag, application, options) => {
     const deployTag = await getDeployTag(tag);
     const version = 'v' + deployTag.split('@')[1];
-    const sites = await getDefaultDeploySite(version);
+    const sites =
+      options.env && options.site
+        ? [{ env: options.env, site: options.site }]
+        : await getDefaultDeploySite(version);
     for (const { env, site } of sites) {
       await deployAppWithTag(application, env, site, version);
     }

package/src/next/deploy.js

@@ -70,7 +70,7 @@ async function updateAndCommitConnectVersion(
 
     console.log('🧹 Cleaning up...');
     await $`rm -rf ${connectDeployPath}`;
-    console.log('✅ Cleanup complete.');
+    console.log('Cleanup complete.');
   } catch (error) {
     console.error('Error updating Connect version:', error);
     throw error;
@@ -183,13 +183,19 @@ function getAppTypesFromRepo(env, site) {
 export async function readDeployConfig(application, env, site, name) {
   const { deployConfigFilePath } = getConfigPath(application, env, site, name);
 
-  let deployConfig;
+  let deployConfig = null;
   try {
     deployConfig = yaml.load(fs.readFileSync(deployConfigFilePath, 'utf8'));
     console.log(`YAML file loaded from: ${deployConfigFilePath}`);
   } catch (error) {
-    console.error(`Error reading YAML file: ${error.message}`);
-    process.exit(1);
+    if (error.code === 'ENOENT') {
+      console.log(
+        `⚠️  No version found for ${application} in ${env}/${site} (${deployConfigFilePath} does not exist), skipping`,
+      );
+    } else {
+      console.error(`Error reading YAML file: ${error.message}`);
+      process.exit(1);
+    }
   }
 
   return { deployConfig, deployConfigFilePath };
@@ -240,7 +246,7 @@ export async function pushDeployConfig(repoPath, commitMessage) {
     await $`cd ${repoPath} && git status --porcelain`
   ).stdout.trim();
   if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
+    console.log('No changes to commit. Exiting.');
     await $`rm -rf ${repoPath}`;
     console.log('🧹 Cleanup complete.');
     return;
@@ -265,17 +271,17 @@ export async function pushDeployConfig(repoPath, commitMessage) {
   await $`cd ${repoPath} && git add .`;
   await $`cd ${repoPath} && git commit -m ${commitMessage}`;
   await $`cd ${repoPath} && git push`;
-  console.log('✅ Changes pushed to the remote repository.');
+  console.log('Changes pushed to the remote repository.');
 
   console.log('🧹 Cleaning up...');
   await $`rm -rf ${repoPath}`;
-  console.log('✅ Cleanup complete.');
+  console.log('Cleanup complete.');
 }
 
 function writeDeployConfig(deployConfigFilePath, deployConfig) {
   try {
     fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
-    console.log(`✅ Updated YAML file saved at: ${deployConfigFilePath}`);
+    console.log(`Updated YAML file saved at: ${deployConfigFilePath}`);
   } catch (error) {
     console.error(`❌ Error writing YAML file: ${error.message}`);
     process.exit(1);
@@ -506,6 +512,10 @@ export async function deployApp(
     'values',
   );
 
+  if (!fromDeployConfig) {
+    return false;
+  }
+
   if (fromEnv !== toEnv) {
     await copy2(
       appDetails.repositoryName,
@@ -522,6 +532,10 @@ export async function deployApp(
     deployConfigFilePath: toDeployConfigFilePath,
   } = await readDeployConfig(application, toEnv, toSite, 'values');
 
+  if (!toDeployConfig) {
+    return false;
+  }
+
   // Update target configuration using attributes specified in appInfo
   for (const attribute of appDetails.deployAttributes) {
     const sourceValue = lodash.get(fromDeployConfig, attribute);
@@ -582,23 +596,40 @@ async function updateAutoDeployVersion(
   oldVersion,
   newVersion,
 ) {
+  console.log(
+    `Info: Checking auto-deploy version update for ${toEnv}/${toSite}: ${oldVersion} → ${newVersion}`,
+  );
+
   const oldMajorMinor = extractMajorMinor(oldVersion);
   const newMajorMinor = extractMajorMinor(newVersion);
 
-  if (!oldMajorMinor || !newMajorMinor || oldMajorMinor === newMajorMinor) {
+  if (!oldMajorMinor || !newMajorMinor) {
+    console.log(
+      `Info: Could not parse major.minor from versions (old: ${oldVersion}, new: ${newVersion}), skipping auto-deploy update`,
+    );
+    return false;
+  }
+
+  if (oldMajorMinor === newMajorMinor) {
+    console.log(
+      `Info: Major.minor version unchanged (${newMajorMinor}), skipping auto-deploy update`,
+    );
     return false;
   }
 
   if (newVersion.toLowerCase().includes('alpha') || newVersion.includes('-')) {
+    console.log(
+      `Info: New version (${newVersion}) is a pre-release, skipping auto-deploy update`,
+    );
     return false;
   }
 
-  const { repoPath } = getRepoLocalPath(fromEnv);
-  const autoDeployConfigPath = path.join(repoPath, autoDeployConfigName);
+  const { repoPath: devRepoPath } = getRepoLocalPath('dev');
+  const autoDeployConfigPath = path.join(devRepoPath, autoDeployConfigName);
 
   if (!fs.existsSync(autoDeployConfigPath)) {
     console.log(
-      `Info: ${autoDeployConfigName} not found in ${fromEnv}, skipping auto-deploy update`,
+      `Info: ${autoDeployConfigName} not found in gitops-dev, skipping auto-deploy update`,
     );
     return false;
   }
@@ -639,6 +670,112 @@ async function updateAutoDeployVersion(
   return true;
 }
 
+/**
+ * Validate that all deployed components have internally consistent versions and
+ * share the same major.minor across the board before a git commit.
+ *
+ * Per-app checks:
+ *  - image.tag major.minor == app.yaml revision major.minor
+ *    (handles both plain "v1.21.3" and prefixed "enterprise-ui-app@1.21.6" revisions)
+ *  - graphql-server additionally: image.tag major.minor == standardConfigRemoteBranch major.minor
+ *
+ * Cross-app check:
+ *  - all deployed components must share the same major.minor
+ *
+ * @param {string} env
+ * @param {string} site
+ * @param {object} deployedApps - appInfoLocal map of { appName: appDetails }
+ * @throws {Error} if any version mismatch is detected
+ */
+async function validateDeployVersionConsistency(env, site, deployedApps) {
+  console.log(
+    `Validating version consistency for all components in ${env}/${site}...`,
+  );
+
+  const mismatches = [];
+  const appVersions = [];
+
+  for (const [application] of Object.entries(deployedApps)) {
+    const { deployConfigFilePath: valuesPath } = getConfigPath(
+      application,
+      env,
+      site,
+      'values',
+    );
+    const { deployConfigFilePath: appPath } = getConfigPath(
+      application,
+      env,
+      site,
+      'app',
+    );
+
+    if (!fs.existsSync(valuesPath) || !fs.existsSync(appPath)) {
+      console.log(
+        `⚠️  Skipping version consistency check for ${application}: config files missing in ${env}/${site}`,
+      );
+      continue;
+    }
+
+    const valuesConfig = yaml.load(fs.readFileSync(valuesPath, 'utf8'));
+    const appConfig = yaml.load(fs.readFileSync(appPath, 'utf8'));
+
+    const imageTag = valuesConfig?.image?.tag;
+    const revision = appConfig?.revision;
+
+    // Extract bare version from revision (e.g. "enterprise-ui-app@1.21.6" → "1.21.6")
+    const revisionVersion = revision?.includes('@')
+      ? revision.split('@')[1]
+      : revision;
+
+    const imageMajorMinor = extractMajorMinor(imageTag);
+    const revisionMajorMinor = extractMajorMinor(revisionVersion);
+
+    if (imageMajorMinor && revisionMajorMinor) {
+      if (imageMajorMinor !== revisionMajorMinor) {
+        mismatches.push(
+          `${application}: image.tag (${imageTag}) does not match app.yaml revision (${revision}) on major.minor`,
+        );
+      }
+    }
+
+    if (application === 'graphql-server') {
+      const standardConfigBranch =
+        valuesConfig?.graphqlServer?.standardConfigRemoteBranch;
+      const standardConfigMajorMinor = extractMajorMinor(standardConfigBranch);
+      if (imageMajorMinor && standardConfigMajorMinor) {
+        if (imageMajorMinor !== standardConfigMajorMinor) {
+          mismatches.push(
+            `graphql-server: image.tag (${imageTag}) does not match graphqlServer.standardConfigRemoteBranch (${standardConfigBranch}) on major.minor`,
+          );
+        }
+      }
+    }
+
+    if (imageMajorMinor) {
+      appVersions.push({ application, imageTag, majorMinor: imageMajorMinor });
+    }
+  }
+
+  const uniqueMajorMinors = [...new Set(appVersions.map((a) => a.majorMinor))];
+  if (uniqueMajorMinors.length > 1) {
+    const versionList = appVersions
+      .map((a) => `${a.application} (${a.imageTag})`)
+      .join(', ');
+    mismatches.push(
+      `cross-app: components are on different major.minor versions: ${versionList}`,
+    );
+  }
+
+  if (mismatches.length > 0) {
+    throw new Error(
+      `❌ Version consistency validation failed for ${env}/${site}:\n${mismatches.map((m) => `  - ${m}`).join('\n')}`,
+    );
+  }
+
+  console.log(
+    `✅ Version consistency validated for ${env}/${site}: all ${appVersions.length} component(s) aligned on ${uniqueMajorMinors[0] ?? 'n/a'}`,
+  );
+}
 export async function deployFromSite(
   fromEnv,
   fromSite,
@@ -789,9 +926,14 @@ export async function deployFromSite(
   const toRepoPath =
     toEnv === fromEnv ? fromRepoPath : await cloneEnvRepository(toEnv);
 
+  // Ensure gitops-dev is cloned for auto-deploy version checking
+  if (fromEnv !== 'dev' && toEnv !== 'dev') {
+    await cloneEnvRepository('dev');
+  }
+
   // Initialize a flag to track changes
   let changesMade = false;
-  const applications = await getAppTypesFromRepo(toEnv, toSite);
+  const applications = getAppTypesFromRepo(fromEnv, fromSite);
   console.log(applications);
   // Iterate over applications in appInfo
 
@@ -844,8 +986,10 @@ export async function deployFromSite(
         toSite,
         'values',
       );
-      newVersion = fromConfig.image?.tag;
-      oldVersion = toConfig.image?.tag;
+      if (fromConfig && toConfig) {
+        newVersion = fromConfig.image?.tag;
+        oldVersion = toConfig.image?.tag;
+      }
     }
 
     let cm = await deployApp(
@@ -861,7 +1005,15 @@ export async function deployFromSite(
     }
   }
 
-  if (oldVersion && newVersion && oldVersion !== newVersion) {
+  if (!oldVersion || !newVersion) {
+    console.log(
+      `Info: Could not determine versions for auto-deploy check (old: ${oldVersion}, new: ${newVersion})`,
+    );
+  } else if (oldVersion === newVersion) {
+    console.log(
+      `Info: Version unchanged (${newVersion}), skipping auto-deploy update`,
+    );
+  } else {
     const autoDeployUpdated = await updateAutoDeployVersion(
       fromEnv,
       toEnv,
@@ -871,7 +1023,7 @@ export async function deployFromSite(
     );
     if (autoDeployUpdated) {
       console.log(
-        `Info: auto-deploy.yaml updated for ${toEnv}/${toSite} due to version change ${oldVersion} → ${newVersion}`,
+        `Info: auto-deploy.yaml updated for ${toEnv}/${toSite}: ${oldVersion} → ${newVersion}`,
       );
       changesMade = true;
     }
@@ -879,12 +1031,13 @@ export async function deployFromSite(
 
   // Push all changes if any updates were made
   if (changesMade) {
+    await validateDeployVersionConsistency(toEnv, toSite, appInfoLocal);
     await pushDeployConfig(
       toRepoPath,
       `Updated deployment configurations from ${fromEnv}/${fromSite} to ${toEnv}/${toSite}`,
     );
-    console.log('✅ All configurations updated and pushed successfully.');
+    console.log('All configurations updated and pushed successfully.');
   } else {
-    console.log('✅ No changes detected. Nothing to push.');
+    console.log('No changes detected. Nothing to push.');
   }
 }