@docupace/pipeline 1.0.39-matttest.43 → 1.0.39-matttest.5

package/next/execute.sh

@@ -53,14 +53,8 @@ copy() {
 }
 
 publish() {
-    SLUG_SUFFIX=""
-    if [ -n "$APP_NAME" ]; then
-      SLUG_SUFFIX="-${APP_NAME}"
-    fi
-
-    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:build-${BITBUCKET_BUILD_NUMBER}"
-    IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:sha-${GIT_SHA}"
-
+    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}:build-${BITBUCKET_BUILD_NUMBER}"
+    IMAGE_NAME="${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}"
     export DOCKER_HOST=""
 
     echo "Publishing Docker image ${IMAGE_NAME}..."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-matttest.43",
+  "version": "1.0.39-matttest.5",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,11 +23,9 @@
     "commander": "^12.1.0",
     "dotenv": "^16.4.7",
     "fs-extra": "^11.3.0",
-    "inquirer": "^12.6.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "openai": "^4.76.3",
-    "semver": "^7.7.2",
     "zod": "^3.24.1",
     "zx": "^8.3.0"
   },
@@ -44,7 +42,6 @@
     "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",
     "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true",
     "test-run-pipline": "dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa",
-    "test-validate": "dp-changset-cli validate",
-    "test-create": "dp-changset-cli create-changeset"
+    "test-validate": "dp-changset-cli validate"
   }
 }

package/src/auth0/configure.js

@@ -5,16 +5,16 @@ import crypto from 'crypto';
 
 import {
   cloneEnvRepository,
-  cloneRepository,
-  pushDeployConfig,
   readDeployConfig,
+  pushDeployConfig,
+  cloneRepository,
 } from '../next/deploy.js';
 
 import { getVaultSecrets, updateVaultSecrets } from './vault.js';
 import {
-  coreSiteEnvMap,
-  environmentConfig,
   getVaultSecretsConfigs,
+  environmentConfig,
+  coreSiteEnvMap,
 } from '../next/config.js';
 
 async function ensureDirectoryExists(dirPath) {

package/src/auth0/metadata.js

@@ -1,10 +1,11 @@
 import fs from 'fs-extra';
 import axios from 'axios';
 import path from 'path';
-import { cloneRepository, pushDeployConfig } from '../next/deploy.js';
+import { cloneRepository } from '../next/deploy.js';
 import { getAuth0AuthToken } from './configure.js';
 import { getVaultSecrets } from './vault.js';
 import { getVaultSecretsConfigs } from '../next/config.js';
+import { pushDeployConfig } from '../next/deploy.js';
 
 export async function getAuth0Metadata(site, env) {
   try {

package/src/changeset/cli.js

@@ -1,85 +1,151 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { $ } from 'zx';
+import path from 'path';
 import { validateChangesets } from './validate.js';
+import fs from 'fs';
+import OpenAI from 'openai';
+import { zodResponseFormat } from 'openai/helpers/zod';
+import z from 'zod';
 import dotenv from 'dotenv';
-import { isMonoRepo, setGitInfo } from '../next/util.js';
-import { updateJiraWithVersion, versionCommand } from './version.js';
-import { createChangeset } from './create.js';
-
+import { makeJiraRequest, updateComponentVersion } from '../next/jira.js';
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
+import { setGitInfo } from '../next/util.js';
 
 const program = new Command();
 
 const args = process.argv;
 
-async function commitTagCommand(releases) {
-  console.log('📌 Checking for updates to commit...');
+async function createChangesetDirectory() {
+  try {
+    // Use path.join to build a safe path to `.changeset`
+    const targetDir = path.join(process.cwd(), '.changeset');
 
-  // Check if there are changes to commit
-  const status = (await $`git status --porcelain`).stdout.trim();
-  if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
-    return;
+    // Create the directory recursively if it doesn't exist
+    await fs.promises.mkdir(targetDir, { recursive: true });
+  } catch (error) {
+    console.error('Error creating .changeset directory:', error);
   }
+}
 
-  console.log('📌 Committing and tagging the new version...');
-  await setGitInfo();
-  await $`git add .`;
+function run(command) {
+  return new Promise((resolve, reject) => {
+    exec(command, { shell: true }, (error, stdout, stderr) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve({ stdout, stderr });
+      }
+    });
+  });
+}
 
-  if (isMonoRepo()) {
-    await commitTagMono(releases);
-  } else {
-    await commitTag();
+async function fileExists(filePath) {
+  try {
+    await fs.promises.access(filePath);
+    return true;
+  } catch {
+    return false;
   }
 }
 
-export function getAppReleases(releases) {
-  const appReleases = releases.filter((release) =>
-    release.name.endsWith('-app'),
-  );
-  return appReleases;
+async function getMainPackage() {
+  const mainModulePath = process.cwd();
+  if (mainModulePath) {
+    const packageJsonPath = path.join(mainModulePath, 'package.json');
+    if (await fileExists(packageJsonPath)) {
+      const fileContent = await fs.promises.readFile(packageJsonPath, 'utf-8');
+      const packageJson = JSON.parse(fileContent);
+      return packageJson;
+    }
+  }
+  throw new Error('Main package.json not found');
 }
 
-function getAppNameFromPackageName(packageName) {
-  const appName = packageName.includes('/')
-    ? packageName.split('/')[1]
-    : packageName;
-
-  return appName;
+const changeSetPackage = `{
+  "name": "changeset-package",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+  },
+  "type": "module",
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {},
+  "devDependencies": {
+    "@changesets/cli": "^2.27.10"
+  }
 }
+`;
 
-async function commitTagMono(releases) {
-  let versions = [];
-  for (const release of getAppReleases(releases)) {
-    const newVersion = release.newVersion;
-    const appName = getAppNameFromPackageName(release.name);
-    versions.push(`${appName}@${newVersion}`);
+async function versionCommand(closeVersion = false) {
+  console.log('📦 Running Changeset versioning...');
+  await setGitInfo();
+  await $`mv package.json package.json.bak`;
+  await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
+  await fs.promises.writeFile('package.json', changeSetPackage);
+  await $`pnpm install`;
+  await $`rm package.json pnpm-lock.yaml`;
+  await $`mv package.json.bak package.json`;
+  await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
+  if (closeVersion) {
+    await $`pnpm changeset pre exit`;
   }
 
-  const { stdout } = await $`git symbolic-ref refs/remotes/origin/HEAD`;
-  const defaultBranch = stdout.trim().replace('refs/remotes/origin/', '');
+  await $`pnpm changeset version`;
 
-  await $`git commit -m "Version bump to ${versions.join(',')} and changelog"`;
-  await $`git push origin ${defaultBranch}`;
-  for (const newVersion of versions) {
-    await $`git tag ${newVersion}`;
-    console.log(`✅ Version ${newVersion} tagged.`);
+  // Read the updated package.json to get the new version and package name
+  const packageJson = JSON.parse(
+    await fs.promises.readFile('package.json', 'utf-8'),
+  );
+  const version = packageJson.version;
+  const packageName = packageJson.name;
+
+  if (closeVersion) {
+    return { version, packageName };
   }
-  await $`git push origin --tags`;
-  console.log(`✅ Version pushed.`);
+
+  // Get the last commit message and extract Jira ticket
+  const lastCommit = (await $`git log -1 --pretty=%B`).stdout.trim();
+  console.log(`Last commit '${lastCommit}' being processed to get Jira ticket`);
+
+  const jiraTicketMatch = lastCommit.match(/([A-Z]+-\d+)/);
+  const jiraTicketId = jiraTicketMatch ? jiraTicketMatch[0] : null;
+
+  // If we have all the necessary data, update the component version in Jira
+  if (jiraTicketId && version && packageName) {
+    try {
+      await updateComponentVersion(jiraTicketId, packageName, version);
+    } catch (error) {
+      console.error(
+        `Failed to update Jira component version: ${error.message}`,
+      );
+    }
+  }
+
+  console.log('✅ Changeset versioning complete.');
+  return { version, packageName };
 }
 
-async function commitTag() {
+async function commitTagCommand() {
+  console.log('📌 Checking for updates to commit...');
+
+  // Check if there are changes to commit
+  const status = (await $`git status --porcelain`).stdout.trim();
+  if (!status) {
+    console.log('✅ No changes to commit. Exiting.');
+    return;
+  }
+
+  console.log('📌 Committing and tagging the new version...');
+  await setGitInfo();
+  await $`git add .`;
   const newVersion = (
     await $`node -p "require('./package.json').version"`
   ).stdout.trim();
-
-  const { stdout } = await $`git symbolic-ref refs/remotes/origin/HEAD`;
-  const defaultBranch = stdout.trim().replace('refs/remotes/origin/', '');
-
   await $`git commit -m "Version bump to ${newVersion} and changelog"`;
-  await $`git push origin ${defaultBranch}`;
+  await $`git push origin`;
   await $`git tag v${newVersion}`;
   await $`git push origin --tags`;
   console.log(`✅ Version ${newVersion} tagged and pushed.`);
@@ -97,7 +163,7 @@ program
     try {
       await validateChangesets();
       console.log('✅ Changeset validation passed.');
-    } catch {
+    } catch (error) {
       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',
       );
@@ -126,9 +192,8 @@ program
   .description('Run versioning and commit-and-tag in sequence')
   .action(async () => {
     console.log('📦 Running all steps...');
-    const releases = await versionCommand();
-    await updateJiraWithVersion(releases);
-    await commitTagCommand(releases);
+    await versionCommand();
+    await commitTagCommand();
   });
 
 program
@@ -136,21 +201,15 @@ program
   .description('Closes a version')
   .action(async () => {
     console.log('📦 Running all steps...');
-    const releases = await versionCommand(true);
-    await commitTagCommand(releases);
+    const { version } = await versionCommand(true);
+    await commitTagCommand();
 
+    // Get current branch
     const { stdout: currentBranch } = await $`git rev-parse --abbrev-ref HEAD`;
 
-    if (isMonoRepo()) {
-      for (const release of getAppReleases(releases)) {
-        const appName = getAppNameFromPackageName(release.name);
-        await $`git checkout -b release/${appName}/${release.newVersion}`;
-        await $`git push origin release/${appName}/${release.newVersion}`;
-      }
-    } else {
-      await $`git checkout -b release/${releases[0].newVersion}`;
-      await $`git push origin release/${releases[0].newVersion}`;
-    }
+    // Create and push release branch
+    await $`git checkout -b release/${version}`;
+    await $`git push origin release/${version}`;
 
     // Return to original branch
     await $`git checkout ${currentBranch.trim()}`;
@@ -168,7 +227,100 @@ program
     'Creates a changeset based on the current branch and Jira ticket information',
   )
   .action(async () => {
-    await createChangeset();
+    const mainPackage = await getMainPackage();
+    const componentName = mainPackage.name;
+
+    try {
+      // Step 1: Get the current branch name
+      const branchName = (await $`git branch --show-current`).stdout.trim();
+      console.log(`Current branch: ${branchName}`);
+
+      // Step 2: Extract Jira ticket number (e.g., matching JIRA-1234 pattern)
+      const jiraTicketMatch = branchName.match(/([A-Z]+-\d+)/);
+      if (!jiraTicketMatch) {
+        throw new Error('No Jira ticket found in the branch name.');
+      }
+      const jiraTicketId = jiraTicketMatch[0];
+
+      const jiraBaseUrl = 'https://docupacellc.atlassian.net';
+      const jiraEmail = process.env.JIRA_API_EMAIL;
+      const jiraApiKey = process.env.JIRA_API_KEY;
+      const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
+      const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
+      const jiraResponse = await fetch(jiraUrl, {
+        headers: {
+          Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
+          'Content-Type': 'application/json',
+        },
+      });
+
+      if (!jiraResponse.ok) {
+        throw new Error(
+          `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
+        );
+      }
+      const jiraTicketData = await jiraResponse.json();
+
+      const jiraSummary = jiraTicketData.fields.summary;
+
+      console.log(
+        `Generating release notes for ${jiraTicketId} - ${jiraSummary}`,
+      );
+
+      const openaiClient = new OpenAI({
+        apiKey: process.env['OPENAI_API_KEY'],
+      });
+
+      const ChangeRequestSchema = z.object({
+        change_type: z.enum(['patch', 'minor']),
+        summary: z.string(),
+        jira_ticket_id: z.string(),
+      });
+
+      const openAiResponse = await openaiClient.chat.completions.create({
+        model: 'gpt-4o-mini',
+        messages: [
+          {
+            role: 'system',
+            content: `Process JSON from a Jira ticket to generate simple maximum 2 sentence release note for the ticket and determine the change type for bug it should be a patch for new feature it should be a minor change`,
+          },
+          {
+            role: 'user',
+            content: JSON.stringify(jiraTicketData),
+          },
+        ],
+        response_format: zodResponseFormat(
+          ChangeRequestSchema,
+          'changeset_schema',
+        ),
+        temperature: 0,
+      });
+
+      const assistantResponse = openAiResponse.choices[0].message.content;
+      const parsedResponse = JSON.parse(assistantResponse);
+
+      const { change_type, summary } = parsedResponse;
+      console.log(`Change type: ${change_type}`);
+      console.log(`Release note: ${summary}`);
+
+      // Step 5: Create a changeset .md file
+      const changesetContent = `---
+"${componentName}": ${change_type}
+---
+
+${summary} [${jiraTicketId}]
+      `;
+      const changesetFile = `./.changeset/${jiraTicketId}.md`;
+
+      await createChangesetDirectory();
+      await fs.promises.writeFile(changesetFile, changesetContent);
+      console.log(`Created changeset file at ${changesetFile}`);
+
+      console.log('Done!');
+    } catch (err) {
+      console.error(`Error: ${err.message}`);
+      process.exit(1);
+    }
   });
 
 // Parse arguments

package/src/changeset/validate.js

@@ -2,40 +2,39 @@ import fs from 'fs';
 import path from 'path';
 import { $ } from 'zx';
 
-import { isMonoRepo, setGitInfo } from '../next/util.js';
-import { versionStatus } from './version.js';
+import { getChangedPackages, isMonoRepo, setGitInfo } from '../next/util.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() {
-  if (isMonoRepo()) {
-    await setGitInfo();
+  /*if (isMonoRepo()) {
+    const branch = process.env.BITBUCKET_BRANCH;
     const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
-    await $`git fetch origin ${destBranch}:${destBranch}`;
-    await versionStatus(destBranch);
-    /*const changedPackages = await getChangedPackages();
-    const releaseNames = releases.map((release) => release.name);
-    const changedPackageNames = changedPackages.map(
-      (changedPackage) => changedPackage.name,
+
+    const changePackages = await getChangedPackages(destBranch, branch);
+
+    const appPackages = changePackages.filter((appPackage) =>
+      appPackage.name.endsWith('-app'),
     );
 
-    if (!areArraysEqualIgnoringOrder(releaseNames, changedPackageNames)) {
-      throw new Error(
-        'Changesets must be created for all packages created and for those that have those changed as dependencies',
-      );
-    }*/
+    let appPaths;
+    if (appPackages.length > 0) {
+      appPaths = appPackages.map((appPackage) => appPackage.path);
+      for (const appPath of appPaths) {
+        const changesetPath = path.resolve(appPath, CHANGESET_DIR);
+        await validateChangesetPath(changesetPath);
+      }
+    } else {
+      throw new Error('No changeset for at least one app');
+    }
   } else {
     await validateChangesetPath(path.resolve(process.cwd(), CHANGESET_DIR));
-  }
+  }*/
+
+  await setGitInfo();
+  const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
+  await $`git fetch origin ${destBranch}:${destBranch}`;
+  await $`changeset status --since=${destBranch}`;
 }
 
 export async function validateChangesetPath(directoryPath) {

package/src/jenkins/setParams.groovy

@@ -1,5 +1,6 @@
 import groovy.json.JsonSlurper
-import hudson.model.*
+
+import hudson.model.*;
 
 def build = Thread.currentThread().executable
 def params = build.getEnvironment(listener)

package/src/next/apache.js

@@ -1,43 +1,40 @@
 import { $ } from 'zx';
 
 export async function addApacheSite() {
-  if (
-    !process.env.ENVIRONMENT ||
-    (process.env.ENVIRONMENT !== 'dev' && process.env.ENVIRONMENT !== 'qa')
-  ) {
-    log("Error: ENVIRONMENT must be either 'dev' or 'qa'.");
-    process.exit(1);
-  }
-  if (!process.env.SITE) {
-    log('Error: SITE cannot be empty.');
-    process.exit(1);
-  }
-
-  // Save private key from base64
-  const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
-  if (!haproxyPrivateKey) {
-    log('Error: HAPROXY_PRIVATE_KEY not set.');
-    process.exit(1);
-  }
+    if (
+      !process.env.ENVIRONMENT ||
+      (process.env.ENVIRONMENT !== 'dev' && process.env.ENVIRONMENT !== 'qa')
+    ) {
+      log("Error: ENVIRONMENT must be either 'dev' or 'qa'.");
+      process.exit(1);
+    }
+    if (!process.env.SITE) {
+      log('Error: SITE cannot be empty.');
+      process.exit(1);
+    }
+  
+    // 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}`;
+  
+    let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
+    // The script is run twice in the Bash version
+    await sshCmd(server, `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
 
-  await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
-  await fs.chmod('private.key', 0o600);
+    server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
 
-  console.log('Running command');
-  const sshCmd = (server, script) =>
-    $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
-
-  let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
-  // The script is run twice in the Bash version
-  await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-
-  server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
-
-  await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
-  );
-}
+    await sshCmd(server,`/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`);
+  }
+  
+  

package/src/next/cli.js

@@ -7,24 +7,26 @@ import { publish } from './publish.js';
 import {
   deployAppWithTag,
   deployFromSite,
-  deployTemplate,
   getDefaultDeploySite,
   getDeployTag,
 } from './deploy.js';
-import { copy, copy2 } from './copy.js';
+import { deployTemplate } from './deploy.js';
+import { copy } 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();
 
+import { $ } from 'zx';
+import { deployConnect, deployCore } from './jenkins.js';
+import { runPipeline } from './pipline.js';
+import { buildChangePackages } from './util.js';
+
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
 program
@@ -131,16 +133,6 @@ program
     await deployAppWithTag(application, env, site, deployTag);
   });
 
-program
-  .command('deploy-mono-app <tag> <application>')
-  .description('Deploy an application for a specific site')
-  .action(async (tag, application) => {
-    const deployTag = await getDeployTag(tag);
-    const version = 'v' + deployTag.split('@')[1];
-    const { env, site } = await getDefaultDeploySite(version);
-    await deployAppWithTag(application, env, site, version);
-  });
-
 program
   .command('deploy-core <env> <site>')
   .description('Deploy Core')
@@ -173,17 +165,23 @@ program
     });
   });
 
+program
+  .command('build-mono-repo')
+  .description('Build Mono Repo')
+  .action(async () => {
+    await buildChangePackages();
+  });
+
 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