@docupace/pipeline 1.0.13 → 1.0.15

package/package.json

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

package/src/auth0/configure.js

@@ -455,6 +455,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:

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/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