@docupace/pipeline 1.0.1-2.ervins.14 → 1.0.1-2.ervins.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.12.ervins.14",
+  "version": "1.0.12.ervins.2",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/configure.js

@@ -278,9 +278,6 @@ async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
 
 async function configureUI(siteHost, coreURL, docupaceHost, site, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, repoPath) {
   console.log(`Configuring UI for site: ${site} Host: ${siteHost} in env: ${env}`);
-  siteHost = siteHost.replace('https://', '');
-  coreURL = coreURL.replace('https://', '');
-
 
   try {
     const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
@@ -408,8 +405,6 @@ externalConnectService:
 }
 
 async function configureGraphQLServer(siteHost, coreURL, docupaceHost, site, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, standardConfigRemoteBranch, repoPath, commonSecrets) {
-  siteHost = siteHost.replace('https://', '');
-  coreURL = coreURL.replace('https://', '');
   console.log(`Configuring GraphQL Server for site: ${site} Host: ${siteHost} in env: ${env}`);
 
   try {
@@ -513,7 +508,7 @@ ingress:
   }
 }
 
-export async function configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) {
+export async function configureFromSite(fromSite, toSite, env,fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain) {
   console.log(`Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${env} from site: ${fromSite}`);
   // Common Secrets
   const commonSecretsPath = getVaultSecretsConfigs(toSite).commonSecretsPath;
@@ -525,7 +520,7 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
   console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`)
   const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
 
-  const auth0Domain = `docupace-${env}-${toSite}.us.auth0.com`
+  const auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`
   const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
   const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
   const auth0Token = await getAuth0AuthToken(auth0Domain, auth0ClientId, auth0ClientSecret);
@@ -539,7 +534,7 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
   console.log(`graphqlSecretsPath => ${graphqlSecretsPath}`);
 
   // Clone repositories
-  const repoPath = await cloneEnvRepository(env);
+  const repoPath = await cloneEnvRepository(toEnv);
   const auth0RepoPath = await cloneRepository('auth0-site-setup');
 
   // Read deploy configs

package/src/next/apache.js

@@ -19,22 +19,20 @@ export async function addApacheSite() {
       log('Error: HAPROXY_PRIVATE_KEY not set.');
       process.exit(1);
     }
-  
-    await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
+   
+    //await fs.writeFile('private.key', haproxyPrivateKey);
+    await $`echo "${haproxyPrivateKey}" > private.key`;
     await fs.chmod('private.key', 0o600);
-  
     
+  
+    const server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
     console.log("Running command");
-    const sshCmd = (server,script) =>
+    const sshCmd = (script) =>
       $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
   
-    let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
     // The script is run twice in the Bash version
-    await sshCmd(server, `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
-
-    server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
-
-    await sshCmd(server,`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
+    await sshCmd(`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
+    //await sshCmd(`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
   }