@docupace/pipeline 1.0.6-alpha.9 → 1.0.7-7.micro-cli

package/src/micro/ms-publish.js

@@ -0,0 +1,186 @@
+import { $ } from '../next/logger.js';
+
+/**
+ * Publish Docker images for microservices with flexible naming
+ * @param {string} gitSha - Git commit SHA
+ * @param {Object} options - Configuration options
+ * @param {string} options.imageName - Docker image name (e.g., 'swp')
+ * @param {string} options.registryUrl - JFrog registry URL
+ * @param {string} options.repoName - Repository name in JFrog
+ * @param {string} options.username - JFrog username
+ * @param {string} options.password - JFrog password
+ * @param {string} options.buildNumber - Build number
+ */
+export async function publishMicroservice(serviceName, options = {}) {
+  // Use environment variables as defaults, but allow overrides
+
+  const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
+
+  const config = {
+    imageName: serviceName,
+    registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
+    repoName: options.repoName || process.env.JF_REGISTRY_REPO_NAME,
+    username: options.username || process.env.JF_REGISTRY_USER_DEV,
+    password: options.password || process.env.JF_REGISTRY_PASSWORD_DEV,
+    buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
+    tag: options.tag || process.env.VERSION_TAG,
+  };
+
+  // Validate required fields
+  if (!config.imageName) {
+    throw new Error(
+      'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
+    );
+  }
+
+  console.log('=== Docker Image Publishing Configuration ===');
+  console.log(`Image Name: ${config.imageName}`);
+  console.log(`Git SHA: ${gitSha}`);
+  console.log(`Build Number: ${config.buildNumber}`);
+  console.log(`Version Tag: ${config.tag || 'none'}`);
+  console.log(`Registry: ${config.registryUrl}/${config.repoName}`);
+  console.log('==========================================');
+
+  const registryPath = `${config.registryUrl}/${config.repoName}`;
+  const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
+
+  // Docker login
+  await $`echo ${config.password} | docker login --username ${config.username} --password-stdin ${config.registryUrl}`;
+
+  try {
+    // Build the image if it doesn't exist locally
+    const imageExists = await checkLocalImage(SHA_IMAGE_NAME);
+    if (!imageExists) {
+      console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
+      await $`docker build -t ${SHA_IMAGE_NAME} .`;
+    }
+
+    // Array to track all tags we're pushing
+    const tagsToPush = [];
+
+    // 1. Push SHA tag
+    const shaTag = `${registryPath}/${SHA_IMAGE_NAME}`;
+    console.log(`Tagging and pushing SHA: ${shaTag}`);
+    await $`docker tag ${SHA_IMAGE_NAME} ${shaTag}`;
+    await $`docker push ${shaTag}`;
+    tagsToPush.push(SHA_IMAGE_NAME);
+
+    // 2. Push build number tag
+    if (config.buildNumber) {
+      const BUILD_IMAGE_NAME = `${config.imageName}:build-${config.buildNumber}`;
+      const buildTag = `${registryPath}/${BUILD_IMAGE_NAME}`;
+      console.log(`Tagging and pushing build: ${buildTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${buildTag}`;
+      await $`docker push ${buildTag}`;
+      tagsToPush.push(BUILD_IMAGE_NAME);
+    }
+
+    // 3. Push version tag (this is what ArgoCD needs!)
+    if (config.tag) {
+      // Handle various tag formats
+      let version = config.tag;
+
+      // If tag contains @, extract version after it
+      if (version.includes('@')) {
+        version = 'v' + version.split('@')[1];
+      }
+
+      // Ensure version starts with 'v' if it's a semver without it
+      if (/^\d+\.\d+\.\d+/.test(version) && !version.startsWith('v')) {
+        version = 'v' + version;
+      }
+
+      const VERSION_IMAGE_NAME = `${config.imageName}:${version}`;
+      const versionTag = `${registryPath}/${VERSION_IMAGE_NAME}`;
+
+      console.log(`Tagging and pushing version: ${versionTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${versionTag}`;
+      await $`docker push ${versionTag}`;
+      tagsToPush.push(VERSION_IMAGE_NAME);
+
+      // Also push 'latest' tag when we have a version
+      const LATEST_IMAGE_NAME = `${config.imageName}:latest`;
+      const latestTag = `${registryPath}/${LATEST_IMAGE_NAME}`;
+      console.log(`Tagging and pushing latest: ${latestTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${latestTag}`;
+      await $`docker push ${latestTag}`;
+      tagsToPush.push(LATEST_IMAGE_NAME);
+    }
+
+    // 4. Check for git tags at current commit
+    try {
+      const gitTags = (await $`git tag --points-at HEAD`).stdout
+        .trim()
+        .split('\n')
+        .filter(Boolean);
+
+      if (gitTags.length > 0) {
+        console.log(`Found git tags at HEAD: ${gitTags.join(', ')}`);
+
+        for (const gitTag of gitTags) {
+          // Skip if we already handled this tag above
+          if (gitTag === config.tag) continue;
+
+          let version = gitTag;
+          if (version.includes('@')) {
+            version = 'v' + version.split('@')[1];
+          }
+
+          const TAG_IMAGE_NAME = `${config.imageName}:${version}`;
+          const gitTagPath = `${registryPath}/${TAG_IMAGE_NAME}`;
+
+          console.log(`Tagging and pushing git tag: ${gitTagPath}`);
+          await $`docker tag ${SHA_IMAGE_NAME} ${gitTagPath}`;
+          await $`docker push ${gitTagPath}`;
+          tagsToPush.push(TAG_IMAGE_NAME);
+        }
+      }
+    } catch (e) {
+      console.log('No git tags found at HEAD or error checking tags', e);
+    }
+
+    console.log('\n✅ Docker image published successfully!');
+    console.log('=== Summary of pushed tags ===');
+    tagsToPush.forEach((tag) => console.log(`  ✓ ${tag}`));
+    console.log('==============================\n');
+
+    // Verify the version tag if we expect one
+    if (config.tag) {
+      const version = config.tag.includes('@')
+        ? 'v' + config.tag.split('@')[1]
+        : config.tag;
+      const expectedTag = `${registryPath}/${config.imageName}:${version}`;
+      console.log(`Verifying version tag exists: ${expectedTag}`);
+      try {
+        await $`docker manifest inspect ${expectedTag}`;
+        console.log('✅ Version tag verified in registry!');
+      } catch (e) {
+        console.error('❌ WARNING: Could not verify version tag in registry!');
+        console.error('ArgoCD may fail to pull this image.', e);
+      }
+    }
+  } catch (error) {
+    console.error('Error during image publishing:', error);
+    throw error;
+  } finally {
+    // Always logout
+    await $`docker logout ${config.registryUrl}`;
+  }
+}
+
+async function checkLocalImage(imageName) {
+  try {
+    $.verbose = false;
+    await $`docker image inspect ${imageName}`;
+    return true;
+  } catch {
+    return false;
+  } finally {
+    $.verbose = true;
+  }
+}
+
+// Backward compatibility wrapper
+export async function publishWithDefaults(gitSha) {
+  return publishMicroservice(gitSha);
+}

package/src/next/alias.js

@@ -0,0 +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);
+}

package/src/next/apache.js

@@ -0,0 +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}`,
+  );
+}

package/src/next/cli.js

@@ -4,19 +4,27 @@ 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 { deployTemplate } from './deploy.js';
-import { copy } from './copy.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 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
@@ -33,6 +41,40 @@ 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')
@@ -48,16 +90,60 @@ 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 } = options;
-    await deployFromSite(fromEnv, fromSite, toEnv, toSite, deployCore);
+    const { fromEnv, fromSite, toEnv, toSite, deployCore, deployConnect } =
+      options;
+    await deployFromSite(
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+      deployCore,
+      deployConnect,
+    );
   });
 
 program
-  .command('deployTemplate <site>')
+  .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>')
   .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(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);
+    }
   });
 
 program
@@ -69,6 +155,15 @@ 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')
@@ -86,13 +181,14 @@ program
 program
   .command('copy')
   .description('Copy a Docker image between registries')
-  .requiredOption('-a, --application <application>', 'Application name')
+  .requiredOption('-r, --repository <repository>', 'Repostory 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 { application, fromEnv, toEnv, tag } = options;
-    await copy(application, fromEnv, toEnv, tag);
+    const { repository, fromEnv, toEnv, tag, application } = options;
+    await copy2(repository, fromEnv, toEnv, tag, application);
   });
 
 program