@docupace/pipeline 1.0.7-alpha.ervins1.2 → 1.0.7-alpha.ervins1.20

package/package.json

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

package/src/next/connect.js

@@ -22,7 +22,8 @@ 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}`);
@@ -40,22 +41,19 @@ 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`;
   
-    // Perform the clone
+    log(`Perform cloning`);
     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() {
@@ -96,74 +94,95 @@ export async function connectClone() {
     log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
   
     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('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 = `${process.env.FROM_BUILD_ENVIRONMENT}/${process.env.FROM_BUILD_SITE}`;
-    const projectRoot = path;
-    console.log(projectRoot);
-    console.log($`find .`);
-    const projectHome = path.resolve(process.env.CONNECT_DIR);
-    console.log(projectHome);
-  
-    const cloneFromPath = path.join(projectHome, 'envs', cloneFrom);
-    if (!(await fs.pathExists(cloneFromPath))) {
-      log('Clone template directory not found');
+    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 connectHome = path.join(projectRoot,process.env.CONNECT_DIR);
+    if (!(await fs.pathExists(cloneFrom))) {
+      log('Clone template directory not found:');
       process.exit(1);
     }
   
-    const newSitePath = path.join(
-      projectHome,
-      'envs',
-      process.env.BUILD_ENVIRONMENT,
-      process.env.BUILD_SITE
-    );
   
-    if (!(await fs.pathExists(newSitePath))) {
+    if (!(await fs.pathExists(cloneTo))) {
       log('New site does not exist. Performing cloning...');
-      // This is where the bash script does: bash dock.sh clone ...
-      // We'll replicate with zx:
-      process.env.IMAGE_VERSION=$`cd ${cloneFromPath} && grep -E '^IMAGE_VERSION=' dock.sh | cut -f2 -d=`
-      await $`cd ${targetSitePath} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+
+      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
+        }
+    })();
+    
+    
     } else {
       log('Site already exists. Continuing Auth0 setup...');
     }
   
-    // 6) Retrieve Auth0 metadata
-    const targetSitePath = path.join(
-      projectHome,
-      'envs',
-      process.env.BUILD_ENVIRONMENT,
-      process.env.BUILD_SITE
-    );
-    await $`cd ${targetSitePath} && bash dock.sh getAuth0Metadata`;
-  
+
+    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
+      }
+  })();
+
+
     // 7) Check conf files, print logs
-    await $`grep "auth0" ${path.join(targetSitePath, 'conf/application.conf')}`;
-    await $`ls -all ${path.join(targetSitePath, 'conf')}`;
-    await $`ls -all ${path.join(targetSitePath, 'conf/saml')}`;
-    await $`cat ${path.join(targetSitePath, '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 ${targetSitePath} && git checkout master && git pull --ff-only`;
-    await $`cd ${targetSitePath} && git remote -v`;
-    await $`cd ${targetSitePath} && git branch`;
-    await $`cd ${targetSitePath} && git status`;
-    await $`cd ${targetSitePath} && git add . ../sites.sh`;
-    await $`cd ${targetSitePath} && git status`;
+    await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
+    await $`cd ${cloneTo} && git remote -v`;
+    await $`cd ${cloneTo} && git branch`;
+    await $`cd ${cloneTo} && git status`;
+    await $`cd ${cloneTo} && git add . ../sites.sh`;
+    await $`cd ${cloneTo} && git status`;
   
     const numChanges = (
-      await $`cd ${targetSitePath} && git diff-index HEAD`
+      await $`cd ${cloneTo} && git diff-index HEAD`
     ).stdout.split('\n').filter(Boolean).length;
   
     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}`;
       log('About to commit changes to git');
-      await $`cd ${targetSitePath} && git commit -m ${message}`;
-      await $`cd ${targetSitePath} && git push -u origin master`;
+      await $`cd ${cloneTo} && git commit -m ${message}`;
+      await $`cd ${cloneTo} && git push -u origin master`;
     } else {
       log('No changes have been made. The site likely already has the correct configuration.');
     }