@docupace/pipeline 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @docupace/pipeline
 
+## 1.1.4
+
+### Patch Changes
+
+- b501e15: Release the CONNECT environment-defaults copy fix with the corrected merge-helper formatting.
+
+## 1.1.3
+
+### Patch Changes
+
+- 43d3a6f: Resolve CONNECT template values using environment defaults before site overrides, preserving target environment inheritance when copying a site.
+
 ## 1.1.1
 
 ### Patch Changes

package/package.json

@@ -1,9 +1,19 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "",
   "main": "index.js",
   "type": "module",
+  "scripts": {
+    "prepublishOnly": "pnpm test",
+    "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"
   },
@@ -53,14 +63,5 @@
     "globals": "^15.14.0",
     "jest": "^30.4.2",
     "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/connect-aws.js

@@ -1012,6 +1012,24 @@ async function assertPlainTree(root) {
   }
 }
 
+function mergeConnectValues(defaults, overrides) {
+  const isMap = (value) =>
+    value !== null && typeof value === 'object' && !Array.isArray(value);
+  const merged = isMap(defaults) ? { ...defaults } : {};
+  for (const [key, value] of Object.entries(overrides)) {
+    merged[key] = isMap(value) ? mergeConnectValues(merged[key], value) : value;
+  }
+  return merged;
+}
+
+async function readConnectEnvironmentValues(repo, env) {
+  const file = path.join(repo, 'envs', env, 'values.yaml');
+  // Older GitOps checkouts keep every setting in the site values file.
+  if (!(await fs.pathExists(file))) return {};
+  const values = yaml.load(await fs.readFile(file, 'utf8'));
+  return values?.['dp-connect-ui'] || {};
+}
+
 // Works in an existing checkout. Git push, review branches and AWS authentication
 // belong to the calling pipeline. Replacement requires explicit forceOverwrite.
 export async function copyConnectSite({
@@ -1158,21 +1176,30 @@ export async function copyConnectSite({
     await fs.readFile(path.join(source, 'values.yaml'), 'utf8'),
   );
   const app = values?.['dp-connect-ui'];
+  if (!app || typeof app !== 'object' || Array.isArray(app)) {
+    throw new Error('Template values require a dp-connect-ui mapping.');
+  }
+  const sourceDefaults = await readConnectEnvironmentValues(repo, templateEnv);
+  const effectiveApp = mergeConnectValues(sourceDefaults, app);
   if (
-    !app?.image?.repository ||
-    !app?.image?.tag ||
-    !app?.initContainer?.s3Bucket
+    !effectiveApp.image?.repository ||
+    !effectiveApp.image?.tag ||
+    !effectiveApp.initContainer?.s3Bucket
   ) {
     throw new Error(
-      'Template values require dp-connect-ui.image.repository, image.tag and initContainer.s3Bucket.',
+      'Template values and environment defaults require dp-connect-ui.image.repository, image.tag and initContainer.s3Bucket.',
     );
   }
   if (
-    app.initContainer.s3Bucket !==
+    effectiveApp.initContainer.s3Bucket !==
     `docupace-${templateEnv}-connect-ui-configs-usw2`
   ) {
     throw new Error('Source S3 bucket does not match the source environment.');
   }
+  const targetDefaults =
+    env === templateEnv
+      ? sourceDefaults
+      : await readConnectEnvironmentValues(repo, env);
   const config = setConfigValues(sourceConfig, {
     'application.context': JSON.stringify(contextPath),
     'application.hostUrl': JSON.stringify(origin.origin),
@@ -1215,7 +1242,11 @@ export async function copyConnectSite({
   app.clientName = coreSchema.trim();
   app.envName = env;
   // Inherit the selected source image; shared-image migration is a separate action.
-  if (imageTag) app.image.tag = imageTag;
+  app.image = {
+    ...app.image,
+    repository: effectiveApp.image.repository,
+    tag: imageTag || effectiveApp.image.tag,
+  };
   app.gateway = { ...app.gateway, hostnames: [origin.hostname], contextPath };
   app.serviceAccount = {
     ...app.serviceAccount,
@@ -1247,8 +1278,20 @@ export async function copyConnectSite({
     targetSecretName: 'artifactory-connect',
     awsSecretKey: 'docupace/eks/artifactory-ms',
   };
-  app.initContainer.s3Bucket = `docupace-${env}-connect-ui-configs-usw2`;
-  app.initContainer.s3Prefix = 'main';
+  // Keep environment settings inherited; never flatten source environment
+  // defaults (resources, replicas, etc.) into the new site's overrides.
+  app.initContainer = { ...app.initContainer };
+  for (const [key, value] of Object.entries({
+    s3Bucket: `docupace-${env}-connect-ui-configs-usw2`,
+    s3Prefix: 'main',
+  })) {
+    if (targetDefaults.initContainer?.[key] === value) {
+      delete app.initContainer[key];
+    } else {
+      app.initContainer[key] = value;
+    }
+  }
+  if (Object.keys(app.initContainer).length === 0) delete app.initContainer;
   delete app.configVersion;
   delete app.fullnameOverride;
   delete app.imagePullSecrets;