@docupace/pipeline 1.0.33 → 1.0.35-matttest.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.33",
+  "version": "1.0.35-matttest.0",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/configure.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'fs-extra';
 import path from 'path';
 import axios from 'axios';
 import crypto from 'crypto';
@@ -7,10 +7,15 @@ import {
   cloneEnvRepository,
   readDeployConfig,
   pushDeployConfig,
+  cloneRepository,
 } from '../next/deploy.js';
 
 import { getVaultSecrets, updateVaultSecrets } from './vault.js';
-import { getVaultSecretsConfigs, environmentConfig } from '../next/config.js';
+import {
+  getVaultSecretsConfigs,
+  environmentConfig,
+  coreSiteEnvMap,
+} from '../next/config.js';
 
 async function ensureDirectoryExists(dirPath) {
   try {
@@ -102,6 +107,14 @@ async function configureUI(
 
     await updateVaultSecrets(vaultSiteSecretsPath, uiSecretData);
 
+    let siteAWSSecrets = null;
+
+    if (useS3 === true || useS3 === 'true') {
+      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
+      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
+      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
+    }
+
     // Prepare ui.app.yaml
     const uiAppYaml = `
 repo: docupace-ui-main
@@ -139,7 +152,7 @@ ${
 serviceAccount:
   create: true
   annotations:
-    eks.amazonaws.com/role-arn: arn:aws:iam::902873770924:role/eks-pod-identity-connect-next-${env}-${site}-bucket
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket
 `.trim()
     : ''
 }
@@ -197,7 +210,6 @@ externalConnectService:
   domain: ${docupaceHost}
 `.trim();
 
-    // Write configuration files
     console.log('Writing configuration files...');
     await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
 
@@ -225,11 +237,75 @@ externalConnectService:
       },
     );
     console.log('Done!');
+    console.log('Updating Core Site Config...');
+    await updateCoreSiteConfig(site, env, useS3);
   } catch (error) {
     console.error('Error configuring UI:', error);
   }
 }
 
+export async function cleanAndWritePropertiesFile(configPath, content) {
+  try {
+    const cleanedContent = content
+      .split('\n')
+      .map((line) => line.trim())
+      .filter((line) => line !== '')
+      .join('\n');
+
+    await fs.writeFile(configPath, cleanedContent, 'utf8');
+    console.log(`Cleaned and written file to: ${configPath}`);
+  } catch (error) {
+    console.error('Error writing properties file:', error.message);
+    process.exit(1);
+  }
+}
+
+export async function updateCoreSiteConfig(site, env, useS3) {
+  try {
+    const coreSiteEnv = coreSiteEnvMap[env];
+
+    const coreSiteConfigRepoPath = await cloneRepository(
+      `${coreSiteEnv}-site-settings`,
+    );
+
+    const configPath = path.join(
+      `${coreSiteEnv}-site-settings`,
+      site.toUpperCase(),
+      'docucore-nextUI.properties',
+    );
+
+    let siteAWSSecrets = null;
+
+    if (useS3 === true || useS3 === 'true') {
+      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
+      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
+      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
+    }
+
+    const coreSiteConfig = `
+        ${
+          siteAWSSecrets
+            ? `
+com.docupace.imports.files.FilesImportConfig.aws.accessKeyId=${siteAWSSecrets.AWS_ACCESS_KEY_ID}
+com.docupace.imports.files.FilesImportConfig.aws.accessKeySecret=${siteAWSSecrets.AWS_SECRET_ACCESS_KEY}
+com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}
+`.trim()
+            : ''
+        }
+`;
+
+    await fs.ensureDir(path.join(coreSiteConfigRepoPath, site.toUpperCase()));
+    await cleanAndWritePropertiesFile(configPath, coreSiteConfig);
+    await pushDeployConfig(
+      coreSiteConfigRepoPath,
+      `Core config: docucore-nextUI.properties for site: (${site.toUpperCase()}) update in env: (${env})`,
+    );
+  } catch (error) {
+    console.error('Error:', error.message);
+    process.exit(1);
+  }
+}
+
 async function configureGraphQLServer(
   siteHost,
   coreURL,

package/src/next/cli.js

@@ -4,7 +4,12 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import { deployFromSite } from './deploy.js';
+import {
+  deployAppWithTag,
+  deployFromSite,
+  getDefaultDeploySite,
+  getDeployTag,
+} from './deploy.js';
 import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
@@ -101,10 +106,30 @@ program
   });
 
 program
-  .command('deployTemplate <site>')
+  .command('deploy-template')
   .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(site);
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deployTemplate')
+  .description('Deploy an application for a specific site')
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deploy-app <application>')
+  .description('Deploy an application for a specific site')
+  .action(async (application) => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployAppWithTag(application, env, site, deployTag);
   });
 
 program

package/src/next/config.js

@@ -80,5 +80,14 @@ export const getVaultSecretsConfigs = (site) => {
     siteCommonSecretsPath: `secret/data/${site}/common/config`,
     graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
     uiSecretsPath: `secret/data/${site}/ui/config`,
+    awsSecretsPath: `secret/data/${site}/aws/config`,
   };
 };
+
+export const coreSiteEnvMap = {
+  dev: 'dev',
+  qa: 'preprod',
+  stg: 'staging',
+  uat: 'uat',
+  prd: 'prod',
+};

package/src/next/deploy.js

@@ -266,7 +266,7 @@ export async function writeAndPushDeployConfig(
  * @param {string} site - The site name.
  */
 
-async function getDeployTag() {
+export async function getDeployTag() {
   const gitTag = (
     await $`git tag --points-at HEAD | grep '^v' | head -n 1`
   ).stdout.trim();
@@ -274,12 +274,17 @@ async function getDeployTag() {
   return deployTag;
 }
 
-export async function deployTemplate(site) {
-  const deployTag = await getDeployTag();
+export async function getDefaultDeploySite(deployTag) {
+  const env = deployTag.includes('alpha') ? 'dev' : 'qa';
+  const site = env === 'dev' ? 'financialdev' : 'qa';
+  return { env, site };
+}
+
+export async function deployTemplate(env, site, deployTag) {
   console.log(`Deploying standard template for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
   const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig('graphql-server', 'dev', site);
+    await cloneAndReadDeployConfig('graphql-server', env, site);
 
   deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
 
@@ -292,14 +297,17 @@ export async function deployTemplate(site) {
   console.log('Deployment completed successfully.');
 }
 
-export async function deploy(application, site) {
-  const deployTag = getDeployTag();
-
+export async function deployAppWithTag(application, env, site, deployTag) {
   console.log(`Deploying application: ${application} for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
 
+  if (env !== 'dev') {
+    const appDetails = appInfo[application];
+    await copy2(appDetails.repositoryName, 'dev', env, deployTag);
+  }
+
   const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig(application, 'dev', site);
+    await cloneAndReadDeployConfig(application, env, site);
   const updatedConfigData = setTag(deployConfig, deployTag);
   await writeAndPushDeployConfig(
     repoPath,