@docupace/pipeline 1.0.61-alpha.1 → 1.0.62

package/src/micro/deploy-microservice.js

@@ -0,0 +1,140 @@
+import { $ } from '../next/logger.js';
+import fs from 'fs';
+import path from 'path';
+
+export async function deployMicroservice(
+  appName,
+  helmPath,
+  environment = 'dev',
+  tag = null,
+) {
+  if (!appName || !helmPath) {
+    throw new Error(
+      'Missing required parameters. Usage: deployMicroservice(appName, helmPath, [environment], [tag])',
+    );
+  }
+
+  let deployTag = tag;
+  if (!deployTag) {
+    deployTag =
+      process.env.VERSION_TAG ||
+      process.env.BITBUCKET_TAG ||
+      (process.env.BITBUCKET_BUILD_NUMBER
+        ? `build-${process.env.BITBUCKET_BUILD_NUMBER}`
+        : null);
+  }
+
+  if (!deployTag) {
+    throw new Error(
+      'No tag specified and no default tag available from environment variables',
+    );
+  }
+
+  const repoName = `gitops-${environment}`;
+  const filePath = `dp/${helmPath}/${appName}.values.yaml`;
+
+  const gitopsBranch =
+    environment === 'dev' || environment === 'uat'
+      ? process.env.GITOPS_BRANCH || 'master'
+      : process.env.GITOPS_BRANCH || 'main';
+
+  let repoUrl;
+  if (environment === 'dev' && process.env.GITOPS_REP_TOKEN) {
+    repoUrl = `https://x-token-auth:${process.env.GITOPS_REP_TOKEN}@bitbucket.org/dp-cloud/${repoName}.git`;
+  } else if (
+    process.env.BITBUCKET_USERNAME &&
+    process.env.BITBUCKET_APP_PASSWORD
+  ) {
+    repoUrl = `https://${process.env.BITBUCKET_USERNAME}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
+  } else {
+    throw new Error(
+      'No authentication credentials found for GitOps repository',
+    );
+  }
+
+  console.log('=========================================');
+  console.log('Microservice Deployment Configuration');
+  console.log('=========================================');
+  console.log(`Application: ${appName}`);
+  console.log(`Environment: ${environment}`);
+  console.log(`Tag: ${deployTag}`);
+  console.log(`GitOps Repo: ${repoName}`);
+  console.log(`Values File: ${filePath}`);
+  console.log(`Branch: ${gitopsBranch}`);
+  console.log('=========================================');
+
+  try {
+    console.log('Cloning GitOps repository...');
+    await $`git clone --depth 1 ${repoUrl} ${repoName}`;
+
+    console.log('Checking if directory exists...');
+    await $`ls -la ${repoName}`;
+
+    console.log(`Changing to directory: ${repoName}`);
+    const originalDir = process.cwd();
+    process.chdir(repoName);
+
+    console.log('Verifying directory change...');
+    const newDir = process.cwd();
+    console.log(`Original: ${originalDir}`);
+    console.log(`New: ${newDir}`);
+
+    await $`cd ${repoName} && git config user.email "pipeline@bitbucket.org"`;
+    await $`cd ${repoName} && git config user.name "Bitbucket Pipeline"`;
+
+    console.log(`Attempting to checkout branch: ${gitopsBranch}`);
+    await $`cd ${repoName} && git checkout ${gitopsBranch}`;
+
+    const fullFilePath = path.resolve(filePath);
+    console.log(`Looking for file at: ${fullFilePath}`);
+    if (!fs.existsSync(fullFilePath)) {
+      throw new Error(
+        `Values file ${filePath} does not exist in ${repoName} on branch ${gitopsBranch}`,
+      );
+    }
+
+    console.log(`Updating image tag to ${deployTag}...`);
+
+    let fileContent = fs.readFileSync(fullFilePath, 'utf8');
+
+    const tagRegex = /^ {2}tag: .*/gm;
+    const newContent = fileContent.replace(tagRegex, `  tag: ${deployTag}`);
+
+    if (fileContent === newContent) {
+      console.log(`No changes detected - tag is already ${deployTag}`);
+      return;
+    }
+
+    fs.writeFileSync(fullFilePath, newContent, 'utf8');
+
+    console.log('Changes to be committed:');
+    await $`cd ${repoName} && git diff ${filePath}`;
+
+    await $`cd ${repoName} && git add ${filePath}`;
+    await $`cd ${repoName} && git commit -m "Update ${appName} image tag to ${deployTag} in ${environment} environment"`;
+
+    console.log('Pushing changes to GitOps repository...');
+    await $`cd ${repoName} && git push origin ${gitopsBranch}`;
+
+    console.log('=========================================');
+    console.log(
+      `✅ Successfully deployed ${appName}:${deployTag} to ${environment}`,
+    );
+    console.log('=========================================');
+  } catch (error) {
+    console.error('Error during microservice deployment:', error.message);
+    throw error;
+  } finally {
+    try {
+      process.chdir('..');
+      await $`rm -rf ${repoName}`;
+    } catch (cleanupError) {
+      console.warn(
+        'Warning: Failed to clean up temporary directory:',
+        cleanupError.message,
+      );
+    }
+  }
+}
+
+export default deployMicroservice;

package/src/micro/publish-ms.js

@@ -0,0 +1,188 @@
+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(gitSha, options = {}) {
+  // Use environment variables as defaults, but allow overrides
+  const config = {
+    imageName:
+      options.imageName || process.env.IMAGE_NAME || process.env.APP_NAME,
+    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.TAG ||
+      process.env.BITBUCKET_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/apache.js

@@ -8,7 +8,7 @@ function log(msg) {
 export async function addApacheSite() {
   if (
     !process.env.ENVIRONMENT ||
-    !['dev', 'qa', 'uat', 'stage','www3'].includes(process.env.ENVIRONMENT)
+    !['dev', 'qa', 'uat', 'stage', 'www3'].includes(process.env.ENVIRONMENT)
   ) {
     log('Error: wront ENVIRONMENT');
     process.exit(1);
@@ -69,7 +69,7 @@ export async function addApacheSite() {
     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`,

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,
@@ -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')
@@ -123,7 +132,6 @@ program
     await deployTemplate(env, site, deployTag, 'siteConfigRemoteBranch');
   });
 
-
 program
   .command('deploy-app <application>')
   .description('Deploy an application for a specific site')

package/src/next/connect.js

@@ -20,7 +20,6 @@ const connectUIEnvMap = {
   prod: 'prod-www3',
 };
 
-
 const siteSettingsEnvMap = {
   dev: 'dev',
   preprod: 'preprod',
@@ -158,7 +157,7 @@ export async function connectClone() {
       try {
         // Execute the shell command
         const result =
-        await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+          await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
         await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
         await $`cd ${cloneTo} && git remote -v`;
         await $`cd ${cloneTo} && git branch`;

package/src/changeset/changelog-wiki.js

@@ -1,313 +0,0 @@
-// npm i axios
-import axios from 'axios';
-import { readFileSync } from 'fs';
-import { getPackageNames } from './package-util.js';
-import path from 'path';
-import { toShortVersion } from './version.js';
-
-/**
- * Required env:
- *   CONFLUENCE_BASE_URL   e.g. "https://docupacellc.atlassian.net/wiki"
- *   CONFLUENCE_EMAIL      e.g. "you@docupace.com"
- *   CONFLUENCE_API_TOKEN  Atlassian API token
- */
-const BASE_URL = process.env.CONFLUENCE_BASE_URL;
-const EMAIL = process.env.CONFLUENCE_EMAIL;
-const API_TOKEN = process.env.CONFLUENCE_API_TOKEN;
-
-const getHttpService = () =>
-  axios.create({
-    baseURL: BASE_URL.replace(/\/+$/, ''),
-    auth: { username: EMAIL, password: API_TOKEN },
-  });
-
-/** ---------- ADF builder: Markdown macro ---------- */
-function adfMarkdown(markdown) {
-  return {
-    type: 'doc',
-    version: 1,
-    content: [
-      {
-        type: 'extension',
-        attrs: {
-          layout: 'default',
-          extensionType: 'com.atlassian.confluence.macro.core',
-          extensionKey: 'markdown',
-          parameters: {
-            macroParams: {
-              sourceType: { value: 'MacroBody' },
-              darkmode: { value: 'auto' },
-              syntax: { value: 'Markdown' },
-              attachmentPageId: { value: '' },
-              attachmentId: { value: '' },
-              url: { value: '' },
-              __bodyContent: { value: markdown },
-            },
-          },
-        },
-      },
-    ],
-  };
-}
-
-/** ---------- API helpers (v2) ---------- */
-
-// get a page (v2) by id
-async function getPage(pageId) {
-  const { data } = await getHttpService().get(`/api/v2/pages/${pageId}`);
-  return data;
-}
-
-// list child pages (paginated) and return *all* children
-async function listChildPages(parentId) {
-  const all = [];
-  let next = `/api/v2/pages/${parentId}/children?limit=200`;
-
-  while (next) {
-    const { data } = await getHttpService().get(next);
-    if (Array.isArray(data.results)) all.push(...data.results);
-    next = data?._links?.next || null;
-  }
-  return all;
-}
-
-// find a direct child page by exact title
-async function findChildByTitle(parentId, title) {
-  const kids = await listChildPages(parentId);
-  return kids.find((p) => (p.title || '').trim() === title.trim()) || null;
-}
-
-// create a child page under a parent
-async function createChildPage({
-  parentId,
-  spaceId,
-  title,
-  adf,
-  message = 'Create via API',
-}) {
-  const payload = {
-    status: 'current',
-    title,
-    spaceId,
-    parentId,
-    body: {
-      atlas_doc_format: {
-        value: adf,
-        representation: 'atlas_doc_format',
-      },
-    },
-    version: { number: 1, message, minorEdit: false },
-  };
-  const { data } = await getHttpService().post(`/api/v2/pages`, payload);
-  return data;
-}
-
-// update an existing page (replace body + optionally title)
-async function updatePage({
-  page,
-  title = page.title,
-  adf,
-  message = 'Update via API',
-}) {
-  if (!page.version) {
-    page = await getPage(page.id);
-  }
-  const payload = {
-    id: page.id,
-    status: 'current',
-    title,
-    spaceId: page.spaceId,
-    body: {
-      atlas_doc_format: {
-        value: adf,
-        representation: 'atlas_doc_format',
-      },
-    },
-    version: {
-      number: page.version.number + 1,
-      message,
-      minorEdit: false,
-    },
-  };
-  const { data } = await getHttpService().put(
-    `/api/v2/pages/${page.id}`,
-    payload,
-  );
-  return data;
-}
-
-const childPagesAdf = {
-  type: 'doc',
-  version: 1,
-  content: [
-    {
-      type: 'extension',
-      attrs: {
-        extensionType: 'com.atlassian.confluence.macro.core',
-        extensionKey: 'children',
-        layout: 'default',
-        parameters: {
-          macroParams: {
-            allChildren: { value: 'true' },
-          },
-          macroMetadata: {
-            macroId: { value: '9ea4beb6-ac0a-42d7-baf1-e8e6eca01bfd' },
-            schemaVersion: { value: '2' },
-            title: { value: 'Child pages' },
-          },
-        },
-        localId: '4890f00c-c519-4947-a60c-0c3b7e1c7b72',
-      },
-    },
-  ],
-};
-
-/** ---------- Main upsert workflow ---------- */
-
-/**
- * Upsert release notes at: Versions(parent) -> Version(title) -> Component(title)
- *
- * @param {object} args
- * @param {string} args.versionsParentId - Page ID of the "Versions" page
- * @param {string} args.versionTitle     - e.g. "Version 1"
- * @param {string} args.componentTitle   - e.g. "Component A"
- * @param {string} args.markdown         - Release notes markdown for the component page
- *
- * @returns {Promise<{versionPage:any, componentPage:any}>}
- */
-export async function upsertReleaseNotes({
-  versionsParentId,
-  version,
-  component,
-  markdown,
-  group,
-}) {
-  if (!BASE_URL || !EMAIL || !API_TOKEN) {
-    throw new Error(
-      'Missing required env: CONFLUENCE_BASE_URL, CONFLUENCE_EMAIL, CONFLUENCE_API_TOKEN',
-    );
-  }
-
-  if (!versionsParentId || !version || !component) {
-    throw new Error(
-      'versionsParentId, versionTitle, and componentTitle are required',
-    );
-  }
-
-  if (!markdown || markdown.trim() === '') {
-    throw new Error('markdown content is required and cannot be empty');
-  }
-
-  // 1) fetch the parent to get spaceId
-  const parent = await getPage(versionsParentId);
-  const spaceId = parent.spaceId;
-
-  const versionTitle = `Docupace ${group} - Version ${version}`;
-  // 2) ensure Version page under parent
-  let versionPage = await findChildByTitle(parent.id, versionTitle);
-  if (!versionPage) {
-    versionPage = await createChildPage({
-      parentId: parent.id,
-      spaceId,
-      title: versionTitle,
-      adf: JSON.stringify(childPagesAdf),
-      message: `Create version page ${versionTitle}`,
-    });
-  }
-
-  const componentTitle = `${versionTitle} - ${component} Changelog`;
-
-  // 3) ensure Component page under Version
-  let componentPage = await findChildByTitle(versionPage.id, componentTitle);
-  const adf = adfMarkdown(markdown);
-
-  if (!componentPage) {
-    componentPage = await createChildPage({
-      parentId: versionPage.id,
-      spaceId,
-      title: componentTitle,
-      adf: JSON.stringify(adf),
-      message: `Create component page ${componentTitle}`,
-    });
-  } else {
-    // update existing component page with new markdown
-    componentPage = await updatePage({
-      page: componentPage,
-      title: componentTitle,
-      adf: JSON.stringify(adf),
-      message: `Update component page ${componentTitle}`,
-    });
-  }
-
-  return { versionPage, componentPage };
-}
-
-/**
- * Upsert release notes from a markdown file
- *
- * @param {object} args
- * @param {string} args.versionTitle     - e.g. "Version 1"
- * @param {string} args.componentTitle   - e.g. "Component A"
- * @param {string} args.markdownFile     - Path to markdown file
- *
- * @returns {Promise<{versionPage:any, componentPage:any}>}
- */
-export async function upsertReleaseNotesFromFile({
-  version,
-  component,
-  markdownFile,
-  group,
-}) {
-  if (!group) {
-    throw new Error('changelog.group must be specified in package.json');
-  }
-
-  const versionsParentId =
-    process.env[`CONFLUENCE_${group.toUpperCase()}_PARENT_ID`];
-
-  if (!versionsParentId) {
-    throw new Error(
-      `CONFLUENCE_${group.toUpperCase()}_PARENT_ID environment variable is required`,
-    );
-  }
-
-  if (!markdownFile) {
-    throw new Error('markdownFile is required');
-  }
-
-  // Read markdown content from file
-  const markdown = readFileSync(markdownFile, 'utf8');
-
-  return upsertReleaseNotes({
-    versionsParentId,
-    version,
-    component,
-    markdown,
-    group,
-  });
-}
-
-export async function updateWikiWithVersion(releases) {
-  const packageNames = getPackageNames();
-  console.log(releases);
-
-  const promises = packageNames
-    .filter(
-      (packageName) =>
-        releases.find((release) => release.name == packageName.name) &&
-        packageName.content?.changelog?.component,
-    )
-    .map(async (packageName) => {
-      const release = releases.find(
-        (release) => release.name == packageName.name,
-      );
-      await upsertReleaseNotesFromFile({
-        version: toShortVersion(release.newVersion),
-        component: packageName.content.changelog?.component,
-        markdownFile: path.join(packageName.path, 'CHANGELOG.md'),
-        group: packageName.content.changelog?.group,
-      });
-    });
-
-  await Promise.all(promises);
-}