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

package/package.json

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

package/src/auth0/cli.js

@@ -18,7 +18,7 @@ program
     .command('configureFromSite <fromSite> <toSite> <env> <deployUI> <deployGraphQLServer> <useNewDomain>')
     .description('Configure the Auth0 tenants in env for the given site')
     .action(async (fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) => {
-        await configureFromSite(fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain);
+        await configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain);
     });
 
 program

package/src/auth0/configure.js

@@ -169,11 +169,6 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
 
       graphqlAllowedCallbacksUrls = [`${siteUrl}/api/graphql/callback`];
       graphqlAllowedLogoutUrls = [`${siteUrl}/api/graphql/`];
-
-      connectAllowedCallbacksUrls = [`${siteUrl}/connect/samlCallback?client_name=auth0`];
-      connectlAllowedLogoutUrls = [ `${siteUrl}/connect`];
-      
-
     } else {
       uiAllowedCallbacksUrls = [
         `${siteUrl}/api/auth/callback`,
@@ -192,16 +187,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`,
-      ];
-      connectlAllowedLogoutUrls = [
-        `${siteUrl}/connect`
-      ];
-    
-      
     }
 
     const configureUI = deployUI === 'true';
@@ -213,16 +198,6 @@ async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI,
         callbacks: uiAllowedCallbacksUrls,
         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);
-
-      await updateJsonFile(filePaths.connectJson, {
-        callbacks: connectAllowedCallbacksUrls,
-        allowed_logout_urls: connectAllowedLogoutUrls,
-      });
-
       console.log('Updated URLs for main UI...');
     } else {
       await fs.promises.unlink(filePaths.uiJson);
@@ -303,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`, {
@@ -433,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 {
@@ -538,8 +508,7 @@ ingress:
   }
 }
 
-
-export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, 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;
@@ -564,27 +533,15 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
   const graphqlSecretsPath = getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
   console.log(`graphqlSecretsPath => ${graphqlSecretsPath}`);
 
-  let repoPathFromEnv ="";
-  let repoPathToEnv = "";
   // Clone repositories
-  if ( fromEnv == toEnv ) {
-     repoPathFromEnv = await cloneEnvRepository(fromEnv);
-     repoPathToEnv = repoPathFromEnv;
-  }else {
-     repoPathFromEnv = await cloneEnvRepository(fromEnv);
-     repoPathToEnv = await cloneEnvRepository(toEnv);
-  }
-
-
-  //TODO: clone fromEnv and toEnv. replace above with this
-
+  const repoPath = await cloneEnvRepository(toEnv);
   const auth0RepoPath = await cloneRepository('auth0-site-setup');
 
   // Read deploy configs
-  const { deployConfig: deployUIConfig } = await readDeployConfig('ui', fromEnv, fromSite, 'values');
+  const { deployConfig: deployUIConfig } = await readDeployConfig('ui', env, fromSite, 'values');
   const uiImageTag = deployUIConfig.image.tag;
 
-  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', fromEnv, fromSite, 'values');
+  const { deployConfig: deployGraphQLServerConfig} = await readDeployConfig('graphql-server', env, fromSite, 'values');
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
   const graphqlStandardConfigRemoteBranch = deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
 
@@ -595,7 +552,6 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
     loginHtml: './auth0-site-setup/template/pages/login.html',
     graphqlJson: './auth0-site-setup/template/clients/docupace-graphql.json',
     uiJson: './auth0-site-setup/template/clients/docupace-ui-main.json',
-    connectJson: './auth0-site-setup/template/clients/docupace-connect.json',
     databaseJson: './auth0-site-setup/template/database-connections/docupace/database.json',
     twilioJson: './auth0-site-setup/template/guardian/providers/sms-twilio.json',
   };
@@ -629,11 +585,11 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
   await importAuth0Templates('./auth0-site-setup/template', auth0Domain, auth0ClientId, auth0ClientSecret);
 
   if (deployUI === 'true') {
-    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, toEnv, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPathToEnv);
+    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPath);
   }
 
-  await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, graphqlStandardConfigRemoteBranch, repoPathToEnv, commonSecrets);
-  await pushDeployConfig(repoPathToEnv, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
+  await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, graphqlStandardConfigRemoteBranch, repoPath, commonSecrets);
+  await pushDeployConfig(repoPath, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
 
   await initializeAuth0Configuration({
     initConfiguration: "true",
@@ -648,4 +604,4 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
     auth0AuthToken: auth0Token,
     coreApiIdentifier: commonSecrets.CORE_API_IDENTIFIER
   })
-}
+}

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}`);
   }