@docupace/pipeline 1.0.24 → 1.0.26-alpha-2

package/src/next/connect.js

@@ -1,187 +1,194 @@
 import 'zx/globals'; // npm i zx
 import fs from 'fs-extra';
 import path from 'path';
+import axios from 'axios';
 import { $ } from 'zx';
 
+
+
+import {
+  cloneEnvRepository,
+  cloneRepository
+} from './deploy.js';
+
+
 import { getVaultSecrets } from '../auth0/vault.js';
 
-process.env.COMMON_VAULT_PATH =
-  process.env.COMMON_VAULT_PATH || 'secret/data/common/config';
+import {
+  getVaultSecretsConfigs,
+  environmentConfig
+} from './config.js';
+
+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;
 
-const connectUIEnvMap = {
-  dev: 'dev',
-  qa: 'preprod',
-  stg: 'stg',
-  uat: 'uat',
-  prd: 'prod-las',
+const connectUIEnvMap= {
+  'dev': 'dev',
+  'qa': 'preprod',
+  'stg': 'stg',
+  'uat': 'uat',
+  'prd': 'prod-las'
 };
 
 function log(msg) {
-  console.log(`[*] ${msg}`);
-}
-
-/* --------------------------------
- * 1. GIT CHECKOUT
- * -------------------------------- */
-async function gitCheckout(repository, destDir, branch = 'master') {
-  if (!(await fs.pathExists(destDir))) {
-    log(`Directory ${destDir} does not exist. Cloning repository...`);
-  } else {
-    log(`Directory ${destDir} exists. Removing it...`);
-    await fs.remove(destDir);
-    log(`Cloning ${destDir} repository...`);
+    console.log(`[*] ${msg}`);
   }
 
-  const username = process.env.BITBUCKET_USERNAME;
-  const password = process.env.BITBUCKET_APP_PASSWORD;
+  /* --------------------------------
+   * 1. GIT CHECKOUT
+   * -------------------------------- */
+  async function gitCheckout(repository, destDir, branch = 'master') {
+    if (!(await fs.pathExists(destDir))) {
+      log(`Directory ${destDir} does not exist. Cloning repository...`);
+    } else {
+      log(`Directory ${destDir} exists. Removing it...`);
+      await fs.remove(destDir);
+      log(`Cloning ${destDir} repository...`);
+    }
 
-  // Construct clone command
-  const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
+    const username = process.env.BITBUCKET_USERNAME;
+    const password = process.env.BITBUCKET_APP_PASSWORD;
 
-  log(`Perform cloning`);
-  await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
-}
+    // Construct clone command
+    const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
 
-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.');
+    log(`Perform cloning`);
+    await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
   }
 
-  const site = process.env.BUILD_SITE;
-  if (!site) {
-    log('Error: BUILD_SITE is not set');
-    process.exit(1);
-  }
-  const siteCommonVaultPath = `secret/data/${site}/common/config`;
+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.");
+    }
 
-  // 2) getVaultSecrets
-  const secretsJson = await getVaultSecrets(siteCommonVaultPath);
-  if (!secretsJson.AUTH0_CLIENT_ID) {
-    log('Failed to retrieve secret data.');
-    process.exit(1);
-  }
-  const siteCommonSecrets = secretsJson;
-
-  // 3) Export secrets as environment variables
-  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';
-
-  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}`);
-  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}`;
-
-  const projectRoot = process.cwd();
-  // 4) Clone 'connect-deploy' into CONNECT_DIR
-
-  await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
-
-  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`,
-    `${connectFromEnv}/${process.env.FROM_BUILD_SITE}`,
-  );
-  const cloneTo = path.join(
-    projectRoot,
-    process.env.CONNECT_DIR,
-    `envs`,
-    `${connectToEnv}/${process.env.BUILD_SITE}`,
-  );
-
-  if (!(await fs.pathExists(cloneFrom))) {
-    log('Clone template directory not found:');
-    process.exit(1);
-  }
+    const site = process.env.BUILD_SITE;
+    if (!site) {
+      log('Error: BUILD_SITE is not set');
+      process.exit(1);
+    }
+    const siteCommonVaultPath = `secret/data/${site}/common/config`;
+
+
+    // 2) getVaultSecrets
+    const secretsJson = await getVaultSecrets(siteCommonVaultPath);
+    if (!secretsJson.AUTH0_CLIENT_ID) {
+      log('Failed to retrieve secret data.');
+      process.exit(1);
+    }
+    const siteCommonSecrets = secretsJson;
+
+    // 3) Export secrets as environment variables
+    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";
+
+    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}`);
+    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}`;
+
+
+    const projectRoot = process.cwd();
+    // 4) Clone 'connect-deploy' into CONNECT_DIR
+
+
+    await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
+
+    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`,`${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))) {
+      log('Clone template directory not found:');
+      process.exit(1);
+    }
+
+
+    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 ${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
+        } 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...');
+    }
 
-  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 ${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
+          // 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
+          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...');
-  }
-
-  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(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 ${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 ${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 ${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`;
-  } else {
-    log(
-      'No changes have been made. The site likely already has the correct configuration.',
-    );
+
+    // 7) Check conf files, print logs
+    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 ${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 ${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 ${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`;
+    } else {
+      log('No changes have been made. The site likely already has the correct configuration.');
+    }
   }
-}
+

package/src/next/copy.js

@@ -28,25 +28,3 @@ export async function copy(application, fromEnv, toEnv, tag) {
   await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
   await $`docker push ${toFullImageName}`;
 }
-
-export async function copy2(repositoryName, fromEnv, toEnv, tag) {
-  const envInfo = getEnvInfo();
-  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
-  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
-  const fromFullImageName = `${fromRegistry}/${imageName}`;
-  const toFullImageName = `${toRegistry}/${imageName}`;
-
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
-
-  // Login to source registry
-  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker pull ${fromFullImageName}`;
-  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
-
-  // Login to target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
-}