@docupace/pipeline 1.0.111 → 1.0.113-test

package/.changeset/eks-migration-sync.md

@@ -0,0 +1,5 @@
+---
+"@docupace/pipeline": patch
+---
+
+feat: sync image tag to eks-migration branch after deploy

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @docupace/pipeline
 
+## 1.0.112
+
+### Patch Changes
+
+- 30d5209: Added to install latest
+- 664ac05: Fix to build
+- e738539: Add deploy for specific version from pipeline
+
 ## 1.0.111
 
 ### Patch Changes

package/README.md

@@ -48,8 +48,15 @@ dp-next-cli [command] [options]
   - `-t, --to-env <toEnv>`: Target environment
   - `-F, --from-site <fromSite>`: Source site
   - `-T, --to-site <toSite>`: Target site
+  - `-j, --jira-ticket [jiraTicket]`: JIRA ticket (optional)
   - `-c, --deploy-core <deployCore>`: Deploy Core (default: "false")
   - `-C, --deploy-connect <deployConnect>`: Deploy Connect (default: "false")
+- `update-site-version <env> <site>`: Update specific version components for a site
+  - `-u, --ui-version <uiVersion>`: UI image tag
+  - `-g, --graph-version <graphVersion>`: GraphQL-server image tag
+  - `-S, --standard-config <standardConfig>`: Standard config remote branch
+  - `-s, --site-config <siteConfig>`: Site config remote branch
+  - `-j, --jira-ticket [jiraTicket]`: JIRA ticket (required for prod)
 - `deploy-template`: Deploy an application for a specific site
 - `deploy-app <application>`: Deploy an application for a specific site
 - `deploy-core <env> <site>`: Deploy Core

package/bitbucket-pipelines.yml

@@ -16,7 +16,7 @@ definitions:
           - npm config set //registry.npmjs.org/:_authToken $DOCUPACE_NPM_TOKEN
           - pnpm install --frozen-lockfile
           - export HOME=/tmp
-          - node src/changeset/cli.js version-commit-tag --ignore-install-error
+          - node src/changeset/cli.js version-commit-tag --install-latest
 
 pipelines:
   pull-requests:

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.111",
+  "version": "1.0.113-test",
   "description": "",
   "main": "index.js",
   "type": "module",
+  "scripts": {
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage --testPathIgnorePatterns='src/next/test\\.js'",
+    "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",
+    "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true",
+    "test-run-pipline": "dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa",
+    "test-validate": "dp-changset-cli validate",
+    "test-create": "dp-changset-cli create-changeset",
+    "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\""
+  },
   "exports": {
     "./changelogCanny": "./src/changeset/changelog-module.cjs"
   },
@@ -49,14 +58,5 @@
     "globals": "^15.14.0",
     "jest": "^30.1.3",
     "prettier": "^3.4.2"
-  },
-  "scripts": {
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage --testPathIgnorePatterns='src/next/test\\.js'",
-    "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",
-    "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true",
-    "test-run-pipline": "dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa",
-    "test-validate": "dp-changset-cli validate",
-    "test-create": "dp-changset-cli create-changeset",
-    "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\""
   }
-}
+}

package/src/changeset/cli.js

@@ -149,12 +149,12 @@ program
   .command('version-commit-tag')
   .description('Run versioning and commit-and-tag in sequence')
   .option(
-    '--ignore-install-error',
-    'Ignore errors from pnpm install and return early',
+    '--install-latest',
+    'Install the latest version of @docupace/pipeline instead of the current version',
   )
   .action(async (options) => {
     console.log('📦 Running all steps...');
-    const releases = await versionCommand(false, options.ignoreInstallError);
+    const releases = await versionCommand(false, options.installLatest);
     await updateJiraWithVersion(releases);
     await updateWikiWithVersion(releases);
     await commitTagCommand(releases);

package/src/changeset/version.js

@@ -15,7 +15,7 @@ const getPackageVersion = () => {
   return packageJson.version;
 };
 
-const changeSetPackage = `{
+const getChangeSetPackage = (installLatest = false) => `{
   "name": "changeset-package",
   "version": "1.0.0",
   "description": "",
@@ -28,7 +28,7 @@ const changeSetPackage = `{
   "dependencies": {},
   "devDependencies": {
     "@changesets/cli": "^2.27.10",
-    "@docupace/pipeline": "${getPackageVersion()}"
+    "@docupace/pipeline": "${installLatest ? 'latest' : getPackageVersion()}"
   }
 }
 `;
@@ -67,29 +67,19 @@ export async function versionStatus(sinceBranch) {
 
 export async function versionCommand(
   closeVersion = false,
-  ignoreInstallError = false,
+  installLatest = false,
 ) {
   console.log('📦 Running Changeset versioning...');
   if (!process.env.IS_DEV) {
     await setGitInfo();
     await $`mv package.json package.json.bak`;
     await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
-    await fs.promises.writeFile('package.json', changeSetPackage);
+    await fs.promises.writeFile(
+      'package.json',
+      getChangeSetPackage(installLatest),
+    );
     await $`npm config set //registry.npmjs.org/:_authToken ${process.env.DOCUPACE_NPM_TOKEN}`;
-    try {
-      await $`pnpm install`;
-    } catch (error) {
-      if (ignoreInstallError) {
-        console.log(
-          `⚠️ pnpm install failed: ${error.message}. Ignoring error and returning.`,
-        );
-        await $`rm -f package.json pnpm-lock.yaml`;
-        await $`mv package.json.bak package.json`;
-        await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
-        return [];
-      }
-      throw error;
-    }
+    await $`pnpm install`;
     await $`rm package.json pnpm-lock.yaml`;
     await $`mv package.json.bak package.json`;
     await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;

package/src/next/cli.js

@@ -10,6 +10,7 @@ import {
   deployTemplate,
   getDefaultDeploySite,
   getDeployTag,
+  updateSiteVersion,
 } from './deploy.js';
 import { copy2 } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
@@ -113,6 +114,31 @@ program
     );
   });
 
+program
+  .command('update-site-version <env> <site>')
+  .description('Update specific version components for a site')
+  .option('-u, --ui-version <uiVersion>', 'UI image tag')
+  .option('-g, --graph-version <graphVersion>', 'Graphql-server image tag')
+  .option(
+    '-S, --standard-config <standardConfig>',
+    'Standard config remote branch',
+  )
+  .option('-s, --site-config <siteConfig>', 'Site config remote branch')
+  .option('-j, --jira-ticket [jiraTicket]', 'JIRA ticket (required for prod)')
+  .action(async (env, site, options) => {
+    const { uiVersion, graphVersion, standardConfig, siteConfig, jiraTicket } =
+      options;
+    await updateSiteVersion(
+      env,
+      site,
+      uiVersion,
+      graphVersion,
+      standardConfig,
+      siteConfig,
+      jiraTicket,
+    );
+  });
+
 program
   .command('deploy-template [tagPrefix]')
   .description('Deploy an standard configuration for configured sites')

package/src/next/deploy.js

@@ -136,7 +136,7 @@ export async function cloneEnvRepository(env) {
   const repoUrl = getRepUrl(repoName);
   console.log(`Cloning repository: ${repoName}`);
   await cleanUpRepoPath(repoPath);
-  await $`git clone --depth 1 ${repoUrl}`;
+  await $`git clone --no-single-branch --depth 10 ${repoUrl}`;
   console.log(`Repository cloned to: ${repoPath}`);
   return repoPath;
 }
@@ -239,7 +239,7 @@ export function setTag(deployConfig, tag) {
  * @param {object} deployConfig - The updated YAML data.
  */
 
-export async function pushDeployConfig(repoPath, commitMessage) {
+export async function pushDeployConfig(repoPath, commitMessage, env) {
   console.log('📌 Checking for updates to commit...');
   // Check if there are any changes to commit
   const status = (
@@ -273,11 +273,63 @@ export async function pushDeployConfig(repoPath, commitMessage) {
   await $`cd ${repoPath} && git push`;
   console.log('Changes pushed to the remote repository.');
 
+  await syncTagToMigrationBranch(repoPath, commitMessage, env);
+
   console.log('🧹 Cleaning up...');
   await $`rm -rf ${repoPath}`;
   console.log('Cleanup complete.');
 }
 
+async function syncTagToMigrationBranch(repoPath, commitMessage, env) {
+  const migrationBranch = `eks-migration-${env}`;
+  try {
+    const branchExists = (
+      await $`cd ${repoPath} && git branch -r --list origin/${migrationBranch}`
+    ).stdout.trim();
+    if (!branchExists) return;
+
+    const changedFiles = (
+      await $`cd ${repoPath} && git diff --name-only HEAD~1 HEAD`
+    ).stdout
+      .trim()
+      .split('\n')
+      .filter(Boolean);
+
+    await $`cd ${repoPath} && git checkout ${migrationBranch}`;
+
+    let updated = false;
+    for (const file of changedFiles) {
+      if (!file.endsWith('.values.yaml')) continue;
+      const filePath = path.join(repoPath, file);
+      if (!fs.existsSync(filePath)) continue;
+
+      const masterContent = (await $`cd ${repoPath} && git show master:${file}`)
+        .stdout;
+      const masterConfig = yaml.load(masterContent);
+      const masterTag = masterConfig?.image?.tag;
+      if (!masterTag) continue;
+
+      const migrationConfig = yaml.load(fs.readFileSync(filePath, 'utf8'));
+      if (!migrationConfig?.image?.tag) continue;
+      if (migrationConfig.image.tag === masterTag) continue;
+
+      console.log(`Syncing tag ${masterTag} to ${migrationBranch}:${file}`);
+      migrationConfig.image.tag = masterTag;
+      fs.writeFileSync(filePath, yaml.dump(migrationConfig, { lineWidth: -1 }));
+      updated = true;
+    }
+
+    if (updated) {
+      await $`cd ${repoPath} && git add .`;
+      await $`cd ${repoPath} && git commit -m ${commitMessage}`;
+      await $`cd ${repoPath} && git push origin ${migrationBranch}`;
+      console.log(`Tag synced to ${migrationBranch} branch.`);
+    }
+  } catch (error) {
+    console.warn(`Failed to sync to ${migrationBranch}: ${error.message}`);
+  }
+}
+
 function writeDeployConfig(deployConfigFilePath, deployConfig) {
   try {
     fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
@@ -293,9 +345,10 @@ export async function writeAndPushDeployConfig(
   deployConfigFilePath,
   deployConfig,
   commitMessage,
+  env,
 ) {
   writeDeployConfig(deployConfigFilePath, deployConfig);
-  await pushDeployConfig(repoPath, commitMessage);
+  await pushDeployConfig(repoPath, commitMessage, env);
 }
 
 /**
@@ -777,6 +830,258 @@ async function validateDeployVersionConsistency(env, site, deployedApps) {
     `✅ Version consistency validated for ${env}/${site}: all ${appVersions.length} component(s) aligned on ${uniqueMajorMinors[0] ?? 'n/a'}`,
   );
 }
+export async function updateSiteVersion(
+  env,
+  site,
+  uiVersion,
+  graphVersion,
+  standardConfig,
+  siteConfig,
+  jiraTicket,
+) {
+  if (!uiVersion && !graphVersion && !standardConfig && !siteConfig) {
+    console.error(
+      '❌ At least one of --ui-version, --graph-version, --standard-config, or --site-config must be provided',
+    );
+    process.exit(1);
+  }
+
+  console.log(
+    `Updating site versions for ${env}/${site}${jiraTicket ? ` approved by JIRA ticket ${jiraTicket}` : ''}`,
+  );
+
+  if (env === '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;
+      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 Instance: ${docupacecInstance}`);
+      console.log(`Docupace Site URL: ${siteUrl}`);
+      console.log(`JIRA Ticket Status: ${status}`);
+      console.log(`JIRA Ticket URL: ${jiraTicketUrl}`);
+
+      const allowedStatuses = ['To Do', 'In Progress', 'In Deployment'];
+      if (!allowedStatuses.includes(status)) {
+        console.error(
+          `The JIRA ticket status must be "To Do" or "In Progress" or "In Deployment", but got "${status}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      if (!siteUrl.includes(site)) {
+        console.error(
+          `The site "${site}" must be present in the Docupace Site URL: "${siteUrl}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      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);
+      }
+
+      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', 'In Deployment'];
+      if (!allowedStatuses.includes(status)) {
+        console.error(
+          `The JIRA ticket status must be "To Do" or "In Progress" or "In Deployment", but got "${status}"`,
+        );
+        console.error(`Please check the JIRA ticket: ${jiraTicketUrl}`);
+        process.exit(1);
+      }
+
+      if (!siteUrl.includes(site)) {
+        console.error(
+          `The site "${site}" 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);
+    }
+  }
+
+  const toRepoPath = await cloneEnvRepository(env);
+
+  if (env !== 'dev') {
+    await cloneEnvRepository('dev');
+  }
+
+  let changesMade = false;
+  let oldVersion = null;
+  let newVersion = null;
+
+  if (uiVersion) {
+    const uiAppDetails = appInfo['ui'];
+
+    if (env !== 'dev') {
+      await copy2(
+        uiAppDetails.repositoryName,
+        'dev',
+        env,
+        uiVersion,
+        uiAppDetails.imageName,
+      );
+    }
+
+    const { deployConfig, deployConfigFilePath } = await readDeployConfig(
+      'ui',
+      env,
+      site,
+      'values',
+    );
+    if (deployConfig) {
+      if (!oldVersion) oldVersion = deployConfig.image?.tag;
+      newVersion = uiVersion;
+
+      deployConfig.image.tag = uiVersion;
+
+      if (uiAppDetails.updateConfigFunction) {
+        uiAppDetails.updateConfigFunction(deployConfig);
+      }
+
+      const { deployConfig: appConfig, deployConfigFilePath: appFilePath } =
+        await readDeployConfig('ui', env, site, 'app');
+      if (appConfig) {
+        appConfig.revision = uiAppDetails.getAppRevision
+          ? uiAppDetails.getAppRevision(deployConfig)
+          : deployConfig.image.tag;
+        writeDeployConfig(appFilePath, appConfig);
+      }
+
+      writeDeployConfig(deployConfigFilePath, deployConfig);
+      changesMade = true;
+    }
+  }
+
+  if (graphVersion || standardConfig || siteConfig) {
+    const { deployConfig, deployConfigFilePath } = await readDeployConfig(
+      'graphql-server',
+      env,
+      site,
+      'values',
+    );
+    if (deployConfig) {
+      if (graphVersion) {
+        const gsAppDetails = appInfo['graphql-server'];
+
+        if (env !== 'dev') {
+          await copy2(
+            gsAppDetails.repositoryName,
+            'dev',
+            env,
+            graphVersion,
+            gsAppDetails.imageName,
+          );
+        }
+
+        if (!oldVersion) oldVersion = deployConfig.image?.tag;
+        if (!newVersion) newVersion = graphVersion;
+
+        deployConfig.image.tag = graphVersion;
+
+        const { deployConfig: appConfig, deployConfigFilePath: appFilePath } =
+          await readDeployConfig('graphql-server', env, site, 'app');
+        if (appConfig) {
+          appConfig.revision = graphVersion;
+          writeDeployConfig(appFilePath, appConfig);
+        }
+      }
+
+      if (standardConfig) {
+        deployConfig.graphqlServer = deployConfig.graphqlServer ?? {};
+        deployConfig.graphqlServer.standardConfigRemoteBranch = standardConfig;
+      }
+
+      if (siteConfig) {
+        deployConfig.graphqlServer = deployConfig.graphqlServer ?? {};
+        deployConfig.graphqlServer.siteConfigRemoteBranch = siteConfig;
+      }
+
+      writeDeployConfig(deployConfigFilePath, deployConfig);
+      changesMade = true;
+    }
+  }
+
+  let autoDeployUpdated = false;
+  if (oldVersion && newVersion && oldVersion !== newVersion) {
+    autoDeployUpdated = await updateAutoDeployVersion(
+      env,
+      env,
+      site,
+      oldVersion,
+      newVersion,
+    );
+    if (autoDeployUpdated) {
+      console.log(
+        `Info: auto-deploy.yaml updated for ${env}/${site}: ${oldVersion} → ${newVersion}`,
+      );
+      changesMade = true;
+    }
+  }
+
+  if (changesMade) {
+    const { applications } = getAppTypesFromRepo(env, site);
+    const deployedApps = Object.fromEntries(
+      applications
+        .filter((app) => Object.prototype.hasOwnProperty.call(appInfo, app))
+        .map((app) => [app, appInfo[app]]),
+    );
+    await validateDeployVersionConsistency(env, site, deployedApps);
+
+    await pushDeployConfig(
+      toRepoPath,
+      `Update site versions for ${env}/${site}`,
+    );
+
+    if (autoDeployUpdated && env !== 'dev') {
+      const { repoPath: devRepoPath } = getRepoLocalPath('dev');
+      await pushDeployConfig(
+        devRepoPath,
+        `Update auto-deploy version for ${env}/${site}`,
+      );
+    }
+
+    console.log('All configurations updated and pushed successfully.');
+  } else {
+    console.log('No changes detected. Nothing to push.');
+  }
+}
+
 export async function deployFromSite(
   fromEnv,
   fromSite,

package/src/next/deploy.test.js

@@ -133,7 +133,9 @@ describe('cloneEnvRepository', () => {
     const result = await cloneEnvRepository(env);
 
     expect(getRepUrl).toHaveBeenCalledWith('gitops-dev');
-    expect($.mock.calls[0][0][0]).toContain('git clone --depth 1');
+    expect($.mock.calls[0][0][0]).toContain(
+      'git clone --no-single-branch --depth 10',
+    );
     expect(result).toContain('gitops-dev');
   });