@docupace/pipeline 1.0.77 → 1.0.79

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,81 +1,81 @@
-import fs from 'fs-extra';
-import { $ } from 'zx';
-
-function log(msg) {
-  console.log(`[*] ${msg}`);
-}
-
-export async function addApacheSite() {
-  if (
-    !process.env.ENVIRONMENT ||
-    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
-  ) {
-    log('Error: wront ENVIRONMENT');
-    process.exit(1);
-  }
-  if (!process.env.SITE) {
-    log('Error: SITE cannot be empty.');
-    process.exit(1);
-  }
-
-  const apacheEnvHostMap = {
-    dev: {
-      host1: 'dev-apalb01a.corp.docupace.com',
-      host2: 'dev-apalb01b.corp.docupace.com',
-      repo: 'iis-preprod',
-    },
-    qa: {
-      host1: 'qa-apalb01a.corp.docupace.com',
-      host2: 'qa-apalb01b.corp.docupace.com',
-      repo: 'iis-preprod',
-    },
-    uat: {
-      host1: 'uat-apalb01a.edc.docupace.internal',
-      host2: 'uat-apalb01b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-    stage: {
-      host1: 'stg-apalb01a.edc.docupace.internal',
-      host2: 'stg-apalb01b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-    www3: {
-      host1: 'prd-apalb05a.edc.docupace.internal',
-      host2: 'prd-apalb05b.edc.docupace.internal',
-      repo: 'iis-www2',
-    },
-  };
-
-  // 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}`;
-
-  // The script is run twice in the Bash version
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
-    `/root/tomcat_repo_sync.sh`,
-  );
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
-    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
-    `/root/tomcat_repo_sync.sh`,
-  );
-  await sshCmd(
-    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
-    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-}
+import fs from 'fs-extra';
+import { $ } from 'zx';
+
+function log(msg) {
+  console.log(`[*] ${msg}`);
+}
+
+export async function addApacheSite() {
+  if (
+    !process.env.ENVIRONMENT ||
+    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
+  ) {
+    log('Error: wront ENVIRONMENT');
+    process.exit(1);
+  }
+  if (!process.env.SITE) {
+    log('Error: SITE cannot be empty.');
+    process.exit(1);
+  }
+
+  const apacheEnvHostMap = {
+    dev: {
+      host1: 'dev-apalb01a.corp.docupace.com',
+      host2: 'dev-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    qa: {
+      host1: 'qa-apalb01a.corp.docupace.com',
+      host2: 'qa-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    uat: {
+      host1: 'uat-apalb01a.edc.docupace.internal',
+      host2: 'uat-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    stage: {
+      host1: 'stg-apalb01a.edc.docupace.internal',
+      host2: 'stg-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    www3: {
+      host1: 'prd-apalb05a.edc.docupace.internal',
+      host2: 'prd-apalb05b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+  };
+
+  // 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}`;
+
+  // The script is run twice in the Bash version
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/tomcat_repo_sync.sh`,
+  );
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+  );
+
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/tomcat_repo_sync.sh`,
+  );
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+  );
+}

package/src/next/cli.js

@@ -4,6 +4,7 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
+import { publishMicroservice } from '../micro/publish-ms.js';
 import {
   deployAppWithTag,
   deployFromSite,
@@ -11,7 +12,7 @@ import {
   getDefaultDeploySite,
   getDeployTag,
 } from './deploy.js';
-import { copy2 } from './copy.js';
+import { copy, copy2 } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
 import { addApacheSite } from './apache.js';
 import { haproxySync } from './haproxy.js';
@@ -82,6 +83,14 @@ program
     await publish(GIT_SHA);
   });
 
+// Add the new publish-microservice command
+program
+  .command('publish-microservice')
+  .description('Publish a microservice Docker image with version tags')
+  .action(async () => {
+    await publishMicroservice(GIT_SHA);
+  });
+
 program
   .command('deploy-from-site')
   .description('Deploy an application for a specific site')

package/src/next/config.js

@@ -1,137 +1,137 @@
-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',
-};
+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',
+};