@docupace/pipeline 1.0.112 → 1.0.113-test2

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

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

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/package.json

@@ -1,9 +1,18 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.112",
+  "version": "1.0.113-test2",
   "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/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);
 }
 
 /**
@@ -1013,6 +1066,7 @@ export async function updateSiteVersion(
     await pushDeployConfig(
       toRepoPath,
       `Update site versions for ${env}/${site}`,
+      env,
     );
 
     if (autoDeployUpdated && env !== 'dev') {
@@ -1020,6 +1074,7 @@ export async function updateSiteVersion(
       await pushDeployConfig(
         devRepoPath,
         `Update auto-deploy version for ${env}/${site}`,
+        'dev',
       );
     }
 
@@ -1289,6 +1344,7 @@ export async function deployFromSite(
     await pushDeployConfig(
       toRepoPath,
       `Updated deployment configurations from ${fromEnv}/${fromSite} to ${toEnv}/${toSite}`,
+      toEnv,
     );
     // auto-deploy.yaml lives in gitops-dev; push it separately when toEnv isn't dev
     if (autoDeployUpdated && toEnv !== 'dev') {
@@ -1296,6 +1352,7 @@ export async function deployFromSite(
       await pushDeployConfig(
         devRepoPath,
         `Update auto-deploy version for ${toEnv}/${toSite}`,
+        'dev',
       );
     }
     console.log('All configurations updated and pushed successfully.');

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');
   });