@docupace/pipeline 1.0.13 → 1.0.16

package/package.json

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

package/src/auth0/cli.js

@@ -18,10 +18,10 @@ dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 const program = new Command();
 
 program
-    .command('configureFromSite <fromSite> <toSite> <env> <deployUI> <deployGraphQLServer> <useNewDomain>')
+    .command('configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain>')
     .description('Configure the Auth0 tenants in env for the given site')
-    .action(async (fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) => {
-        await configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain);
+    .action(async (fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain) => {
+        await configureFromSite(fromSite, toSite, fromEnv, toEnv, deployUI, deployGraphQLServer, useNewDomain);
     });
 
 program

package/src/auth0/configure.js

@@ -167,6 +167,11 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
 
       graphqlAllowedCallbacksUrls = [`${siteUrl}/api/graphql/callback`];
       graphqlAllowedLogoutUrls = [`${siteUrl}/api/graphql/`];
+
+      connectAllowedCallbacksUrls = [`${siteUrl}/connect/samlCallback?client_name=auth0`];
+      connectlAllowedLogoutUrls = [ `${siteUrl}/connect`];
+      
+
     } else {
       uiAllowedCallbacksUrls = [
         `${siteUrl}/api/auth/callback`,
@@ -185,6 +190,16 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
         `http://localhost:4000/api/graphql/`,
         `${siteUrl}/api/graphql/`,
       ];
+      
+      connectAllowedCallbacksUrls = [
+        `${siteUrl}/connect/samlCallback?client_name=auth0`,
+        `http://localhost:9000/connect/samlCallback?client_name=auth0`,
+      ];
+      connectlAllowedLogoutUrls = [
+        `${siteUrl}/connect`
+      ];
+    
+      
     }
 
     const configureUI = deployUI === 'true';
@@ -196,6 +211,16 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
         callbacks: uiAllowedCallbacksUrls,
         allowed_logout_urls: uiAllowedLogoutUrls,
       });
+
+      //TODO: move to separate function for connect
+      console.log('connect_allowed_callbacks_urls ->', connectAllowedCallbacksUrls);
+      console.log('connect_allowed_logout_urls ->', connectAllowedLogoutUrls);
+
+      await updateJsonFile(filePaths.connectJson, {
+        callbacks: connectAllowedCallbacksUrls,
+        allowed_logout_urls: connectAllowedLogoutUrls,
+      });
+
       console.log('Updated URLs for main UI...');
     } else {
       await fs.promises.unlink(filePaths.uiJson);
@@ -276,6 +301,9 @@ export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
 
 async function configureUI(siteHost, coreURL, docupaceHost, site, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, repoPath) {
   console.log(`Configuring UI for site: ${site} Host: ${siteHost} in env: ${env}`);
+  siteHost = siteHost.replace('https://', '');
+  coreURL = coreURL.replace('https://', '');
+
 
   try {
     const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
@@ -403,6 +431,8 @@ externalConnectService:
 }
 
 async function configureGraphQLServer(siteHost, coreURL, docupaceHost, site, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, standardConfigRemoteBranch, repoPath, commonSecrets) {
+  siteHost = siteHost.replace('https://', '');
+  coreURL = coreURL.replace('https://', '');
   console.log(`Configuring GraphQL Server for site: ${site} Host: ${siteHost} in env: ${env}`);
 
   try {
@@ -455,6 +485,7 @@ graphqlServer:
   env:
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CLIENT_SECRET
     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
 image:
@@ -506,8 +537,9 @@ ingress:
   }
 }
 
-export async function configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) {
-  console.log(`Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${env} from site: ${fromSite}`);
+
+export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain) {
+  console.log(`Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`);
   // Common Secrets
   const commonSecretsPath = getVaultSecretsConfigs(toSite).commonSecretsPath;
   console.log(`commonSecretsPath => ${commonSecretsPath}`)
@@ -518,7 +550,7 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
   console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`)
   const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
 
-  const auth0Domain = `docupace-${env}-${toSite}.us.auth0.com`
+  const auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`
   const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
   const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
   const auth0Token = await getAuth0AuthToken(auth0Domain, auth0ClientId, auth0ClientSecret);
@@ -529,17 +561,29 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
 
   // GraphQL-Server app
   const graphqlSecretsPath = getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
-  console.log(`graphqlSecretsPath => ${graphqlSecretsPath}`)
+  console.log(`graphqlSecretsPath => ${graphqlSecretsPath}`);
 
+  let repoPathFromEnv ="";
+  let repoPathToEnv = "";
   // Clone repositories
-  const repoPath = await cloneEnvRepository(env);
+  if ( fromEnv == toEnv ) {
+     repoPathFromEnv = await cloneEnvRepository(fromEnv);
+     repoPathToEnv = repoPathFromEnv;
+  }else {
+     repoPathFromEnv = await cloneEnvRepository(fromEnv);
+     repoPathToEnv = await cloneEnvRepository(toEnv);
+  }
+
+
+  //TODO: clone fromEnv and toEnv. replace above with this
+
   const auth0RepoPath = await cloneRepository('auth0-site-setup');
 
   // Read deploy configs
-  const { deployConfig: deployUIConfig } = await readDeployConfig('ui', env, fromSite, 'values');
+  const { deployConfig: deployUIConfig } = await readDeployConfig('ui', fromEnv, fromSite, 'values');
   const uiImageTag = deployUIConfig.image.tag;
 
-  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', env, fromSite, 'values');
+  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', fromEnv, fromSite, 'values');
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
   const graphqlStandardConfigRemoteBranch = deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
 
@@ -550,6 +594,7 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
     loginHtml: './auth0-site-setup/template/pages/login.html',
     graphqlJson: './auth0-site-setup/template/clients/docupace-graphql.json',
     uiJson: './auth0-site-setup/template/clients/docupace-ui-main.json',
+    connectJson: './auth0-site-setup/template/clients/docupace-connect.json',
     databaseJson: './auth0-site-setup/template/database-connections/docupace/database.json',
     twilioJson: './auth0-site-setup/template/guardian/providers/sms-twilio.json',
   };
@@ -557,7 +602,7 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
   console.log(`Copying Latest UI Image Tag: ${deployUIConfig.image.tag} from site: ${fromSite} to site: ${toSite}`);
   console.log(`Copying Latest GraphQL Server Image Tag: ${deployGraphQLServerConfig.image.tag} from site: ${fromSite} to site: ${toSite}`);
 
-  const envConfig = environmentConfig[env];
+  const envConfig = environmentConfig[toEnv];
 
   let CORE_URL,
     SITE_HOST,
@@ -579,15 +624,15 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
     CONNECT_URL = `${oldUrl}_ui`;
   }
 
-  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, env, filePaths, deployUI, deployGraphQLServer, commonSecrets);
+  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, toEnv, filePaths, deployUI, deployGraphQLServer, commonSecrets);
   await importAuth0Templates('./auth0-site-setup/template', auth0Domain, auth0ClientId, auth0ClientSecret);
 
   if (deployUI === 'true') {
-    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPath);
+    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, toEnv, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPathToEnv);
   }
 
-  await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, graphqlStandardConfigRemoteBranch, repoPath, commonSecrets);
-  await pushDeployConfig(repoPath, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
+  await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, toEnv, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, graphqlStandardConfigRemoteBranch, repoPathToEnv, commonSecrets);
+  await pushDeployConfig(repoPathToEnv, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
 
   await initializeAuth0Configuration({
     initConfiguration: "true",
@@ -602,4 +647,4 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
     auth0AuthToken: auth0Token,
     coreApiIdentifier: commonSecrets.CORE_API_IDENTIFIER
   })
-}
+}

package/src/next/apache.js

@@ -23,14 +23,18 @@ export async function addApacheSite() {
     await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
     await fs.chmod('private.key', 0o600);
   
-    const server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
+    
     console.log("Running command");
-    const sshCmd = (script) =>
+    const sshCmd = (server,script) =>
       $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
   
+    let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
     // The script is run twice in the Bash version
-    await sshCmd(`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
-    //await sshCmd(`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
+    await sshCmd(server, `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
+
+    server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
+
+    await sshCmd(server,`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
   }
   
   

package/src/next/cli.js

@@ -17,7 +17,6 @@ dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 
 const program = new Command();
 
-// GIT SHA computation
 import { $ } from 'zx';
 import {deployConnect, deployCore} from './jenkins.js';
 import { runPipeline } from './pipline.js';
@@ -52,7 +51,6 @@ program
   await connectClone();
 });
 
-
 program
 .command('haproxySync')
 .description('Sync haproxy config')
@@ -60,15 +58,14 @@ program
   await haproxySync();
 });
 
-
-
 program
   .command('vaultAddSiteData')
   .description('Add m2m auth0 data to vault')
   .requiredOption('-s, --site-name <siteName>', 'Site name')
+  .requiredOption('-p, --site-config-remote-path <siteConfigRemotePath>', 'Site Config Remote Path')
   .action(async (options) => {
-    const { siteName,  } = options;
-    await vaultAddSiteData(siteName);
+    const { siteName, siteConfigRemotePath } = options;
+    await vaultAddSiteData(siteName, siteConfigRemotePath);
   });
 
 program
@@ -130,7 +127,6 @@ program
     });
   });
 
-
   program
   .command('copy')
   .description('Copy a Docker image between registries')

package/src/next/connect.js

@@ -25,6 +25,14 @@ process.env.CONNECT_DIR = process.env.CONNECT_DIR || 'connect';
 const vaultToken = process.env.VAULT_TOKEN;
 const vaultAddr = process.env.VAULT_ADDR;
 
+const connectUIEnvMap= {
+  'dev': 'dev',
+  'qa': 'preprod',
+  'stg': 'stg',
+  'uat': 'uat',
+  'prd': 'prod-las'
+};
+
 function log(msg) {
     console.log(`[*] ${msg}`);
   }
@@ -57,8 +65,8 @@ function log(msg) {
   
 
 export async function connectClone() {
-
-
+     const connectFromEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+     const connectToEnv = connectUIEnvMap[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.");
@@ -87,7 +95,7 @@ export async function connectClone() {
    
     process.env.AUTH0_REGION_DOMAIN="us.auth0.com";
 
-    log(`BUILD_ENVIRONMENT: ${process.env.BUILD_ENVIRONMENT}`);
+    log(`BUILD_ENVIRONMENT: ${connectToEnv}`);
     log(`BUILD_SITE: ${process.env.BUILD_SITE}`);
     log(`AUTH0_SUBDOMAIN: ${process.env.AUTH0_SUBDOMAIN}`);
     log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
@@ -101,11 +109,12 @@ export async function connectClone() {
 
     
     await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
-    await gitCheckout(`${process.env.BUILD_ENVIRONMENT}-site-settings`, `${process.env.CONNECT_DIR}/${process.env.BUILD_ENVIRONMENT}-site-settings`);
+    
+    await gitCheckout(`${connectToEnv}-site-settings`, `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`);
 
     // 5) Create site clone (emulating the dock.sh call)
-    const cloneFrom = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${process.env.FROM_BUILD_ENVIRONMENT}/${process.env.FROM_BUILD_SITE}`);
-    const cloneTo = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${process.env.BUILD_ENVIRONMENT}/${process.env.BUILD_SITE}`);
+    const cloneFrom = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${connectFromEnv}/${process.env.FROM_BUILD_SITE}`);
+    const cloneTo = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${connectToEnv}/${process.env.BUILD_SITE}`);
 
     const connectHome = path.join(projectRoot,process.env.CONNECT_DIR);
     if (!(await fs.pathExists(cloneFrom))) {
@@ -123,7 +132,7 @@ export async function connectClone() {
       await (async () => {
         try {
             // Execute the shell command
-            const result = await $`cd ${cloneFrom} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+            const result = await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
             console.log('Command succeeded:');
             console.log('stdout:', result.stdout); // Standard output
             console.log('stderr:', result.stderr); // Standard error
@@ -179,7 +188,7 @@ export async function connectClone() {
   
     if (numChanges > 0) {
       const jiraTicket = process.env.JIRA_TICKET || 'NO_JIRA';
-      const message = `${jiraTicket} usdoc-s-builui job download_auth0_metadata for ${process.env.BUILD_ENVIRONMENT}/${process.env.BUILD_SITE}`;
+      const message = `${jiraTicket} usdoc-s-builui job download_auth0_metadata for ${connectToEnv}/${process.env.BUILD_SITE}`;
       log('About to commit changes to git');
       await $`cd ${cloneTo} && git commit -m ${message}`;
       await $`cd ${cloneTo} && git push -u origin master`;

package/src/next/vault.js

@@ -1,39 +1,43 @@
 import axios from 'axios';
 
-export async function vaultAddSiteData(SITE) {
-    const AUTH0_CLIENT_ID = process.env.AUTH0_CLIENT_ID;
-    const AUTH0_CLIENT_SECRET = process.env.AUTH0_CLIENT_SECRET;
-    const VAULT_ADDR = process.env.VAULT_ADDR;       // Vault host URL from environment variables
-    const VAULT_TOKEN = process.env.VAULT_TOKEN;     // Vault token from environment variables
+export async function vaultAddSiteData(SITE, SITE_CONFIG_REMOTE_PATH) {
+  const AUTH0_CLIENT_ID = process.env.AUTH0_CLIENT_ID;
+  const AUTH0_CLIENT_SECRET = process.env.AUTH0_CLIENT_SECRET;
+  const VAULT_ADDR = process.env.VAULT_ADDR;       // Vault host URL from environment variables
+  const VAULT_TOKEN = process.env.VAULT_TOKEN;     // Vault token from environment variables
 
-    if (!VAULT_ADDR || !VAULT_TOKEN) {
-        throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
-    }
+  if (!VAULT_ADDR || !VAULT_TOKEN) {
+    throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
+  }
 
-    const vaultApiUrl = `${VAULT_ADDR}/v1/secret/data/${SITE}/common/config`;
+  const vaultApiUrl = `${VAULT_ADDR}/v1/secret/data/${SITE}/common/config`;
 
-    try {
-        const response = await axios.post(
-            vaultApiUrl,
-            {
-                data: {
-                    AUTH0_CLIENT_ID: AUTH0_CLIENT_ID,
-                    AUTH0_CLIENT_SECRET: AUTH0_CLIENT_SECRET,
-                },
-            },
-            {
-                headers: {
-                    'X-Vault-Token': VAULT_TOKEN,
-                    'Content-Type': 'application/json',
-                },
-            }
-        );
+  try {
 
-        console.log('Data added to Vault successfully:', response.data);
-    } catch (error) {
-        console.error('Error adding data to Vault:', error.response?.data || error.message);
-        throw error;
+    if (process.env.VAULT_SKIP_VERIFY === 'true') {
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
     }
-}
 
+    const response = await axios.post(
+      vaultApiUrl,
+      {
+        data: {
+          AUTH0_CLIENT_ID: AUTH0_CLIENT_ID,
+          AUTH0_CLIENT_SECRET: AUTH0_CLIENT_SECRET,
+          SITE_CONFIG_REMOTE_PATH: SITE_CONFIG_REMOTE_PATH,
+        },
+      },
+      {
+        headers: {
+          'X-Vault-Token': VAULT_TOKEN,
+          'Content-Type': 'application/json',
+        },
+      }
+    );
 
+    console.log('Data added to Vault successfully:', response.data);
+  } catch (error) {
+    console.error('Error adding data to Vault:', error.response?.data || error.message);
+    throw error;
+  }
+}

package/terraform/validate.sh

@@ -14,4 +14,4 @@ cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
 terraform version
 terraform init -backend=false
 terraform validate
-terraform fmt -check -recursive --diff
+terraform fmt -check -recursive --diff || exit 0