@docupace/pipeline 1.0.7-7.micro-cli12 → 1.0.7-alpha.1

package/src/changeset/validate.js

@@ -1,91 +1,47 @@
-import fs from 'fs';
-import path from 'path';
-import { $ } from 'zx';
-
-import { isMonoRepo, setGitInfo } from '../next/util.js';
-import { versionStatus } from './version.js';
-
-const CHANGESET_DIR = '.changeset';
-
-function areArraysEqualIgnoringOrder(arr1, arr2) {
-  if (arr1.length !== arr2.length) return false;
-
-  const sortedA = [...arr1].sort();
-  const sortedB = [...arr2].sort();
-
-  return sortedA.every((element, index) => element === sortedB[index]);
-}
-
-export async function validateChangesets() {
-  await setGitInfo();
-  const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
-  await $`git fetch origin ${destBranch}:${destBranch}`;
-  let releases;
-
-  try {
-    console.log('🔍 Validating changesets...');
-    releases = await versionStatus(destBranch);
-  } catch (e) {
-    console.error(
-      '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
-      e,
-    );
-    process.exit(-1);
-  }
-
-  if (!['master', 'main'].includes(destBranch)) {
-    if (releases.some((item) => item.type !== 'patch')) {
-      console.error(
-        '❌ A changeset must be a patch for change to a release branch',
-      );
-      process.exit(-1);
-    }
-  }
-
-  console.log('✅ Changeset validation passed.');
-}
-
-export async function validateChangesetPath(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,58 +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/cli.js

@@ -4,27 +4,19 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import {
-  deployAppWithTag,
-  deployFromSite,
-  deployTemplate,
-  getDefaultDeploySite,
-  getDeployTag,
-} from './deploy.js';
-import { copy2 } from './copy.js';
-import { vaultAddSiteData } from './vault.js';
-import { addApacheSite } from './apache.js';
-import { haproxySync } from './haproxy.js';
-import { connectClone } from './connect.js';
+import { deployFromSite } from './deploy.js';
+import { deployTemplate } from './deploy.js';
+import { copy } from './copy.js';
 import dotenv from 'dotenv';
-import { $ } from 'zx';
-import { deployConnect, deployCore } from './jenkins.js';
-import { runPipeline } from './pipline.js';
 
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 
 const program = new Command();
 
+// GIT SHA computation
+import { $ } from 'zx';
+import { deployCore } from './jenkins.js';
+import { runPipeline } from './pipline.js';
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
 program
@@ -41,40 +33,6 @@ program
     await sonar(GIT_SHA);
   });
 
-program
-  .command('addApacheSite')
-  .description('Add site to apache')
-  .action(async () => {
-    await addApacheSite();
-  });
-
-program
-  .command('connectClone')
-  .description('Clone connect site')
-  .action(async () => {
-    await connectClone();
-  });
-
-program
-  .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, siteConfigRemotePath } = options;
-    await vaultAddSiteData(siteName, siteConfigRemotePath);
-  });
-
 program
   .command('publish')
   .description('Publish a Docker image')
@@ -90,60 +48,16 @@ program
   .requiredOption('-F, --from-site <fromSite>', 'Source site')
   .requiredOption('-T, --to-site <toSite>', 'Target site')
   .option('-c, --deploy-core <deployCore>', 'Deploy Core', 'false')
-  .option('-C, --deploy-connect <deployConnect>', 'Deploy Connect', 'false')
   .action(async (options) => {
-    const { fromEnv, fromSite, toEnv, toSite, deployCore, deployConnect } =
-      options;
-    await deployFromSite(
-      fromEnv,
-      fromSite,
-      toEnv,
-      toSite,
-      deployCore,
-      deployConnect,
-    );
+    const { fromEnv, fromSite, toEnv, toSite, deployCore } = options;
+    await deployFromSite(fromEnv, fromSite, toEnv, toSite, deployCore);
   });
 
 program
-  .command('deploy-template [tagPrefix]')
-  .description('Deploy an standard configuration for configured sites')
-  .action(async (tagPrefix) => {
-    const deployTag = await getDeployTag(tagPrefix);
-    const sites = await getDefaultDeploySite(deployTag);
-    for (const { env, site } of sites) {
-      await deployTemplate(env, site, deployTag);
-    }
-  });
-
-program
-  .command('deploy-site-config <env> <site> [tagPrefix]')
-  .description('Deploy site configuration for a specific site')
-  .action(async (env, site, tagPrefix) => {
-    const deployTag = await getDeployTag(tagPrefix);
-    await deployTemplate(env, site, deployTag, 'siteConfigRemoteBranch');
-  });
-
-program
-  .command('deploy-app <application>')
+  .command('deployTemplate <site>')
   .description('Deploy an application for a specific site')
-  .action(async (application) => {
-    const deployTag = await getDeployTag();
-    const sites = await getDefaultDeploySite(deployTag);
-    for (const { env, site } of sites) {
-      await deployAppWithTag(application, env, site, deployTag);
-    }
-  });
-
-program
-  .command('deploy-mono-app <tag> <application>')
-  .description('Deploy an mono application for a specific site')
-  .action(async (tag, application) => {
-    const deployTag = await getDeployTag(tag);
-    const version = 'v' + deployTag.split('@')[1];
-    const sites = await getDefaultDeploySite(version);
-    for (const { env, site } of sites) {
-      await deployAppWithTag(application, env, site, version);
-    }
+  .action(async (site) => {
+    await deployTemplate(site);
   });
 
 program
@@ -155,15 +69,6 @@ program
     await deployCore(env, site, options.liquibase, options.branch);
   });
 
-program
-  .command('deploy-connect <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await deployConnect(env, site, options.liquibase, options.branch);
-  });
-
 program
   .command('deploy-core-pipeline <env> <site>')
   .description('Deploy Core')
@@ -181,14 +86,13 @@ program
 program
   .command('copy')
   .description('Copy a Docker image between registries')
-  .requiredOption('-r, --repository <repository>', 'Repostory name')
+  .requiredOption('-a, --application <application>', 'Application name')
   .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
   .requiredOption('-t, --to-env <toEnv>', 'Target environment')
   .requiredOption('-g, --tag <tag>', 'Image tag')
-  .requiredOption('-a, --application <application>', 'Application name')
   .action(async (options) => {
-    const { repository, fromEnv, toEnv, tag, application } = options;
-    await copy2(repository, fromEnv, toEnv, tag, application);
+    const { application, fromEnv, toEnv, tag } = options;
+    await copy(application, fromEnv, toEnv, tag);
   });
 
 program

package/src/next/config.js

@@ -1,137 +1,72 @@
-import semver from 'semver';
-
-export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
-
-const UI_MONO_VERSION = '1.4.0-alpha.0';
-
-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://uat.paperout.com/${site}`,
-    docupaceHost: () => 'www.uat.paperout.com',
-    ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
-  },
-  stage: {
-    newUrl: (site) => `https://${site}.stage.dpai.tech`,
-    oldUrl: (site) => `https://stage.paperout.com/${site}`,
-    docupaceHost: () => 'www.stage.paperout.com',
-    ccUrl: (site) => `https://${site}-cc.stage.dpai.tech`,
-  },
-  prod: {
-    newUrl: (site) => `https://${site}.dpai.tech`,
-    oldUrl: (site) => `https://www3.paperout.com/${site}`,
-    docupaceHost: () => 'www3.paperout.com',
-    ccUrl: (site) => `https://${site}-cc.dpai.tech`,
-  },
-};
-
-export const appInfo = {
-  'graphql-server': {
-    repositoryName: 'docupace-graphql-server',
-    imageName: 'docupace-graphql-server',
-    deployAttributes: [
-      'image.tag',
-      'graphqlServer.siteConfigRemoteBranch',
-      'graphqlServer.standardConfigRemoteBranch',
-    ],
-  },
-  cc: {
-    repositoryName: 'docupace-ui-main',
-    imageName: 'cc-ui-app',
-    deployAttributes: ['image.tag'],
-    getAppRevision: (config) => {
-      const version = config.image.tag.slice(1);
-      return 'cc-ui-app@' + version;
-    },
-  },
-  ui: {
-    repositoryName: 'docupace-ui-main',
-    imageName: 'enterprise-ui-app',
-    deployAttributes: ['image.tag'],
-    getAppRevision: (config) => {
-      const tag = config.image.tag;
-      const version = tag.startsWith('v') ? tag.slice(1) : tag;
-      if (semver.gt(version, UI_MONO_VERSION)) {
-        return 'enterprise-ui-app@' + version;
-      } else {
-        return tag;
-      }
-    },
-    updateConfigFunction: (config) => {
-      if (config.image.repository.endsWith('/docupace-ui-main')) {
-        const tag = config.image.tag;
-        const version = tag.startsWith('v') ? tag.slice(1) : tag;
-        if (semver.gt(version, UI_MONO_VERSION)) {
-          const parts = config.image.repository.split('/');
-          parts[2] = 'enterprise-ui-app';
-          config.image.repository = parts.join('/');
-        }
-      }
-      return config;
-    },
-  },
-};
-
-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',
-  stage: 'staging',
-  uat: 'uat',
-  prd: 'prod',
-  prod: 'prod',
-};
+export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
+
+export const environmentConfig = {
+  dev: {
+    newUrl: (site) => `${site}.dev.dpai.tech`,
+    oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
+  },
+  qa: {
+    newUrl: (site) => `${site}.qa.dpai.tech`,
+    oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
+  },
+  uat: {
+    newUrl: (site) => `${site}.qa.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
+  },
+  stage: {
+    newUrl: (site) => `${site}.stage.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
+  },
+
+  prod: {
+    newUrl: (site) => `${site}.dpai.tech`,
+    oldUrl: (site) => `https://www2.paperout.com/${site}`,
+  },
+};
+
+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();
+  const repoUrl = `https://${username}:${password}@bitbucket.org/${workspace}/${repoName}.git`;
+  return repoUrl;
+};
+
+export const jfRegistryUrl = 'registry.paperout.com';