@docupace/pipeline 1.0.3-1.demo1 → 1.0.4-1.haproxysync.1

package/src/changeset/validate.js

@@ -1,47 +1,47 @@
-import fs from 'fs';
-import path from 'path';
-
-export async function validateChangesets(directoryPath) {
-  try {
-    // Step 1: Read the directory for md files excluding README.md
-    const allFiles = fs.readdirSync(directoryPath);
-    const mdFiles = allFiles.filter(
-      (file) => file.endsWith('.md') && file !== 'README.md',
-    );
-
-    // Step 2: Check for pre.json and parse it
-    const preJsonPath = path.join(directoryPath, 'pre.json');
-    let preJson;
-
-    if (!fs.existsSync(preJsonPath) && mdFiles.length === 0) {
-      throw new Error('Error: No pre.json and no md files found.');
-    }
-
-    if (fs.existsSync(preJsonPath)) {
-      preJson = JSON.parse(fs.readFileSync(preJsonPath, 'utf-8'));
-
-      if (preJson.mode == 'pre') {
-        // Step 4a: Get list of changesets from pre.json
-        const changesets = preJson.changesets || [];
-        const changesetNames = changesets.map((change) => change);
-
-        // Step 4b: Match files with the list of changesets
-        const mdFileNamesWithoutExt = mdFiles.map((file) =>
-          path.basename(file, '.md'),
-        );
-        const unmatchedFiles = mdFileNamesWithoutExt.filter(
-          (fileName) => !changesetNames.includes(fileName),
-        );
-
-        if (unmatchedFiles.length == 0) {
-          throw new Error('Error: No new MD files found:');
-        }
-      }
-    }
-
-    console.log('Validation successful.');
-  } catch (error) {
-    console.log(error.message);
-    throw error;
-  }
-}
+import fs from 'fs';
+import path from 'path';
+
+export async function validateChangesets(directoryPath) {
+  try {
+    // Step 1: Read the directory for md files excluding README.md
+    const allFiles = fs.readdirSync(directoryPath);
+    const mdFiles = allFiles.filter(
+      (file) => file.endsWith('.md') && file !== 'README.md',
+    );
+
+    // Step 2: Check for pre.json and parse it
+    const preJsonPath = path.join(directoryPath, 'pre.json');
+    let preJson;
+
+    if (!fs.existsSync(preJsonPath) && mdFiles.length === 0) {
+      throw new Error('Error: No pre.json and no md files found.');
+    }
+
+    if (fs.existsSync(preJsonPath)) {
+      preJson = JSON.parse(fs.readFileSync(preJsonPath, 'utf-8'));
+
+      if (preJson.mode == 'pre') {
+        // Step 4a: Get list of changesets from pre.json
+        const changesets = preJson.changesets || [];
+        const changesetNames = changesets.map((change) => change);
+
+        // Step 4b: Match files with the list of changesets
+        const mdFileNamesWithoutExt = mdFiles.map((file) =>
+          path.basename(file, '.md'),
+        );
+        const unmatchedFiles = mdFileNamesWithoutExt.filter(
+          (fileName) => !changesetNames.includes(fileName),
+        );
+
+        if (unmatchedFiles.length == 0) {
+          throw new Error('Error: No new MD files found:');
+        }
+      }
+    }
+
+    console.log('Validation successful.');
+  } catch (error) {
+    console.log(error.message);
+    throw error;
+  }
+}

package/src/jenkins/setParams.groovy

@@ -1,59 +1,59 @@
-import groovy.json.JsonSlurper
-
-import hudson.model.*;
-
-def build = Thread.currentThread().executable
-def params = build.getEnvironment(listener)
-
-def site = params.get('site')
-def server = "jboss7"
-def environment = params.get('environment')
-
-def buildFile=new File("D:\\Docupace\\CustomFolders\\" + environment + "\\" + site + "\\" + server + "\\buildApp.properties")
-
-List<String> jboss7controllerResult = []
-
-def controllersReport = new File("D:\\Docupace\\controllers_report.json")
-def inputJSON = new JsonSlurper().parseText(controllersReport.text)
-def props = new Properties()
-buildFile.withInputStream { stream -> props.load(stream) }
-def webRootContext = props["web.root.context"]
-if (webRootContext == null || webRootContext =="core") webRootContext = props["docupace.config.client.id"].toLowerCase()
-
-webRootContext  = webRootContext.replaceFirst('_sso','')
-def map = inputJSON.'content'
-
-def Boolean enabled
-
-map.each {k,v ->
-    v.each{vk, vv -> if (vk == webRootContext ) {
-        enabled = false
-        if(vv.deploymentsProperty.size()>0) enabled = vv.deploymentsProperty[0].isEnabled
-        if (enabled) jboss7controllerResult.push(k)
-        else jboss7controllerResult << k
-    }
-    }
-}
-
-if (jboss7controllerResult.size()>0) {
-    if (environment == 'preprod') {
-        jboss7controllerResult.remove("dev-corjbdc10.corp.docupace.com")
-        jboss7controllerResult.remove("usdoc-s-jbdc1.corp.docupace.com")
-    }
-    if (environment == 'dev') {
-        jboss7controllerResult.remove("qa-corjbdc10.corp.docupace.com")
-        jboss7controllerResult.remove("qa-corjbdc20.corp.docupace.com")
-        jboss7controllerResult.remove("usdoc-s-jbdc2.corp.docupace.com")
-    }
-}
-
-println jboss7controllerResult[0]
-
-env.jboss7controller = jboss7controllerResult[0]
-
-def serverGroup = inputJSON.'content'."${jboss7controller}"."${webRootContext}".'serverGroup'
-
-println serverGroup
-
-params.put("serverGroup", serverGroup)
-
+import groovy.json.JsonSlurper
+
+import hudson.model.*;
+
+def build = Thread.currentThread().executable
+def params = build.getEnvironment(listener)
+
+def site = params.get('site')
+def server = "jboss7"
+def environment = params.get('environment')
+
+def buildFile=new File("D:\\Docupace\\CustomFolders\\" + environment + "\\" + site + "\\" + server + "\\buildApp.properties")
+
+List<String> jboss7controllerResult = []
+
+def controllersReport = new File("D:\\Docupace\\controllers_report.json")
+def inputJSON = new JsonSlurper().parseText(controllersReport.text)
+def props = new Properties()
+buildFile.withInputStream { stream -> props.load(stream) }
+def webRootContext = props["web.root.context"]
+if (webRootContext == null || webRootContext =="core") webRootContext = props["docupace.config.client.id"].toLowerCase()
+
+webRootContext  = webRootContext.replaceFirst('_sso','')
+def map = inputJSON.'content'
+
+def Boolean enabled
+
+map.each {k,v ->
+    v.each{vk, vv -> if (vk == webRootContext ) {
+        enabled = false
+        if(vv.deploymentsProperty.size()>0) enabled = vv.deploymentsProperty[0].isEnabled
+        if (enabled) jboss7controllerResult.push(k)
+        else jboss7controllerResult << k
+    }
+    }
+}
+
+if (jboss7controllerResult.size()>0) {
+    if (environment == 'preprod') {
+        jboss7controllerResult.remove("dev-corjbdc10.corp.docupace.com")
+        jboss7controllerResult.remove("usdoc-s-jbdc1.corp.docupace.com")
+    }
+    if (environment == 'dev') {
+        jboss7controllerResult.remove("qa-corjbdc10.corp.docupace.com")
+        jboss7controllerResult.remove("qa-corjbdc20.corp.docupace.com")
+        jboss7controllerResult.remove("usdoc-s-jbdc2.corp.docupace.com")
+    }
+}
+
+println jboss7controllerResult[0]
+
+env.jboss7controller = jboss7controllerResult[0]
+
+def serverGroup = inputJSON.'content'."${jboss7controller}"."${webRootContext}".'serverGroup'
+
+println serverGroup
+
+params.put("serverGroup", serverGroup)
+

package/src/next/alias.js

@@ -1,53 +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);
-}
+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/apache.js

@@ -1,64 +1,40 @@
-import { $ } from 'zx';
-import fs from 'fs/promises';
-
-export async function addApacheSite() {
-  if (
-    !process.env.ENVIRONMENT ||
-    (process.env.ENVIRONMENT !== 'dev' && process.env.ENVIRONMENT !== 'qa')
-  ) {
-    console.log("Error: ENVIRONMENT must be either 'dev' or 'qa'.");
-    process.exit(1);
-  }
-  if (!process.env.SITE) {
-    console.log('Error: SITE cannot be empty.');
-    process.exit(1);
-  }
-
-  // Save private key from base64
-  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
-  if (!haproxyPrivateKey) {
-    console.log('Error: HAPROXY_PRIVATE_KEY not set.');
-    process.exit(1);
-  }
-
-  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
-  await fs.chmod('private.key', 0o600);
-
-  console.log('Running command on apalb01a');
-  const sshCmd = async (server, script) => {
-    $.nothrow = true; // Don't throw on non-zero exit code
-    const result =
-      await $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`.stdio(
-        'inherit',
-      );
-    $.nothrow = false; // Reset the flag
-    return result;
-  };
-
-  let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
-  const resultA = await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-
-  if (resultA.exitCode !== 0) {
-    console.error(`Error on ${server}:`);
-    console.error(resultA.stderr);
-  } else {
-    console.log(`Finished command on ${server} successfully.`);
-  }
-
-  console.log('Running command on apalb01b');
-  server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
-  const resultB = await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-
-  if (resultB.exitCode !== 0) {
-    console.error(`Error on ${server}:`);
-    console.error(resultB.stderr);
-  } else {
-    console.log(`Finished command on ${server} successfully.`);
-  }
-}
+import { $ } from 'zx';
+
+export async function addApacheSite() {
+    if (
+      !process.env.ENVIRONMENT ||
+      (process.env.ENVIRONMENT !== 'dev' && process.env.ENVIRONMENT !== 'qa')
+    ) {
+      log("Error: ENVIRONMENT must be either 'dev' or 'qa'.");
+      process.exit(1);
+    }
+    if (!process.env.SITE) {
+      log('Error: SITE cannot be empty.');
+      process.exit(1);
+    }
+  
+    // Save private key from base64
+    const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
+    if (!haproxyPrivateKey) {
+      log('Error: HAPROXY_PRIVATE_KEY not set.');
+      process.exit(1);
+    }
+  
+    await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
+    await fs.chmod('private.key', 0o600);
+  
+    
+    console.log("Running command");
+    const sshCmd = (server,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}`);
+  }
+  
+  

package/src/next/cli.js

@@ -4,7 +4,12 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import { deployFromSite } from './deploy.js';
+import {
+  deployAppWithTag,
+  deployFromSite,
+  getDefaultDeploySite,
+  getDeployTag,
+} from './deploy.js';
 import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
@@ -101,10 +106,30 @@ program
   });
 
 program
-  .command('deployTemplate <site>')
+  .command('deploy-template')
   .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(site);
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deployTemplate')
+  .description('Deploy an application for a specific site')
+  .action(async () => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployTemplate(env, site, deployTag);
+  });
+
+program
+  .command('deploy-app <application>')
+  .description('Deploy an application for a specific site')
+  .action(async (application) => {
+    const deployTag = await getDeployTag();
+    const { env, site } = await getDefaultDeploySite(deployTag);
+    await deployAppWithTag(application, env, site, deployTag);
   });
 
 program

package/src/next/config.js

@@ -1,84 +1,99 @@
-export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
-
-export const environmentConfig = {
-  dev: {
-    newUrl: (site) => `https://${site}.dev.dpai.tech`,
-    oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.dev.docupaceinc.com',
-  },
-  qa: {
-    newUrl: (site) => `https://${site}.qa.dpai.tech`,
-    oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
-    docupaceHost: () => 'www.preprod.docupaceinc.com',
-  },
-  uat: {
-    newUrl: (site) => `https://${site}.qa.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-  stage: {
-    newUrl: (site) => `https://${site}.stage.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-  prod: {
-    newUrl: (site) => `https://${site}.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}`,
-    docupaceHost: () => 'www2.paperout.com',
-  },
-};
-
-export const appInfo = {
-  'graphql-server': {
-    repositoryName: 'docupace-graphql-server',
-    deployAttributes: [
-      'image.tag',
-      'graphqlServer.siteConfigRemoteBranch',
-      'graphqlServer.standardConfigRemoteBranch',
-    ],
-  },
-  ui: {
-    repositoryName: 'docupace-ui-main',
-    deployAttributes: ['image.tag'],
-  },
-};
-
-export const getEnvInfo = () => {
-  const envInfo = Object.fromEntries(
-    environments.map((env) => [
-      env,
-      {
-        jfrog: {
-          username: process.env[`JF_REGISTRY_${env.toUpperCase()}_USERNAME`],
-          password: process.env[`JF_REGISTRY_${env.toUpperCase()}_PASSWORD`],
-        },
-      },
-    ]),
-  );
-
-  return envInfo;
-};
-
-export const getBitbucketInfo = () => {
-  return {
-    username: process.env.BITBUCKET_USERNAME,
-    password: process.env.BITBUCKET_APP_PASSWORD,
-    workspace: 'dp-cloud',
-  };
-};
-
-export const getRepUrl = (repoName) => {
-  const { username, password, workspace } = getBitbucketInfo();
-  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
-};
-
-export const jfRegistryUrl = 'registry.paperout.com';
-
-export const getVaultSecretsConfigs = (site) => {
-  return {
-    commonSecretsPath: 'secret/data/common/config',
-    siteCommonSecretsPath: `secret/data/${site}/common/config`,
-    graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
-    uiSecretsPath: `secret/data/${site}/ui/config`,
-  };
-};
+export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
+
+export const environmentConfig = {
+  dev: {
+    newUrl: (site) => `https://${site}.dev.dpai.tech`,
+    oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
+    docupaceHost: () => 'www.dev.docupaceinc.com',
+    ccUrl: (site) => `https://${site}-cc.dev.dpai.tech`,
+  },
+  qa: {
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
+    oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
+    docupaceHost: () => 'www.preprod.docupaceinc.com',
+    ccUrl: (site) => `https://${site}-cc.qa.dpai.tech`,
+  },
+  uat: {
+    newUrl: (site) => `https://${site}.uat.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
+    docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
+  },
+  stage: {
+    newUrl: (site) => `https://${site}.stg.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
+    docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.stg.dpai.tech`,
+  },
+  prod: {
+    newUrl: (site) => `https://${site}.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}`,
+    docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.dpai.tech`,
+  },
+};
+
+export const appInfo = {
+  'graphql-server': {
+    repositoryName: 'docupace-graphql-server',
+    deployAttributes: [
+      'image.tag',
+      'graphqlServer.siteConfigRemoteBranch',
+      'graphqlServer.standardConfigRemoteBranch',
+    ],
+  },
+  ui: {
+    repositoryName: 'docupace-ui-main',
+    deployAttributes: ['image.tag'],
+  },
+};
+
+export const getEnvInfo = () => {
+  const envInfo = Object.fromEntries(
+    environments.map((env) => [
+      env,
+      {
+        jfrog: {
+          username: process.env[`JF_REGISTRY_${env.toUpperCase()}_USERNAME`],
+          password: process.env[`JF_REGISTRY_${env.toUpperCase()}_PASSWORD`],
+        },
+      },
+    ]),
+  );
+
+  return envInfo;
+};
+
+export const getBitbucketInfo = () => {
+  return {
+    username: process.env.BITBUCKET_USERNAME,
+    password: process.env.BITBUCKET_APP_PASSWORD,
+    workspace: 'dp-cloud',
+  };
+};
+
+export const getRepUrl = (repoName) => {
+  const { username, password, workspace } = getBitbucketInfo();
+  return `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+};
+
+export const jfRegistryUrl = 'registry.paperout.com';
+
+export const getVaultSecretsConfigs = (site) => {
+  return {
+    commonSecretsPath: 'secret/data/common/config',
+    siteCommonSecretsPath: `secret/data/${site}/common/config`,
+    graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
+    uiSecretsPath: `secret/data/${site}/ui/config`,
+    ccUISecretsPath: `secret/data/${site}/ui-cc/config`,
+    awsSecretsPath: `secret/data/${site}/aws/config`,
+  };
+};
+
+export const coreSiteEnvMap = {
+  dev: 'dev',
+  qa: 'preprod',
+  stg: 'staging',
+  uat: 'uat',
+  prd: 'prod',
+};