@docupace/pipeline 1.0.1-2.ervinsUpdate2.6 → 1.0.2-3.tes1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.12.ervinsUpdate2.6",
+  "version": "1.0.23.tes1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -16,6 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "@changesets/cli": "^2.27.10",
+    "@docupace/core-client": "^0.1.59",
     "auth0-deploy-cli": "^7.24.3",
     "axios": "^1.7.9",
     "commander": "^12.1.0",

package/src/auth0/alias.js

@@ -0,0 +1,75 @@
+import axios from 'axios';
+
+import {
+  createAlias
+} from '../next/alias.js';
+
+import {getAuth0AuthToken} from './configure.js';
+
+import {
+  getVaultSecrets,
+} from './vault.js';
+
+import {
+  getVaultSecretsConfigs,
+} from '../next/config.js';
+
+import {
+  cloneEnvRepository,
+  readDeployConfig,
+} from '../next/deploy.js';
+
+export async function getCCAlias ({application, auth0Domain, auth0AuthToken}){
+  console.log(`Forming alias name for application ${application}...`);
+
+  try {
+    const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
+      headers: {authorization: `Bearer ${auth0AuthToken}`},
+    });
+
+    const appAuth0ClientIdData = auth0Response.data.find(client => client.name === `${application}`);
+    const appAuth0ClientId = appAuth0ClientIdData.client_id;
+
+    console.log(`Client Credentials Alias: ${appAuth0ClientId}@clients`);
+    return `${appAuth0ClientId}@clients`;
+  } catch (err) {
+    console.error(`Failed to form alias name for application: ${application}: ${err.message}`);
+  }
+}
+
+export async function configureAlias(site, env, username, password, realm) {
+
+  console.log(`Creating alias for site: ${site} in env: ${env}`);
+
+  const commonSecretsPath = getVaultSecretsConfigs(site).commonSecretsPath;
+  console.log(`commonSecretsPath => ${commonSecretsPath}`)
+  const commonSecrets = await getVaultSecrets(commonSecretsPath);
+
+  // Site Common Secrets
+  const siteCommonSecretsPath = getVaultSecretsConfigs(site).siteCommonSecretsPath;
+  console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`)
+  const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
+
+  const auth0Domain = `docupace-${env}-${site}.us.auth0.com`
+  const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
+  const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
+  const auth0Token = await getAuth0AuthToken(auth0Domain, auth0ClientId, auth0ClientSecret);
+
+  await cloneEnvRepository(env);
+
+  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', env, site, 'values');
+  const coreUrl = deployGraphQLServerConfig.graphqlServer.coreUrl;
+
+  const clientCredentialsAlias = await getCCAlias({
+    application: 'docupace-graphql-client-credentials',
+    auth0Domain: auth0Domain,
+    auth0AuthToken: auth0Token
+  });
+
+  await createAlias(
+    coreUrl,
+    username,
+    password,
+    realm,
+    clientCredentialsAlias);
+}

package/src/auth0/cli.js

@@ -9,16 +9,19 @@ import {
 } from './vault.js'
 
 import dotenv from 'dotenv';
+import {
+  configureAlias
+} from "./alias.js";
 
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 
 const program = new Command();
 
 program
-    .command('configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain>')
+    .command('configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <configureMFA>')
     .description('Configure the Auth0 tenants in env for the given site')
-    .action(async (fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain) => {
-        await configureFromSite(fromSite, toSite, fromEnv, toEnv, deployUI, deployGraphQLServer, useNewDomain);
+    .action(async (fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain, configureMFA) => {
+        await configureFromSite(fromSite, toSite, fromEnv, toEnv, deployUI, deployGraphQLServer, useNewDomain, configureMFA);
     });
 
 program
@@ -28,4 +31,11 @@ program
     await getVaultSecrets(vaultPath);
   });
 
+program
+  .command('configureAlias <site> <env> <username> <password> <realm>')
+  .description('Configure Core Alias for the given site')
+  .action(async (site, env, username, password, realm) => {
+    await configureAlias(site, env, username, password, realm);
+  });
+
 program.parse(process.argv);

package/src/auth0/configure.js

@@ -1,10 +1,9 @@
 import fs from 'fs';
 import path from 'path';
-import yaml from 'js-yaml';
-import { $ } from 'zx';
 import axios from 'axios';
 import crypto from 'crypto';
 import { deploy } from 'auth0-deploy-cli';
+import fl from 'fs/promises';
 
 import {
   cloneEnvRepository,
@@ -22,6 +21,8 @@ import {
   getVaultSecretsConfigs,
   environmentConfig
 } from '../next/config.js';
+import { connect } from 'http2';
+import { promise } from 'zod';
 
 async function ensureDirectoryExists(dirPath) {
   try {
@@ -32,6 +33,27 @@ async function ensureDirectoryExists(dirPath) {
   }
 }
 
+async function copyDirectory(source, destination) {
+  try {
+    await fl.mkdir(destination, { recursive: true });
+    const items = await fl.readdir(source, { withFileTypes: true });
+
+    for (const item of items) {
+      const sourcePath = path.join(source, item.name);
+      const destinationPath = path.join(destination, item.name);
+
+      if (item.isDirectory()) {
+        await copyDirectory(sourcePath, destinationPath);
+      } else {
+        await fl.copyFile(sourcePath, destinationPath);
+      }
+    }
+  } catch (err) {
+    console.error(`Error copying directory: ${err.message}`);
+    throw err;
+  }
+}
+
 async function addApplicationToApi ({application, auth0Domain, auth0AuthToken, coreApiIdentifier}){
   console.log("Adding application to API authorized applications...");
 
@@ -155,13 +177,18 @@ async function replaceInFile(filePath, replacements) {
   await fs.promises.writeFile(filePath, content, 'utf8');
 }
 
-async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI, deployGraphQLServer, commonSecrets) {
+async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI, deployGraphQLServer, commonSecrets, configureMFA) {
   try {
     let uiAllowedCallbacksUrls,
       uiAllowedLogoutUrls;
     let graphqlAllowedCallbacksUrls,
       graphqlAllowedLogoutUrls;
+    let connectAllowedCallbacksUrls,
+      connectlAllowedLogoutUrls;
 
+    let connectClientMetadata,
+        connectCallbacks,
+        connectAddons;
     // Configure URLs based on environment
     if (env === 'prd') {
       uiAllowedCallbacksUrls = [`${siteUrl}/api/auth/callback`];
@@ -172,8 +199,6 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
 
       connectAllowedCallbacksUrls = [`${siteUrl}/connect/samlCallback?client_name=auth0`];
       connectlAllowedLogoutUrls = [ `${siteUrl}/connect`];
-      
-
     } else {
       uiAllowedCallbacksUrls = [
         `${siteUrl}/api/auth/callback`,
@@ -183,7 +208,6 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
         `${siteUrl}`,
         `http://localhost:3000`,
       ];
-
       graphqlAllowedCallbacksUrls = [
         `${siteUrl}/api/graphql/callback`,
         `http://localhost:4000/api/graphql/callback`,
@@ -192,7 +216,6 @@ 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`,
@@ -200,10 +223,38 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
       connectlAllowedLogoutUrls = [
         `${siteUrl}/connect`
       ];
-    
-      
+
+      const siteUrlNoPrefix=siteUrl.replace(/^https?:\/\//, '');
+      connectClientMetadata ={
+        "docupaceContext" : "core",
+        "docupaceHost" : `${siteUrlNoPrefix}`,
+        "docupace_context" : "core",
+        "docupace_host" : `${siteUrlNoPrefix}  `
+      };
+
+      connectCallbacks = [
+        `${siteUrl}/connect/samlCallback?client_name=auth0`
+      ];
+
+      connectAddons = {
+        "samlp": {
+          "audience": `${siteUrl}/connect`,
+          "recipient": `${siteUrl}/connect/samlCallback?client_name=auth0`,
+          "destination": `${siteUrl}/connect/samlCallback?client_name=auth0`,
+          "nameIdentifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+          "binding": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
+          "nameIdentifierProbes": [
+            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/docupace-username"
+          ],
+          "mappings": {
+            "proposalHandle": "ProposalHandle"
+          }
+        }
+      };
+
     }
 
+
     const configureUI = deployUI === 'true';
     if (configureUI) {
       console.log('ui_allowed_callbacks_urls ->', uiAllowedCallbacksUrls);
@@ -214,15 +265,21 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
         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);
+      console.log('connect_allowed_logout_urls ->', connectlAllowedLogoutUrls);
 
+      // update allowed callback url
       await updateJsonFile(filePaths.connectJson, {
         callbacks: connectAllowedCallbacksUrls,
-        allowed_logout_urls: connectAllowedLogoutUrls,
+        allowed_logout_urls: connectlAllowedLogoutUrls,
+        client_metadata: connectClientMetadata,
+        addons: connectAddons
       });
 
+
+
       console.log('Updated URLs for main UI...');
     } else {
       await fs.promises.unlink(filePaths.uiJson);
@@ -259,28 +316,36 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
 
     console.log('TWILIO configuration updated...');
 
+    const tmpSiteUrl = siteUrl.replace(/^https?:\/\//, '');
     // Database configuration
     await replaceInFile(filePaths.databaseLoginJs, [
-      ['${docupaceHost}', siteUrl],
+      ['${docupaceHost}', tmpSiteUrl],
       ['${docupaceContext}', coreApiContext],
     ]);
 
-    // MFA configuration
-    // if (process.env.AUTH0_MFA === 'ENABLE') {
-    //   console.log('AUTH0 MFA is enabled');
-    //   await execAsync('rsync -av ./auth0template/templateMFA/ ./auth0template/template/');
-    // } else if (process.env.AUTH0_MFA === 'DISABLE') {
-    //   console.log('AUTH0 MFA is disabled');
-    //   await execAsync('rsync -av ./auth0template/templateNoMFA/ ./auth0template/template/');
-    // }
+    console.log('MFA Template configuration started...');
+
+    try {
+      const sourceDir = configureMFA === 'DISABLED' ? 'auth0-site-setup/templateNoMFA/' : 'auth0-site-setup/templateMFA/';
+      const destinationDir = 'auth0-site-setup/template/';
+
+      console.log(`AUTH0 MFA is ${configureMFA === 'DISABLED' ? 'disabled' : 'enabled'}`);
+      await copyDirectory(sourceDir, destinationDir);
+
+      console.log('MFA configuration completed.');
+    } catch (err) {
+      console.error('Error configuring MFA:', err);
+      throw err;
+    }
 
     console.log('Template configuration completed.');
   } catch (err) {
-    console.error('Error configuring Auth0 templates:', err);
+    // console.error('Error configuring Auth0 templates:', err);
+    throw err;
   }
 }
 
-async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
+export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
   try {
     const response = await axios.post(`https://${auth0Domain}/oauth/token`, {
       client_id: clientId,
@@ -487,6 +552,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:
@@ -539,7 +605,7 @@ ingress:
 }
 
 
-export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain) {
+export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain, configureMFA) {
   console.log(`Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`);
   // Common Secrets
   const commonSecretsPath = getVaultSecretsConfigs(toSite).commonSecretsPath;
@@ -575,7 +641,6 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
      repoPathToEnv = await cloneEnvRepository(toEnv);
   }
 
-
   //TODO: clone fromEnv and toEnv. replace above with this
 
   const auth0RepoPath = await cloneRepository('auth0-site-setup');
@@ -584,13 +649,12 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
   const { deployConfig: deployUIConfig } = await readDeployConfig('ui', fromEnv, fromSite, 'values');
   const uiImageTag = deployUIConfig.image.tag;
 
-  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', fromEnv, fromSite, 'values');
+  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig('graphql-server', fromEnv, fromSite, 'values');
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
   const graphqlStandardConfigRemoteBranch = deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
 
   // File paths
   const filePaths = {
-    clientJson: './auth0-site-setup/template/clients/docupace-connect.json',
     databaseLoginJs: './auth0-site-setup/template/database-connections/docupace/login.js',
     loginHtml: './auth0-site-setup/template/pages/login.html',
     graphqlJson: './auth0-site-setup/template/clients/docupace-graphql.json',
@@ -625,7 +689,7 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
     CONNECT_URL = `${oldUrl}_ui`;
   }
 
-  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, toEnv, filePaths, deployUI, deployGraphQLServer, commonSecrets);
+  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, toEnv, filePaths, deployUI, deployGraphQLServer, commonSecrets, configureMFA);
   await importAuth0Templates('./auth0-site-setup/template', auth0Domain, auth0ClientId, auth0ClientSecret);
 
   if (deployUI === 'true') {
@@ -648,4 +712,4 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
     auth0AuthToken: auth0Token,
     coreApiIdentifier: commonSecrets.CORE_API_IDENTIFIER
   })
-}
+}

package/src/next/alias.js

@@ -0,0 +1,53 @@
+import { BasicAuth, DomainApi } from '@docupace/core-client';
+
+const userFilter = (userId) => {
+  return {
+    orSections: [
+      {
+        andSections: [
+          {
+            attrId: 9501,
+            '@type': 'string',
+            not: false,
+            orSections: [
+              { searchType: 'EXACT_MATCH', matchToValues: [userId] },
+            ],
+          },
+        ],
+      },
+    ],
+  };
+};
+
+/*
+Example:
+  await createAlias(
+    'https://www.dev.docupaceinc.com/financialdev',
+    'docupace',
+    'pw',
+    'Connect',
+    'qhnospjRjwUAeKFDhucHEabPsfihrGQQ@clients',
+  );
+ */
+export async function createAlias(coreUrl, username, password, realm, alias) {
+  const coreInfo = {
+    url: coreUrl,
+  };
+
+  let auth = new BasicAuth(username, password);
+
+  const domainApi = new DomainApi(coreInfo, auth);
+
+  const userResults = await domainApi.listRecords(50, {
+    filter: JSON.stringify(userFilter(username)),
+  });
+
+  const record = {
+    domainId: 302,
+    '5001': userResults.records[0].id,
+    '9102': realm,
+    '9504': alias,
+  };
+
+  await domainApi.create(record);
+}

package/src/next/cli.js

@@ -9,7 +9,7 @@ import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
 import { addApacheSite } from './apache.js';
-import { haproxySync }  from './haproxy.js';
+import { haproxySync } from './haproxy.js';
 import { connectClone } from './connect.js';
 import dotenv from 'dotenv';
 
@@ -17,9 +17,8 @@ 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 { deployConnect, deployCore } from './jenkins.js';
 import { runPipeline } from './pipline.js';
 
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
@@ -39,36 +38,37 @@ program
   });
 
 program
-.command('addApacheSite')
-.description('Add site to apache')
-.action(async () => {
-  await addApacheSite();
-});
+  .command('addApacheSite')
+  .description('Add site to apache')
+  .action(async () => {
+    await addApacheSite();
+  });
 
 program
-.command('connectClone')
-.description('Clone connect site')
-.action(async () => {
-  await connectClone();
-});
-
+  .command('connectClone')
+  .description('Clone connect site')
+  .action(async () => {
+    await connectClone();
+  });
 
 program
-.command('haproxySync')
-.description('Sync haproxy config')
-.action(async () => {
-  await haproxySync();
-});
-
-
+  .command('haproxySync')
+  .description('Sync haproxy config')
+  .action(async () => {
+    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,8 +130,7 @@ program
     });
   });
 
-
-  program
+program
   .command('copy')
   .description('Copy a Docker image between registries')
   .requiredOption('-a, --application <application>', 'Application name')

package/src/next/deploy.js

@@ -6,7 +6,6 @@ import lodash from 'lodash';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
 import { copy } from './copy.js';
 import axios from 'axios';
-import { runPipeline } from './pipline.js';
 import { deployCore } from './jenkins.js';
 
 /**
@@ -34,7 +33,7 @@ function cleanUpRepoPath(repoPath) {
     console.log(`${repoPath} directory exists. Removing it...`);
     fs.rmSync(repoPath, {
       recursive: true,
-      force: true
+      force: true,
     });
   }
 }
@@ -43,6 +42,7 @@ export async function cloneEnvRepository(env) {
   const { repoPath, repoName } = getRepoLocalPath(env);
   const repoUrl = getRepUrl(repoName);
   console.log(`Cloning repository: ${repoName}`);
+  await cleanUpRepoPath(repoPath);
   await $`git clone --depth 1 ${repoUrl}`;
   console.log(`Repository cloned to: ${repoPath}`);
   return repoPath;
@@ -52,7 +52,7 @@ export async function cloneRepository(repoSlug) {
   const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
   const repoUrl = getRepUrl(repoName);
 
-  await cleanUpRepoPath(repoPath)
+  await cleanUpRepoPath(repoPath);
 
   console.log(`Cloning repository: ${repoName}`);
   await $`git clone --depth 1 ${repoUrl}`;
@@ -70,6 +70,24 @@ function getConfigPath(application, env, site, name) {
   return { repoPath, deployConfigFilePath };
 }
 
+function getAppTypesFromRepo(env, site) {
+  const { repoPath } = getRepoLocalPath(env);
+  const deployConfigFilePath = path.join(repoPath, `dp/${site}`);
+
+  const applications = [];
+  if (fs.existsSync(deployConfigFilePath)) {
+    const files = fs.readdirSync(deployConfigFilePath);
+    files.forEach((file) => {
+      if (file.includes('.values.yaml')) {
+        const appName = file.split('.')[0];
+        applications.push(appName);
+      }
+    });
+  }
+
+  return { applications };
+}
+
 export async function readDeployConfig(application, env, site, name) {
   const { deployConfigFilePath } = getConfigPath(application, env, site, name);
 
@@ -265,6 +283,60 @@ async function getCoreBranchName(fromEnv, fromSite) {
   return branchName;
 }
 
+export async function deployApp(
+  application,
+  appDetails,
+  fromEnv,
+  fromSite,
+  toEnv,
+  toSite,
+) {
+  let changesMade = false;
+  console.log(`Processing application: ${application}`);
+
+  // Read the deployment configuration for the source environment and site
+  const { deployConfig: fromDeployConfig } = await readDeployConfig(
+    application,
+    fromEnv,
+    fromSite,
+    'values',
+  );
+
+  if (fromEnv !== toEnv) {
+    await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
+  }
+
+  // Read the deployment configuration for the target environment and site
+  const {
+    deployConfig: toDeployConfig,
+    deployConfigFilePath: toDeployConfigFilePath,
+  } = await readDeployConfig(application, toEnv, toSite, 'values');
+
+  // Update target configuration using attributes specified in appInfo
+  for (const attribute of appDetails.deployAttributes) {
+    const sourceValue = lodash.get(fromDeployConfig, attribute);
+
+    if (sourceValue !== undefined) {
+      // Update the target configuration with the source value
+      lodash.set(toDeployConfig, attribute, sourceValue);
+      changesMade = true;
+    }
+  }
+
+  const {
+    deployConfig: toDeployAppConfig,
+    deployConfigFilePath: toDeployAppConfigFilePath,
+  } = await readDeployConfig(application, toEnv, toSite, 'app');
+
+  toDeployAppConfig.revision = fromDeployConfig.image.tag;
+
+  // Write updated configuration to the target YAML file
+  writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
+
+  writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+  return changesMade;
+}
+
 export async function deployFromSite(
   fromEnv,
   fromSite,
@@ -294,52 +366,47 @@ export async function deployFromSite(
 
   // Initialize a flag to track changes
   let changesMade = false;
-
+  const applications = await getAppTypesFromRepo(fromEnv, fromSite);
   // Iterate over applications in appInfo
-  for (const [application, appDetails] of Object.entries(appInfo)) {
-    console.log(`Processing application: ${application}`);
+  let appInfoLocal = {};
+  // let appInfoLocal = Object.fromEntries(
+  //   applications
+  //     .filter((application) => appInfo[application])
+  //     .map((application) => [application, appInfo[application]]),
+  // );
+
+  for (const application of applications) {
+    if (Object.prototype.hasOwnProperty.call(appInfo, application)) {
+      appInfoLocal[application] = appInfo[application];
+    }
+  }
 
-    // Read the deployment configuration for the source environment and site
-    const { deployConfig: fromDeployConfig } = await readDeployConfig(
-      application,
-      fromEnv,
+  if (Object.keys(appInfoLocal).length === 0) {
+    const { deployConfig: toDeployAppConfig } = await readDeployConfig(
       fromSite,
-      'values',
+      toEnv,
+      toSite,
+      'app',
     );
 
-    if (fromEnv !== toEnv) {
-      await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
-    }
-
-    // Read the deployment configuration for the target environment and site
-    const {
-      deployConfig: toDeployConfig,
-      deployConfigFilePath: toDeployConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'values');
-
-    // Update target configuration using attributes specified in appInfo
-    for (const attribute of appDetails.deployAttributes) {
-      const sourceValue = lodash.get(fromDeployConfig, attribute);
+    appInfoLocal[fromSite] = {
+      repositoryName: toDeployAppConfig.repo,
+      deployAttributes: ['image.tag'],
+    };
+  }
 
-      if (sourceValue !== undefined) {
-        // Update the target configuration with the source value
-        lodash.set(toDeployConfig, attribute, sourceValue);
-        changesMade = true;
-      }
+  for (const [application, appDetails] of Object.entries(appInfo)) {
+    let cm = await deployApp(
+      application,
+      appDetails,
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+    );
+    if (cm) {
+      changesMade = true;
     }
-
-    const {
-      deployConfig: toDeployAppConfig,
-      deployConfigFilePath: toDeployAppConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'app');
-
-    toDeployAppConfig.revision = fromDeployConfig.image.tag;
-
-    // Write updated configuration to the target YAML file
-    writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
-
-    writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
-
   }
 
   // Push all changes if any updates were made

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/init.sh

@@ -33,4 +33,16 @@ echo "$atlassian_workspace_runner_ssh_key" | base64 -d > ~/.ssh/id_ed25519
 chmod 600 ~/.ssh/id_ed25519
 ssh-keyscan bitbucket.org > ~/.ssh/known_hosts
 
-terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+
+
+if [[ "$PROJECT" == "s3" ]]; then
+terraform init \
+   -input=false \
+   -reconfigure \
+   -backend=true \
+   -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars \
+   -backend-config="key=us-west-2/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate" 
+
+else
+  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+fi

package/terraform/plan.sh

@@ -39,6 +39,16 @@ if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
                  -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json" \
                  -out .tfplan
+elif [[ "$PROJECT" == "s3" ]];then
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
+          -var="site=${SITE_NAME}" \
+          -var="env=${CURRENT_ENVIRONMENT}" \
+          -out .tfplan
 else
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
 fi
+
+
+
+
+

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