@docupace/pipeline 1.0.7-alpha.ervins1.26 → 1.0.7-alpha.ervins1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.7-alpha.ervins1.26",
+  "version": "1.0.7-alpha.ervins1.3",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/connect.js

@@ -22,8 +22,7 @@ import {
 process.env.COMMON_VAULT_PATH = process.env.COMMON_VAULT_PATH || 'secret/data/common/config';
 process.env.VAULT_SKIP_VERIFY = process.env.VAULT_SKIP_VERIFY || 'true';
 process.env.CONNECT_DIR = process.env.CONNECT_DIR || 'connect';
-const vaultToken = process.env.VAULT_TOKEN;
-const vaultAddr = process.env.VAULT_ADDR;
+
 
 function log(msg) {
     console.log(`[*] ${msg}`);
@@ -41,19 +40,22 @@ function log(msg) {
       log(`Cloning ${destDir} repository...`);
     }
     
+    // Since we use zx, the environment variables can be read from process.env
+    // e.g. $BITBUCKET_USERNAME, $BITBUCKET_APP_PASSWORD
     const username = process.env.BITBUCKET_USERNAME;
     const password = process.env.BITBUCKET_APP_PASSWORD;
   
     // Construct clone command
     const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
   
-    log(`Perform cloning`);
+    // Perform the clone
     await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
   }
   
   
 
-
+    const vaultToken = process.env.VAULT_TOKEN;
+    const vaultAddr = process.env.VAULT_ADDR;
   
 
 export async function connectClone() {
@@ -84,8 +86,8 @@ export async function connectClone() {
     process.env.AUTH0_CLIENT_ID = siteCommonSecrets.AUTH0_CLIENT_ID;
     process.env.AUTH0_CLIENT_SECRET = siteCommonSecrets.AUTH0_CLIENT_SECRET;
   
-   
-    process.env.AUTH0_REGION_DOMAIN="us.auth0.com";
+    process.env.AUTH0_SUBDOMAIN="docupace-${BUILD_ENVIRONMENT}-${BUILD_SITE}"
+    process.env.AUTH0_REGION_DOMAIN="us.auth0.com"
 
     log(`BUILD_ENVIRONMENT: ${process.env.BUILD_ENVIRONMENT}`);
     log(`BUILD_SITE: ${process.env.BUILD_SITE}`);
@@ -93,23 +95,21 @@ 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 = `${process.env.AUTH0_SUBDOMAIN}.${process.env.AUTH0_REGION_DOMAIN}`;
     
 
     const projectRoot = process.cwd();
     // 4) Clone 'connect-deploy' into CONNECT_DIR
-
-    
     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`);
-
+    
     // 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,`${process.env.FROM_BUILD_ENVIRONMENT}/${process.env.FROM_BUILD_SITE}`);
+    const cloneTo = path.join(projectRoot,process.env.CONNECT_DIR,`${process.env.BUILD_ENVIRONMENT}/${process.env.BUILD_SITE}`);
+    log(`projectRoot: ${projectRoot}`);
+    const connectHome = path.join(projectHome,process.env.CONNECT_DIR);
 
-    const connectHome = path.join(projectRoot,process.env.CONNECT_DIR);
     if (!(await fs.pathExists(cloneFrom))) {
-      log('Clone template directory not found:');
+      log('Clone template directory not found');
       process.exit(1);
     }
   
@@ -117,48 +117,15 @@ export async function connectClone() {
     if (!(await fs.pathExists(cloneTo))) {
       log('New site does not exist. Performing cloning...');
 
-      process.env.IMAGE_VERSION=await $`cd ${cloneFrom} && grep -E '^IMAGE_VERSION=' dock.sh | cut -f2 -d=`
-      log(`Image version: ${process.env.IMAGE_VERSION}` );
-      //await $`cd ${cloneFrom} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
-      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}`;
-            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
-        }
-    })();
-    
-    
+      process.env.IMAGE_VERSION=$`cd ${cloneFrom} && grep -E '^IMAGE_VERSION=' dock.sh | cut -f2 -d=`
+      await $`cd ${cloneTo} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
     } else {
       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 $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
+  
     // 7) Check conf files, print logs
     await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
     await $`ls -all ${path.join(cloneTo, 'conf')}`;

package/src/next/vault.js

@@ -1,39 +1,13 @@
-import axios from 'axios';
+import { $ } from 'zx';
 
-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
-
-    if (!VAULT_ADDR || !VAULT_TOKEN) {
-        throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
-    }
 
-    const vaultApiUrl = `${VAULT_ADDR}/v1/secret/data/dp-${SITE}/common/config`;
+export async function vaultAddSiteData(SITE) {
+    const AUTH0_CLIENT_ID = `${process.env.AUTH0_CLIENT_ID}`;
+    const AUTH0_CLIENT_SECRET = `${process.env.AUTH0_CLIENT_SECRET}`; 
+    await $`export VAULT_SKIP_VERIFY=true`;
+    await $`vault kv put secret/dp-${SITE}/common/config AUTH0_CLIENT_ID="${AUTH0_CLIENT_ID}" AUTH0_CLIENT_SECRET="${AUTH0_CLIENT_SECRET}"`
+}
 
-    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',
-                },
-            }
-        );
 
-        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;
-    }
-}