@docupace/pipeline 1.0.47 → 1.0.49

package/package.json

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

package/src/auth0/configure.js

@@ -146,7 +146,7 @@ uiMain:
         : ''
     }
 image:
-  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/docupace-ui-main
+  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/enterprise-ui-app
   tag: ${imageTag}
 ${
   useS3 === true || useS3 === 'true'

package/src/auth0/metadata.js

@@ -10,14 +10,15 @@ export async function getAuth0Metadata(site, env) {
   try {
     const connectDeployRepoPath = await cloneRepository('connect-deploy');
 
-    if (env === 'qa') {
-      console.log(
-        `The environment is: (${env}), but connect-deploy has preprod instead`,
-      );
-      process.chdir(`${connectDeployRepoPath}/envs/preprod/${site}`);
-    } else {
-      process.chdir(`${connectDeployRepoPath}/envs/${env}/${site}`);
-    }
+    // mapping of env to env
+    const envMap = {
+      dev: 'dev',
+      preprod: 'qa',
+      stage: 'stage',
+      uat: 'uat',
+      'prod-www3': 'prod',
+    };
+    process.chdir(`${connectDeployRepoPath}/envs/${env}/${site}`);
 
     const configPath = path.join('conf', 'application.conf');
     const appConf = await fs.readFile(configPath, 'utf-8');
@@ -47,7 +48,7 @@ export async function getAuth0Metadata(site, env) {
       getVaultSecretsConfigs(site).siteCommonSecretsPath;
     console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`);
     const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
-    const auth0Domain = `docupace-${env}-${site}.us.auth0.com`;
+    const auth0Domain = `docupace-${envMap[env]}-${site}.us.auth0.com`;
     const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
     const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
     const auth0Token = await getAuth0AuthToken(

package/src/next/apache.js

@@ -8,7 +8,7 @@ function log(msg) {
 export async function addApacheSite() {
   if (
     !process.env.ENVIRONMENT ||
-    !['dev', 'qa', 'uat', 'stage'].includes(process.env.ENVIRONMENT)
+    !['dev', 'qa', 'uat', 'stage','www3'].includes(process.env.ENVIRONMENT)
   ) {
     log('Error: wront ENVIRONMENT');
     process.exit(1);
@@ -39,6 +39,11 @@ export async function addApacheSite() {
       host2: 'stg-apalb01b.edc.docupace.internal',
       repo: 'iis-www2',
     },
+    www3: {
+      host1: 'prd-apalb05a.edc.docupace.internal',
+      host2: 'prd-apalb05b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
   };
 
   // Save private key from base64

package/src/next/cli.js

@@ -105,7 +105,7 @@ program
   });
 
 program
-  .command('deploy-template <tagPrefix>')
+  .command('deploy-template [tagPrefix]')
   .description('Deploy an application for a specific site')
   .action(async (tagPrefix) => {
     const deployTag = await getDeployTag(tagPrefix);

package/src/next/config.js

@@ -1,9 +1,5 @@
-import semver from 'semver';
-
 export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
 
-const UI_MONO_VERSION = '1.4.0-alpha.0';
-
 export const environmentConfig = {
   dev: {
     newUrl: (site) => `https://${site}.dev.dpai.tech`,
@@ -19,20 +15,20 @@ export const environmentConfig = {
   },
   uat: {
     newUrl: (site) => `https://${site}.uat.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
-    docupaceHost: () => 'www2.paperout.com',
+    oldUrl: (site) => `https://uat.paperout.com/${site}`,
+    docupaceHost: () => 'uat.paperout.com',
     ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
   },
   stage: {
     newUrl: (site) => `https://${site}.stg.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
-    docupaceHost: () => 'www2.paperout.com',
-    ccUrl: (site) => `https://${site}-cc.stg.dpai.tech`,
+    oldUrl: (site) => `https://stage.paperout.com/${site}`,
+    docupaceHost: () => 'stage.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.stage.dpai.tech`,
   },
   prod: {
     newUrl: (site) => `https://${site}.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}`,
-    docupaceHost: () => 'www2.paperout.com',
+    oldUrl: (site) => `https://www3.paperout.com/${site}`,
+    docupaceHost: () => 'www3.paperout.com',
     ccUrl: (site) => `https://${site}-cc.dpai.tech`,
   },
 };
@@ -40,47 +36,15 @@ export const environmentConfig = {
 export const appInfo = {
   'graphql-server': {
     repositoryName: 'docupace-graphql-server',
-    imageName: 'docupace-graphql-server',
     deployAttributes: [
       'image.tag',
       'graphqlServer.siteConfigRemoteBranch',
       'graphqlServer.standardConfigRemoteBranch',
     ],
   },
-  cc: {
-    repositoryName: 'docupace-ui-main',
-    imageName: 'cc-ui-app',
-    deployAttributes: ['image.tag'],
-    getAppRevision: (config) => {
-      const version = config.image.tag.slice(1);
-      return 'cc-ui-app@' + version;
-    },
-  },
   ui: {
     repositoryName: 'docupace-ui-main',
-    imageName: 'enterprise-ui-app',
     deployAttributes: ['image.tag'],
-    getAppRevision: (config) => {
-      const tag = config.image.tag;
-      const version = tag.startsWith('v') ? tag.slice(1) : tag;
-      if (semver.gt(version, UI_MONO_VERSION)) {
-        return 'enterprise-ui-app@' + version;
-      } else {
-        return tag;
-      }
-    },
-    updateConfigFunction: (config) => {
-      if (config.image.repository.endsWith('/docupace-ui-main')) {
-        const tag = config.image.tag;
-        const version = tag.startsWith('v') ? tag.slice(1) : tag;
-        if (semver.gt(version, UI_MONO_VERSION)) {
-          const parts = config.image.repository.split('/');
-          parts[2] = 'enterprise-ui-app';
-          config.image.repository = parts.join('/');
-        }
-      }
-      return config;
-    },
   },
 };
 
@@ -132,4 +96,5 @@ export const coreSiteEnvMap = {
   stg: 'staging',
   uat: 'uat',
   prd: 'prod',
+  prod: 'prod',
 };

package/src/next/connect.js

@@ -2,7 +2,7 @@ import 'zx/globals'; // npm i zx
 import fs from 'fs-extra';
 import path from 'path';
 import { $ } from 'zx';
-
+import { getAuth0Metadata } from '../auth0/metadata.js';
 import { getVaultSecrets } from '../auth0/vault.js';
 
 process.env.COMMON_VAULT_PATH =
@@ -15,9 +15,42 @@ const vaultAddr = process.env.VAULT_ADDR;
 const connectUIEnvMap = {
   dev: 'dev',
   qa: 'preprod',
-  stg: 'stg',
+  stage: 'stg',
+  uat: 'uat',
+  prod: 'prod-www3',
+};
+
+
+const siteSettingsEnvMap = {
+  dev: 'dev',
+  preprod: 'preprod',
+  qa: 'preprod',
+  stage: 'staging',
+  stg: 'staging',
+  uat: 'uat',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
+};
+
+const idpEnvMap = {
+  dev: 'dev',
+  preprod: 'qa',
+  qa: 'qa',
+  stage: 'stage',
+  stg: 'stage',
   uat: 'uat',
-  prd: 'prod-las',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
 };
 
 function log(msg) {
@@ -47,8 +80,10 @@ async function gitCheckout(repository, destDir, branch = 'master') {
 }
 
 export async function connectClone() {
-  const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
-  const connectToEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+  // const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
+  const connectFromEnv = process.env.FROM_BUILD_ENVIRONMENT;
+  const connectToEnv = process.env.BUILD_ENVIRONMENT;
+
   if (!vaultToken || !vaultAddr) {
     console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
     throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
@@ -81,7 +116,7 @@ export async function connectClone() {
   log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
   log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
 
-  process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
+  process.env.AUTH0_DOMAIN = `docupace-${idpEnvMap[process.env.BUILD_ENVIRONMENT]}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
 
   const projectRoot = process.cwd();
   // 4) Clone 'connect-deploy' into CONNECT_DIR
@@ -89,8 +124,8 @@ export async function connectClone() {
   await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
 
   await gitCheckout(
-    `${connectToEnv}-site-settings`,
-    `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`,
+    `${siteSettingsEnvMap[connectToEnv]}-site-settings`,
+    `${process.env.CONNECT_DIR}/${siteSettingsEnvMap[connectToEnv]}-site-settings`,
   );
 
   // 5) Create site clone (emulating the dock.sh call)
@@ -123,7 +158,7 @@ export async function connectClone() {
       try {
         // Execute the shell command
         const result =
-          await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+        await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
         await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
         await $`cd ${cloneTo} && git remote -v`;
         await $`cd ${cloneTo} && git branch`;
@@ -145,31 +180,33 @@ export async function connectClone() {
     log('Site already exists. Continuing Auth0 setup...');
   }
 
-  await (async () => {
-    try {
-      // Execute the shell command
-      const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
-      console.log('Command succeeded:');
-      console.log('stdout:', result.stdout); // Standard output
-      console.log('stderr:', result.stderr); // Standard error
-    } catch (error) {
-      console.error('Command failed:');
-      console.error('Exit Code:', error._code); // Exit code of the command
-      console.error('Signal:', error._signal); // Signal that caused termination (if any)
-      console.error('stdout:', error._stdout); // Standard output
-      console.error('stderr:', error._stderr); // Standard error
-    }
-  })();
+  // await (async () => {
+  //   try {
+  //     // Execute the shell command
+  //     //await getAuth0Metadata(process.env.BUILD_SITE, connectToEnv);
+  //     const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
+  //     console.log('Command succeeded:');
+  //     console.log('stdout:', result.stdout); // Standard output
+  //     console.log('stderr:', result.stderr); // Standard error
+  //   } catch (error) {
+  //     console.error('Command failed:');
+  //     console.error('Exit Code:', error._code); // Exit code of the command
+  //     console.error('Signal:', error._signal); // Signal that caused termination (if any)
+  //     console.error('stdout:', error._stdout); // Standard output
+  //     console.error('stderr:', error._stderr); // Standard error
+  //   }
+  // })();
 
   // 7) Check conf files, print logs
-  await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
-  await $`ls -all ${path.join(cloneTo, 'conf')}`;
-  await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
-  await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
+  // await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
+  // await $`ls -all ${path.join(cloneTo, 'conf')}`;
+  // await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
+  // await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
 
   // 8) Git add, commit, push
-  await $`cd ${cloneTo} && git add ./conf/application.conf ./conf/saml/auth0.xml`;
-  await $`cd ${cloneTo} && git status`;
+  // await $`cd ${cloneTo} && git add ./conf/application.conf ./conf/saml/auth0.xml`;
+  //await $`cd ${cloneTo} && git add ./conf/application.conf`;
+  //await $`cd ${cloneTo} && git status`;
 
   const numChanges = (await $`cd ${cloneTo} && git diff-index HEAD`).stdout
     .split('\n')
@@ -181,6 +218,7 @@ export async function connectClone() {
     log('About to commit changes to git');
     await $`cd ${cloneTo} && git commit -m ${message}`;
     await $`cd ${cloneTo} && git push -u origin master`;
+    //await getAuth0Metadata(process.env.BUILD_SITE, connectToEnv);
   } else {
     log(
       'No changes have been made. The site likely already has the correct configuration.',

package/src/next/haproxy.js

@@ -4,7 +4,7 @@ import path from 'path';
 
 export async function haproxySync() {
   const cluster = process.env.HAPROXY_CLUSTER;
-  if (cluster !== 'preprod' && cluster !== 'stage') {
+  if (cluster !== 'preprod' && cluster !== 'stage' && cluster !== 'prod-www3') {
     console.log('Error: Cluster must be preprod or stage');
     process.exit(1);
   }
@@ -22,6 +22,10 @@ export async function haproxySync() {
       host: '10.12.28.10',
       branch: 'INFP-6565-haproxy-prod-implementation',
     },
+    'prod-www3': {
+      host: '10.13.28.45',
+      branch: 'INFP-6565-haproxy-prod-implementation',
+    },
   };
 
   const scriptContent = `