@docupace/pipeline 1.0.61-alpha.1 → 1.0.61

package/eslint.config.js

@@ -10,7 +10,7 @@ export default [
       globals: {
         ...globals.browser,
         ...globals.node, // Add Node.js globals
-      },
+      },g
     },
   },
   pluginJs.configs.recommended,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.61-alpha.1",
+  "version": "1.0.61",
+  "description": "",
   "main": "index.js",
   "type": "module",
   "bin": {
     "dp-changeset-cli": "src/changeset/cli.js",
     "dp-next-cli": "src/next/cli.js",
-    "dp-auth0-cli": "src/auth0/cli.js",
-    "dp-merge-cli": "src/merge/cli.js"
+    "dp-auth0-cli": "src/auth0/cli.js"
   },
   "keywords": [
     "bash"

package/src/changeset/cli.js

@@ -10,10 +10,6 @@ import {
   versionCommand,
 } from './version.js';
 import { createChangeset } from './create.js';
-import {
-  updateWikiWithVersion,
-  upsertReleaseNotesFromFile,
-} from './changelog-wiki.js';
 
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 
@@ -97,11 +93,6 @@ async function commitTag() {
     await $`node -p "require('./package.json').version"`
   ).stdout.trim();
 
-  if (process.env.IS_DEV) {
-    console.log(`Simulate commit of version ${newVersion}`);
-    return;
-  }
-
   const defaultBranch = process.env.BITBUCKET_BRANCH;
 
   await $`git commit -m "Version bump to ${newVersion} and changelog"`;
@@ -145,7 +136,6 @@ program
     console.log('📦 Running all steps...');
     const releases = await versionCommand();
     await updateJiraWithVersion(releases);
-    await updateWikiWithVersion(releases);
     await commitTagCommand(releases);
   });
 
@@ -197,41 +187,5 @@ program
     await createChangeset();
   });
 
-program
-  .command('upload-wiki')
-  .description('Upload release notes from markdown file to Confluence')
-  .requiredOption(
-    '-v, --version <version>',
-    'Version title (e.g., "Version 1.0")',
-  )
-  .requiredOption(
-    '-c, --component <component>',
-    'Component title (e.g., "Component A")',
-  )
-  .requiredOption('-f, --file <file>', 'Path to markdown file')
-  .requiredOption('-g, --group <group>', 'Group of release notes')
-
-  .action(async (options) => {
-    try {
-      console.log('📤 Uploading release notes to Confluence...');
-      const { versionPage, componentPage } = await upsertReleaseNotesFromFile({
-        version: options.version,
-        component: options.component,
-        markdownFile: options.file,
-        group: options.group,
-      });
-
-      console.log('✅ Successfully uploaded to Confluence');
-      console.log('Version page:', versionPage._links?.webui || versionPage.id);
-      console.log(
-        'Component page:',
-        componentPage._links?.webui || componentPage.id,
-      );
-    } catch (error) {
-      console.error('❌ Error uploading to Confluence:', error.message);
-      process.exit(1);
-    }
-  });
-
 // Parse arguments
 program.parse(args);

package/src/changeset/create.js

@@ -110,17 +110,8 @@ async function generateReleaseNotes(jiraTicketData) {
 /**
  * Writes the changeset file
  */
-async function writeJiraChangesetFile(
-  packages,
-  jiraTicketId,
-  changeType,
-  summary,
-) {
-  const text = `${summary} [${jiraTicketId}]`;
-  await writeChangesetFile(packages, jiraTicketId, changeType, text);
-}
-
-export async function writeChangesetFile(packages, filename, changeType, text) {
+async function writeChangesetFile(packages, jiraTicketId, changeType, summary) {
+  // Generate the YAML frontmatter for multiple packages
   const packageEntries = packages
     .map((pkg) => `'${pkg.name}': ${changeType}`)
     .join('\n');
@@ -129,10 +120,9 @@ export async function writeChangesetFile(packages, filename, changeType, text) {
 ${packageEntries}
 ---
 
-${text}
+${summary} [${jiraTicketId}]
 `;
-
-  const changesetFile = `./.changeset/${filename}.md`;
+  const changesetFile = `./.changeset/${jiraTicketId}.md`;
 
   await createChangesetDirectory();
   await fs.promises.writeFile(changesetFile, changesetContent);
@@ -205,7 +195,7 @@ export async function createChangesetForPackage(packages) {
     console.log(`Release note: ${summary}`);
 
     // Step 5: Create a changeset .md file for all packages
-    await writeJiraChangesetFile(packages, jiraTicketId, change_type, summary);
+    await writeChangesetFile(packages, jiraTicketId, change_type, summary);
 
     console.log('Changeset created successfully!');
   } catch (err) {

package/src/changeset/package-util.js

@@ -37,7 +37,7 @@ export function getPackageNames(rootPath = '.') {
           fs.readFileSync(rootPackageJson, 'utf8'),
         );
         return packageJson.name
-          ? [{ name: packageJson.name, path: rootPath, content: packageJson }]
+          ? [{ name: packageJson.name, path: rootPath }]
           : [];
       } catch (error) {
         console.error('Error reading root package.json:', error);
@@ -71,7 +71,6 @@ function getPackagesFromDirectory(dirPath) {
             packages.push({
               name: packageJson.name,
               path: itemPath,
-              content: packageJson,
             });
           }
         } catch (error) {

package/src/micro/deploy-microservice.js

@@ -0,0 +1,116 @@
+import { $ } from '@docupace/pipeline/src/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 = /^  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,180 @@
+import { $ } from '@docupace/pipeline/src/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');
+    }
+
+    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.');
+      }
+    }
+    
+  } 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/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';  // Add this import
 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')
@@ -223,4 +232,4 @@ program
     }
   });
 
-program.parse(process.argv);
+program.parse(process.argv);