@docupace/pipeline 1.0.57 → 1.0.58

package/package.json

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

package/src/auth0/cli.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
   .command(
-    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3> <deployCCUI>',
+    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3Ui> <deployCCUI> <useS3Gq> ',
   )
   .description('Configure the Auth0 tenants in env for the given site')
   .action(
@@ -27,8 +27,9 @@ program
       deployUI,
       deployGraphQLServer,
       useNewDomain,
-      useS3,
+      useS3Ui,
       deployCCUI,
+      useS3Gq,
     ) => {
       await configureFromSite(
         fromSite,
@@ -38,8 +39,9 @@ program
         deployUI,
         deployGraphQLServer,
         useNewDomain,
-        useS3 === 'true' || useS3 === true,
+        useS3Ui === 'true' || useS3Ui === true,
         deployCCUI,
+        useS3Gq === 'true' || useS3Gq === true,
       );
     },
   );

package/src/auth0/configure.js

@@ -10,7 +10,10 @@ import {
   readDeployConfig,
 } from '../next/deploy.js';
 
-import { getVaultSecrets, updateVaultSecrets } from './vault.js';
+import {
+  getVaultSecrets,
+  updateVaultSecrets
+} from './vault.js';
 import {
   coreSiteEnvMap,
   environmentConfig,
@@ -19,7 +22,7 @@ import {
 
 async function ensureDirectoryExists(dirPath) {
   try {
-    await fs.promises.mkdir(dirPath, { recursive: true });
+    await fs.promises.mkdir(dirPath, {recursive: true});
     console.log(`Directory created or already exists: ${dirPath}`);
   } catch (err) {
     console.error(`Failed to create directory: ${err.message}`);
@@ -67,6 +70,7 @@ async function configureUI(
   auth0Token,
   vaultSiteSecretsPath,
   imageTag,
+  revision,
   repoPath,
   useS3,
 ) {
@@ -81,7 +85,7 @@ async function configureUI(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: { authorization: `Bearer ${auth0Token}` },
+        headers: {authorization: `Bearer ${auth0Token}`},
       },
     );
 
@@ -117,10 +121,18 @@ async function configureUI(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
+    const awsS3Vars = (useS3 === true || useS3 === 'true')
+      ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
+      : '';
+
     // Prepare ui.app.yaml
     const uiAppYaml = `
 repo: docupace-ui-main
-revision: master
+revision: ${revision}
 `.trim();
 
     // Prepare ui.values.yaml
@@ -135,29 +147,19 @@ uiMain:
   coreUrl: https://${coreURL}
   env:
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_SECRET
-    AUTH0_SECRET: vault:secret/data/${site}/ui/config#AUTH0_SECRET
-    ${
-      useS3 === true || useS3 === 'true'
-        ? `
-    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
-    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
-    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
-    `.trim()
-        : ''
-    }
+    AUTH0_SECRET: vault:secret/data/${site}/ui/config#AUTH0_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
 image:
   repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/enterprise-ui-app
   tag: ${imageTag}
 ${
-  useS3 === true || useS3 === 'true'
-    ? `
+      useS3 === true || useS3 === 'true'
+        ? `
 serviceAccount:
   create: true
   annotations:
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket
-`.trim()
-    : ''
-}
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "-10"
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`.trim() : ''}`.trim();`
 imagePullSecrets:
   - name: jf-artifactory
 ingress:
@@ -222,7 +224,7 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log('File written successfully.');
+          console.log(`File ${repoPath}/dp/${site}/ui.app.yaml written successfully.`);
         }
       },
     );
@@ -234,13 +236,11 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log('File written successfully.');
+          console.log(`File ${repoPath}/dp/${site}/ui.values.yaml written successfully.`);
         }
       },
     );
-    console.log('Done!');
-    console.log('Updating Core Site Config...');
-    await updateCoreSiteConfig(site, env, useS3);
+    console.log('The UI part is done!');
   } catch (error) {
     console.error('Error configuring UI:', error);
   }
@@ -259,6 +259,7 @@ async function configureCCUI(
   auth0Token,
   vaultSiteSecretsPath,
   imageTag,
+  revision,
   repoPath,
   useS3,
   ccUrl,
@@ -275,7 +276,7 @@ async function configureCCUI(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: { authorization: `Bearer ${auth0Token}` },
+        headers: {authorization: `Bearer ${auth0Token}`},
       },
     );
 
@@ -311,13 +312,21 @@ async function configureCCUI(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
+    const awsS3Vars = (useS3 === true || useS3 === 'true')
+      ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
+      : '';
+
     // Prepare cc.app.yaml
-    const uiССAppYaml = `
+    const uiCCAppYaml = `
 repo: docupace-ui-main
-revision: master
+revision: ${revision}
 `.trim();
     // Prepare cc.values.yaml
-    const uiССValuesYaml = `
+    const uiCCValuesYaml = `
 uiMain:
   auth0BaseUrl: https://${ccUrl}
   auth0IssuerBaseUrl: https://${auth0Domain}
@@ -329,13 +338,7 @@ uiMain:
   env:
     AUTH0_AUDIENCE: core-api-access
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_CLIENT_SECRET
-    AUTH0_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_SECRET
-    ${
-      useS3 === true || useS3 === 'true'
-        ? `
-    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
-    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
-    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    AUTH0_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
 image:
   repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/cc-ui-app
   tag: ${imageTag}
@@ -358,52 +361,45 @@ ingress:
     - hosts:
         - ${ccUrl}
       secretName: dp-cc-ui-cert
-    `.trim()
-        : ''
-    }
 ${
-  useS3 === true || useS3 === 'true'
-    ? `
+      useS3 === true || useS3 === 'true'
+        ? `
 serviceAccount:
   create: true
   annotations:
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket
-`.trim()
-    : ''
-}
-`.trim();
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "-10"
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`.trim() : ''}`.trim();
 
     console.log('Writing configuration files...');
     await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
 
     await fs.writeFile(
       `${repoPath}/dp/${site}/cc.app.yaml`,
-      uiССAppYaml,
+      uiCCAppYaml,
       (err) => {
         if (err) {
-          console.error('Failed to write the file:', err);
+          console.error(`Failed to write ${repoPath}/dp/${site}/cc.app.yaml file:`, err);
         } else {
-          console.log('File written successfully.');
+          console.log(`File ${repoPath}/dp/${site}/cc.app.yaml written successfully.`);
         }
       },
     );
 
     await fs.writeFile(
       `${repoPath}/dp/${site}/cc.values.yaml`,
-      uiССValuesYaml,
+      uiCCValuesYaml,
       (err) => {
         if (err) {
-          console.error('Failed to write the file:', err);
+          console.error(`Failed to write ${repoPath}/dp/${site}/cc.values.yaml file:`, err);
         } else {
-          console.log('File written successfully.');
+          console.log(`File ${repoPath}/dp/${site}/cc.values.yaml written successfully.`);
         }
       },
     );
-    console.log('Done!');
-    console.log('Updating Core Site Config...');
-    await updateCoreSiteConfig(site, env, useS3);
+    console.log('CC-UI configuration is done!');
   } catch (error) {
-    console.error('Error configuring UI:', error);
+    console.error('Error configuring CC-UI:', error);
   }
 }
 
@@ -418,12 +414,12 @@ export async function cleanAndWritePropertiesFile(configPath, content) {
     await fs.writeFile(configPath, cleanedContent, 'utf8');
     console.log(`Cleaned and written file to: ${configPath}`);
   } catch (error) {
-    console.error('Error writing properties file:', error.message);
+    console.error(`Error writing properties file to ${configPath}:`, error.message);
     process.exit(1);
   }
 }
 
-export async function updateCoreSiteConfig(site, env, useS3) {
+export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
   try {
     const coreSiteEnv = coreSiteEnvMap[env];
 
@@ -439,7 +435,7 @@ export async function updateCoreSiteConfig(site, env, useS3) {
 
     let siteAWSSecrets = null;
 
-    if (useS3 === true || useS3 === 'true') {
+    if (useS3Ui === true || useS3Ui === 'true' || useS3Gq === true || useS3Gq === 'true') {
       const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
       siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
@@ -447,14 +443,11 @@ export async function updateCoreSiteConfig(site, env, useS3) {
 
     const coreSiteConfig = `
         ${
-          siteAWSSecrets
-            ? `
+      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()
-            : ''
-        }
+com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}`.trim() : ''}
 `;
 
     await fs.ensureDir(path.join(coreSiteConfigRepoPath, site.toUpperCase()));
@@ -481,9 +474,11 @@ async function configureGraphQLServer(
   auth0Token,
   vaultSiteSecretsPath,
   imageTag,
+  revision,
   standardConfigRemoteBranch,
   repoPath,
   commonSecrets,
+  useS3,
 ) {
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
@@ -495,7 +490,7 @@ async function configureGraphQLServer(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: { authorization: `Bearer ${auth0Token}` },
+        headers: {authorization: `Bearer ${auth0Token}`},
       },
     );
 
@@ -530,13 +525,28 @@ async function configureGraphQLServer(
 
     await updateVaultSecrets(vaultSiteSecretsPath, graphQLServerSecretData);
 
-    // Prepare ui.app.yaml
+    let siteAWSSecrets = null;
+
+    if (useS3 === true || useS3 === 'true') {
+      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
+      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
+      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
+    }
+
+    const awsS3Vars = (useS3 === true || useS3 === 'true')
+      ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_S3_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`.trim()
+      : '';
+    // Prepare graphql-server.app.yaml
     const graphQLServerAppYaml = `
 repo: docupace-graphql-server
-revision: ${standardConfigRemoteBranch}
+revision: ${revision}
 `.trim();
 
-    // Prepare ui.values.yaml
+    // Prepare graphql-server.values.yaml
     const graphQLServerValuesYaml = `
 graphqlServer:
   auth0Domain: https://${auth0Domain}
@@ -552,7 +562,17 @@ graphqlServer:
     STANDARD_CONFIG_REMOTE_PATH: vault:secret/data/common/config#STANDARD_CONFIG_REMOTE_PATH
     SITE_CONFIG_REMOTE_PATH: vault:secret/data/${site}/common/config#SITE_CONFIG_REMOTE_PATH
     AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
-    AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET
+    AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
+${
+      useS3 === true || useS3 === 'true'
+        ? `
+serviceAccount:
+  create: true
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "-10"
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`.trim()
+        : ''}
 image:
   repository: registry.paperout.com/docupace-graphql-server-${env}-docker-local/docupace-graphql-server
   tag: ${imageTag}
@@ -574,8 +594,7 @@ ingress:
   tls:
     - hosts:
         - ${siteHost}
-      secretName: dp-next-ui-cert
-`.trim();
+      secretName: dp-next-ui-cert`.trim();
 
     // Write configuration files
     console.log('Writing ArgoCD GraphQL Server configuration files...');
@@ -598,13 +617,13 @@ ingress:
       graphQLServerValuesYaml,
       (err) => {
         if (err) {
-          console.error('Failed to write the file:', err);
+          console.error(`Failed to write ${repoPath}/dp/${site}/graphql-server.values.yaml file:`, err);
         } else {
-          console.log('File written successfully.');
+          console.log(`File ${repoPath}/dp/${site}/graphql-server.values.yaml written successfully.`);
         }
       },
     );
-    console.log('Done!');
+    console.log('GraphQL Server configuration is done!');
   } catch (error) {
     console.error('Error configuring GraphQL Server:', error);
   }
@@ -618,8 +637,9 @@ export async function configureFromSite(
   deployUI,
   deployGraphQLServer,
   useNewDomain,
-  useS3,
+  useS3Ui,
   deployCCUI,
+  useS3Gq,
 ) {
   console.log(
     `Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`,
@@ -673,20 +693,61 @@ export async function configureFromSite(
   // const auth0RepoPath = await cloneRepository('auth0-site-setup');
 
   // Read deploy configs
-  const { deployConfig: deployUIConfig } = await readDeployConfig(
+  const {deployConfig: deployUIConfig} = await readDeployConfig(
     'ui',
     fromEnv,
     fromSite,
     'values',
   );
+  const {deployConfig: deployUiRevisionConfig} = await readDeployConfig(
+    'ui',
+    fromEnv,
+    fromSite,
+    'app',
+  );
+
   const uiImageTag = deployUIConfig.image.tag;
+  const uiRevision = deployUiRevisionConfig.revision;
+
+  console.log(`Copying Latest UI Revision: ${uiRevision}`);
 
-  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
+  const {deployConfig: deployCCConfig} = await readDeployConfig(
+    'cc',
+    fromEnv,
+    fromSite,
+    'values',
+  );
+
+  const {deployConfig: deployCCRevisionConfig} = await readDeployConfig(
+    'cc',
+    fromEnv,
+    fromSite,
+    'app',
+  );
+
+  const ccImageTag = deployCCConfig.image.tag;
+  const ccRevision = deployCCRevisionConfig.revision;
+
+  console.log(`Copying Latest CC Revision: ${uiRevision}`);
+
+  const {deployConfig: deployGraphQLServerConfig} = await readDeployConfig(
     'graphql-server',
     fromEnv,
     fromSite,
     'values',
   );
+
+  const {deployConfig: deployGraphQLServerRevisionConfig} = await readDeployConfig(
+    'graphql-server',
+    fromEnv,
+    fromSite,
+    'app',
+  );
+
+  const gqRevision = deployGraphQLServerRevisionConfig.revision;
+
+  console.log(`Copying Latest GQ Server Revision: ${gqRevision}`);
+
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
   const graphqlStandardConfigRemoteBranch =
     deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
@@ -700,7 +761,11 @@ export async function configureFromSite(
 
   const envConfig = environmentConfig[toEnv];
 
-  let CORE_URL, SITE_HOST, CORE_API_CONTEXT, CONNECT_URL, DOCUPACE_HOST;
+  let CORE_URL,
+    SITE_HOST,
+    CORE_API_CONTEXT,
+    CONNECT_URL,
+    DOCUPACE_HOST;
   const newUrl = envConfig.newUrl(toSite);
   const ccUrl = envConfig.ccUrl(toSite);
 
@@ -735,8 +800,9 @@ export async function configureFromSite(
       auth0Token,
       uiSecretsPath,
       uiImageTag,
+      uiRevision,
       repoPathToEnv,
-      useS3,
+      useS3Ui,
     );
   }
 
@@ -753,9 +819,10 @@ export async function configureFromSite(
       auth0ClientSecret,
       auth0Token,
       ccUISecretsPath,
-      uiImageTag,
+      ccImageTag,
+      ccRevision,
       repoPathToEnv,
-      useS3,
+      useS3Ui,
       ccUrl,
     );
   }
@@ -772,10 +839,15 @@ export async function configureFromSite(
     auth0Token,
     graphqlSecretsPath,
     graphqlImageTag,
+    gqRevision,
     graphqlStandardConfigRemoteBranch,
     repoPathToEnv,
     commonSecrets,
+    useS3Gq,
   );
+
+  console.log('Updating Core Site Config...');
+  await updateCoreSiteConfig(toSite, toEnv, useS3Ui, useS3Gq);
   await pushDeployConfig(
     repoPathToEnv,
     `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`,