@docupace/pipeline 1.0.137 → 1.1.1

package/src/next/connect-aws.test.js

@@ -0,0 +1,131 @@
+import { describe, expect, it, jest, beforeEach } from '@jest/globals';
+
+jest.unstable_mockModule('./pipline.js', () => ({
+  runPipeline: jest.fn(),
+}));
+
+const { runPipeline } = await import('./pipline.js');
+const {
+  deployConnectAws,
+  validateConnectAwsArgs,
+  normalizeConnectAwsSites,
+  CONNECT_AWS_GITOPS_REPO,
+  CONNECT_AWS_UPDATE_PIPELINE,
+} = await import('./connect-aws.js');
+
+describe('normalizeConnectAwsSites', () => {
+  it('accepts a single site', () => {
+    expect(normalizeConnectAwsSites('oa')).toEqual(['oa']);
+  });
+
+  it('splits comma-separated sites and trims', () => {
+    expect(normalizeConnectAwsSites('oa, athene, template')).toEqual([
+      'oa',
+      'athene',
+      'template',
+    ]);
+  });
+
+  it('accepts an array', () => {
+    expect(normalizeConnectAwsSites(['oa', 'athene'])).toEqual([
+      'oa',
+      'athene',
+    ]);
+  });
+});
+
+describe('validateConnectAwsArgs', () => {
+  it('accepts a single site', () => {
+    expect(() =>
+      validateConnectAwsArgs('qa', '1stglobal', '4.75.52'),
+    ).not.toThrow();
+  });
+
+  it('accepts comma-separated sites', () => {
+    expect(() =>
+      validateConnectAwsArgs('qa', 'oa,athene', '4.75.52'),
+    ).not.toThrow();
+  });
+
+  it('rejects invalid env', () => {
+    expect(() =>
+      validateConnectAwsArgs('preprod', '1stglobal', '4.75.52'),
+    ).toThrow(/Invalid env/);
+  });
+
+  it('rejects invalid site in a list', () => {
+    expect(() => validateConnectAwsArgs('qa', 'oa,../x', '4.75.52')).toThrow(
+      /Invalid site/,
+    );
+  });
+
+  it('rejects empty sites', () => {
+    expect(() => validateConnectAwsArgs('qa', '  ,  ', '4.75.52')).toThrow(
+      /At least one site/,
+    );
+  });
+
+  it('rejects invalid version', () => {
+    expect(() => validateConnectAwsArgs('qa', '1stglobal', '')).toThrow(
+      /Invalid version/,
+    );
+  });
+});
+
+describe('deployConnectAws', () => {
+  beforeEach(() => {
+    runPipeline.mockReset();
+    runPipeline.mockResolvedValue(undefined);
+  });
+
+  it('triggers update-site-image with a single SITE', async () => {
+    await deployConnectAws('dev', 'template', '4.76.1');
+
+    expect(runPipeline).toHaveBeenCalledWith(
+      CONNECT_AWS_GITOPS_REPO,
+      CONNECT_AWS_UPDATE_PIPELINE,
+      'main',
+      {
+        ENV: 'dev',
+        SITE: 'template',
+        VERSION: '4.76.1',
+      },
+      true,
+    );
+  });
+
+  it('passes comma-separated SITE for multiple sites', async () => {
+    await deployConnectAws('qa', ['oa', 'athene'], '4.76.1');
+
+    expect(runPipeline).toHaveBeenCalledWith(
+      CONNECT_AWS_GITOPS_REPO,
+      CONNECT_AWS_UPDATE_PIPELINE,
+      'main',
+      {
+        ENV: 'qa',
+        SITE: 'oa,athene',
+        VERSION: '4.76.1',
+      },
+      true,
+    );
+  });
+
+  it('honors wait and branch options', async () => {
+    await deployConnectAws('stage', 'oa,athene', 'git-commit-abc123', {
+      wait: false,
+      branch: 'feature/update-site-image-pipeline',
+    });
+
+    expect(runPipeline).toHaveBeenCalledWith(
+      CONNECT_AWS_GITOPS_REPO,
+      CONNECT_AWS_UPDATE_PIPELINE,
+      'feature/update-site-image-pipeline',
+      {
+        ENV: 'stage',
+        SITE: 'oa,athene',
+        VERSION: 'git-commit-abc123',
+      },
+      false,
+    );
+  });
+});

package/src/next/deploy.js

@@ -17,6 +17,11 @@ import { gitDescribeToSemver } from './git-to-semver.js';
 import { deployConnect, deployCore } from './jenkins.js';
 import { makeJiraRequest } from './jira.js';
 import { autoDeployConfigName } from './config.js';
+import {
+  CONNECT_AWS_GITOPS_REPO,
+  deployConnectAws,
+  isAllowedConnectAwsEnv,
+} from './connect-aws.js';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -432,6 +437,14 @@ export async function deployTemplate(
 export async function deployAppWithTag(application, env, site, deployTag) {
   console.log(`Deploying application: ${application} for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
+
+  // Connect UI on AWS: update dp-eks-connect-ui-gitops image.tag via Bitbucket pipeline.
+  // (Not a Next gitops-<env> app — no <app>.values.yaml under dp/<site>/.)
+  if (application === 'connect') {
+    await deployConnectAws(env, site, deployTag, { wait: true });
+    return;
+  }
+
   const appDetails = appInfo[application] ?? getDefaultAppInfo(application);
   if (!appInfo[application]) {
     console.log(
@@ -847,10 +860,17 @@ export async function updateSiteVersion(
   standardConfig,
   siteConfig,
   jiraTicket,
+  connectVersion,
 ) {
-  if (!uiVersion && !graphVersion && !standardConfig && !siteConfig) {
+  if (
+    !uiVersion &&
+    !graphVersion &&
+    !standardConfig &&
+    !siteConfig &&
+    !connectVersion
+  ) {
     console.error(
-      '❌ At least one of --ui-version, --graph-version, --standard-config, or --site-config must be provided',
+      '❌ At least one of --ui-version, --graph-version, --standard-config, --site-config, or --connect-version must be provided',
     );
     process.exit(1);
   }
@@ -944,6 +964,15 @@ export async function updateSiteVersion(
     }
   }
 
+  const hasNextVersionUpdate =
+    uiVersion || graphVersion || standardConfig || siteConfig;
+
+  // Connect AWS-only: update image.tag via gitops pipeline and return.
+  if (connectVersion && !hasNextVersionUpdate) {
+    await deployConnectAws(env, site, connectVersion, { wait: true });
+    return;
+  }
+
   const toRepoPath = await cloneEnvRepository(env);
 
   if (env !== 'dev') {
@@ -1089,6 +1118,44 @@ export async function updateSiteVersion(
   } else {
     console.log('No changes detected. Nothing to push.');
   }
+
+  if (connectVersion) {
+    await deployConnectAws(env, site, connectVersion, { wait: true });
+  }
+}
+
+/**
+ * Read dp-connect-ui.image.tag for a site from the AWS Connect gitops repo.
+ * @param {string} env
+ * @param {string} site
+ * @returns {Promise<string>}
+ */
+export async function getConnectAwsImageTag(env, site) {
+  if (!isAllowedConnectAwsEnv(env)) {
+    throw new Error(
+      `Invalid AWS Connect env "${env}". Expected one of: dev, qa, stage, uat, prod`,
+    );
+  }
+
+  const repoPath = await cloneRepository(CONNECT_AWS_GITOPS_REPO);
+  const valuesFile = path.join(repoPath, 'envs', env, site, 'values.yaml');
+
+  try {
+    if (!fs.existsSync(valuesFile)) {
+      throw new Error(`AWS Connect values file not found: ${valuesFile}`);
+    }
+
+    const content = fs.readFileSync(valuesFile, 'utf8');
+    const match = content.match(/^\s{4}tag:\s*"?([^"\n]+)"?\s*$/m);
+    if (!match?.[1]) {
+      throw new Error(
+        `Could not parse image.tag from envs/${env}/${site}/values.yaml`,
+      );
+    }
+    return match[1].trim();
+  } finally {
+    await $`rm -rf ${repoPath}`;
+  }
 }
 
 export async function deployFromSite(
@@ -1099,6 +1166,7 @@ export async function deployFromSite(
   isDeployCore,
   isDeployConnect,
   jiraTicket,
+  isDeployConnectAws = 'false',
 ) {
   console.log(
     `Deploying changes from ${fromSite} in ${fromEnv} to ${toSite} in ${toEnv}${jiraTicket ? ` approved by JIRA ticket ${jiraTicket}` : ''}`,
@@ -1236,6 +1304,31 @@ export async function deployFromSite(
     }
   }
 
+  if (isDeployConnectAws === 'true') {
+    const sourceVersion = await getConnectAwsImageTag(fromEnv, fromSite);
+    let targetVersion;
+    try {
+      targetVersion = await getConnectAwsImageTag(toEnv, toSite);
+    } catch (error) {
+      console.warn(
+        `Could not read target AWS Connect version (${error.message}); deploying source version anyway.`,
+      );
+      targetVersion = null;
+    }
+
+    if (targetVersion && targetVersion === sourceVersion) {
+      console.log(
+        `AWS Connect versions already match (${sourceVersion}); skipping deploy-connect-aws.`,
+      );
+    } else {
+      console.log(
+        `AWS Connect version to deploy: ${sourceVersion}` +
+          (targetVersion ? ` (target currently ${targetVersion})` : ''),
+      );
+      await deployConnectAws(toEnv, toSite, sourceVersion, { wait: true });
+    }
+  }
+
   // Clone repositories for source and target environments
   const fromRepoPath = await cloneEnvRepository(fromEnv);
   const toRepoPath =

package/src/next/deploy.test.js

@@ -48,6 +48,7 @@ jest.unstable_mockModule('./config.js', () => ({
     },
   },
   getRepUrl: jest.fn(),
+  getBitbucketInfo: jest.fn(),
   getDefaultAppInfo: jest.fn((application) => ({
     repositoryName: application,
     imageName: application,

package/.gitignore

@@ -1,109 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# IDE
-.idea
-*.iml
-# Dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# Testing
-/coverage
-
-# Next.js
-/.next/
-/out/
-
-# Production
-/build
-/dist
-
-# Misc
-.DS_Store
-*.pem
-cypress/screenshots/
-
-# Debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Local env files
-.env
-.env*.local
-
-# Vercel
-.vercel
-
-# Typescript
-*.tsbuildinfo
-next-env.d.ts
-
-
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-.next
-
-scratch
-
-# visual studio code
-.vscode/
-
-src/gql/graphql.js
-.yalc/
-yalc.lock
-
-.last-run.json
-
-test-results
-coverage-reports
-.sonar
-.v8-coverage
-/assets
-tests/lib/data/auth.json
-
-failed-tests.json
-
-/tmp
-
-.claude
-.claude/settings.local.json
-
-.run
-
-.pnpm-store