@docupace/pipeline 1.0.39-newrelease.8 → 1.0.39

package/src/next/haproxy.js

@@ -1,10 +1,22 @@
 import { $ } from 'zx';
+import fs from 'fs-extra';
+import path from 'path';
+
+export async function haproxySync(cluster) {
+  if (cluster !== 'preprod' && cluster !== 'stage') {
+    console.log('Error: Cluster must be preprod or stage');
+    process.exit(1);
+  }
 
-export async function haproxySync() {
   const repoPath = '/root/repo/docupace-ansible';
-  const inventory = path.join(repoPath, 'inventories/preprod/inventory');
+  const inventory = path.join(repoPath, `inventories/${cluster}/inventory`);
 
   // Create haproxy.sh
+  const cluserHostMap = {
+    preprod: '10.10.28.198',
+    stage: '10.12.28.10',
+  };
+
   const scriptContent = `
   #!/bin/bash
   
@@ -18,11 +30,11 @@ export async function haproxySync() {
   git submodule foreach --recursive git checkout master
   git submodule foreach --recursive git pull origin master
   
-  ansible-playbook -i inventories/preprod/inventory haproxy.yml -e "cluster=preprod"
+  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}"
   
   echo "proceeding"
   echo "committing changes"
-  git add preprod-haproxy.cfg
+  git add ${cluster}-haproxy.cfg
   git commit -m "Sync haproxy"
   git push origin master
   `;
@@ -32,18 +44,16 @@ export async function haproxySync() {
   // Private key
   const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
   if (!haproxyPrivateKey) {
-    log('Error: HAPROXY_PRIVATE_KEY not set.');
+    console.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);
 
-  await $`cat private.key`; // Just to mimic the script's behavior
-
   // Copy script to remote
-  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@10.10.28.198:/tmp/haproxy.sh`;
+  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster]}:/tmp/haproxy.sh`;
 
   // Execute script on remote
-  await $`ssh -i private.key -o StrictHostKeyChecking=no root@10.10.28.198 "bash /tmp/haproxy.sh"`;
+  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster]} "bash /tmp/haproxy.sh"`;
 }

package/src/next/jira.js

@@ -12,67 +12,19 @@ const jiraClient = axios.create({
   },
 });
 
-export async function getJiraReleaseNotes(issueKey) {
-  try {
-    const response = await jiraClient.get(
-      `/rest/api/2/issue/${issueKey}?fields=customfield_10108,customfield_11625`,
-    );
-
-    const releaseNotesField = response.data.fields.customfield_10108;
-    const url = response.data.fields.customfield_11625;
-
-    // Extract text from the document structure
-
-    return { summary: releaseNotesField, url };
-  } catch (error) {
-    console.error(
-      `Error getting Jira release notes for ${issueKey}: ${error.message}`,
-    );
-    throw error;
-  }
-}
-
-/**
- * Updates the release notes in the Jira issue's custom field
- * @param {string} issueKey - The Jira issue key
- * @param {string} text - The release notes text to set
- */
-export async function updateJiraReleaseNotes(
-  issueKey,
-  text,
-  url,
-  jiraVersions,
-) {
-  try {
-    const payload = {
-      fields: {
-        customfield_10108: text,
-        customfield_11625: url,
-        fixVersions: jiraVersions.map((version) => ({ name: version })),
-      },
-    };
-
-    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, payload);
-
-    console.log(`Updated release notes for ${issueKey}`);
-  } catch (error) {
-    console.error(
-      `Error updating Jira release notes for ${issueKey}: ${error.message}`,
-    );
-    throw error;
-  }
-}
-
+const packageComponents = {
+  'docupace-ui': 'next-ui',
+  'docupace-graphql-server': 'graphql-server',
+  '@docupace/template': 'template',
+};
 /**
  * Updates the component version custom field in Jira
  * @param {string} issueKey - The Jira issue key
- * @param {string} packageName - The package name
+ * @param {string} component - The component name
  * @param {string} version - The version to set
  */
 export async function updateComponentVersion(issueKey, packageName, version) {
-  const component = packageName.includes('/')
-    ? packageName.split('/')[1]
-    : packageName;
+  const component = packageComponents[packageName] ?? packageName;
   console.log(
     `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
   );

package/src/next/publish.js

@@ -1,71 +1,48 @@
-import { $ } from './logger.js';
+import { $ } from 'zx';
 
-const {
-  JF_REGISTRY_URL,
-  JF_REGISTRY_REPO_NAME,
-  JF_REGISTRY_PASSWORD_DEV,
-  JF_REGISTRY_USER_DEV,
-  BITBUCKET_REPO_SLUG,
-  BITBUCKET_BUILD_NUMBER,
-  APP_NAME,
-} = process.env;
+export async function publish(GIT_SHA) {
+  const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
+  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
 
-const JF_REGISTRY_FULL_URL = `${JF_REGISTRY_URL}/${JF_REGISTRY_REPO_NAME}`;
+  console.log(`Publishing Docker image: ${IMAGE_NAME}`);
 
-async function loginRegistry() {
-  await $`echo ${JF_REGISTRY_PASSWORD_DEV} | docker login --username ${JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}`;
-}
-
-async function logoutRegistry() {
-  await $`docker logout ${JF_REGISTRY_URL}`;
-}
-
-export async function publish(gitSha) {
-  process.env.DOCKER_HOST = '';
-
-  console.log(JSON.stringify(process.env));
-
-  const IMAGE_PREFIX = APP_NAME ?? BITBUCKET_REPO_SLUG;
-  const BUILD_IMAGE_NAME = `${IMAGE_PREFIX}:build-${BITBUCKET_BUILD_NUMBER}`;
-  const IMAGE_NAME = `${IMAGE_PREFIX}:sha-${gitSha}`;
-
-  console.log(`Publishing Docker image ${IMAGE_NAME}...`);
+  // Docker login
+  await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
 
-  await loginRegistry();
-
-  let manifestExists = false;
+  // Check if the image already exists
   try {
-    $.verbose = false; // Silence output temporarily
     await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    manifestExists = true;
-  } catch {
-    manifestExists = false;
-  } finally {
-    $.verbose = true; // Restore normal output
-  }
-
-  if (manifestExists) {
     console.log(
-      `Tag sha-${gitSha} already exists in the remote repository. Skipping push.`,
+      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
     );
-  } else {
+  } catch {
     await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
     await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
   }
 
+  // Tag and push build image
   await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
   await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
 
-  const gitTags = (await $`git tag --points-at HEAD`).stdout
-    .trim()
-    .split('\n')
-    .filter(Boolean);
-  for (const gitTag of gitTags) {
-    const version = gitTag.includes('@') ? 'v' + gitTag.split('@')[1] : gitTag;
-    const tagName = `${IMAGE_PREFIX}:${version}`;
-    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${tagName}`;
-    await $`docker push ${JF_REGISTRY_FULL_URL}/${tagName}`;
+  // Fetch Git tags pointing to the current HEAD
+  const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
+  const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
+
+  // Tag and push each Git tag as a Docker tag
+  if (gitTags.length > 0) {
+    console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
+    for (const gitTag of gitTags) {
+      const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
+      console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
+      await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
+      await $`docker push ${dockerTag}`;
+    }
+  } else {
+    console.log('No Git tags found pointing to the current HEAD.');
   }
 
-  await logoutRegistry();
+  // Docker logout
+  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
 }

package/src/next/vault.js

@@ -3,8 +3,8 @@ import axios from 'axios';
 export async function vaultAddSiteData(SITE, SITE_CONFIG_REMOTE_PATH) {
   const AUTH0_CLIENT_ID = process.env.AUTH0_CLIENT_ID;
   const AUTH0_CLIENT_SECRET = process.env.AUTH0_CLIENT_SECRET;
-  const VAULT_ADDR = process.env.VAULT_ADDR; // Vault host URL from environment variables
-  const VAULT_TOKEN = process.env.VAULT_TOKEN; // Vault token from environment variables
+  const VAULT_ADDR = process.env.VAULT_ADDR;       // Vault host URL from environment variables
+  const VAULT_TOKEN = process.env.VAULT_TOKEN;     // Vault token from environment variables
 
   if (!VAULT_ADDR || !VAULT_TOKEN) {
     throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
@@ -13,6 +13,7 @@ export async function vaultAddSiteData(SITE, SITE_CONFIG_REMOTE_PATH) {
   const vaultApiUrl = `${VAULT_ADDR}/v1/secret/data/${SITE}/common/config`;
 
   try {
+
     if (process.env.VAULT_SKIP_VERIFY === 'true') {
       process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
     }
@@ -31,15 +32,12 @@ export async function vaultAddSiteData(SITE, SITE_CONFIG_REMOTE_PATH) {
           'X-Vault-Token': VAULT_TOKEN,
           'Content-Type': 'application/json',
         },
-      },
+      }
     );
 
     console.log('Data added to Vault successfully:', response.data);
   } catch (error) {
-    console.error(
-      'Error adding data to Vault:',
-      error.response?.data || error.message,
-    );
+    console.error('Error adding data to Vault:', error.response?.data || error.message);
     throw error;
   }
 }

package/terraform/apply.sh

@@ -2,6 +2,7 @@
 set -e
 
 PROJECT=$1
+export ROLE_NAME="${2:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -9,7 +10,6 @@ if [[ -z "$PROJECT" ]]; then
   exit 1
 fi
 
-export ROLE_NAME="atlassian-bitbucket-pipelines-runner-eks-role"
 export SESSION_NAME="EKSAdminSession"
 export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"

package/terraform/init.sh

@@ -3,6 +3,7 @@ set -e
 
 PROJECT=$1
 CURRENT_ENVIRONMENT=$2
+export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -16,7 +17,6 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   exit 1
 fi
 
-export ROLE_NAME="atlassian-bitbucket-pipelines-runner-eks-role"
 export SESSION_NAME="EKSAdminSession"
 export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
@@ -37,6 +37,7 @@ info () {
   echo "PROJECT => $PROJECT"
   echo "CURRENT_ENVIRONMENT => $CURRENT_ENVIRONMENT"
   echo "SITE_NAME => $SITE_NAME"
+  echo "Using AWS Role: $ROLE_NAME"
 }
 
 if [[ "$PROJECT" == "s3" ]]; then

package/terraform/plan.sh

@@ -3,6 +3,7 @@ set -e
 
 PROJECT=$1
 CURRENT_ENVIRONMENT=$2
+export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -16,7 +17,6 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   exit 1
 fi
 
-export ROLE_NAME="atlassian-bitbucket-pipelines-runner-eks-role"
 export SESSION_NAME="EKSAdminSession"
 export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"

package/README.md

@@ -1,136 +0,0 @@
-# Pipeline Shared Scripts
-
-A collection of CLI tools for Docupace's CI/CD pipelines and deployment workflows.
-
-## Overview
-
-This package provides a set of command-line interfaces (CLIs) to facilitate various DevOps operations in the Docupace ecosystem:
-
-- `dp-next-cli`: Deployment and pipeline management for Next applications
-- `dp-changeset-cli`: Versioning and changeset management 
-- `dp-auth0-cli`: Auth0 tenant configuration and management
-
-## Installation
-
-```bash
-npm install @docupace/pipeline
-```
-
-Or with pnpm:
-
-```bash
-pnpm add @docupace/pipeline
-```
-
-## Command Line Interfaces
-
-### dp-next-cli
-
-Manages deployment, Docker image handling, and infrastructure configuration.
-
-```bash
-dp-next-cli [command] [options]
-```
-
-**Commands:**
-
-- `pull <imageName>`: Pull a Docker image from the registry
-- `sonar`: Run Sonar analysis
-- `addApacheSite`: Add site to apache
-- `connectClone`: Clone connect site
-- `haproxySync`: Sync haproxy config
-- `vaultAddSiteData`: Add m2m auth0 data to vault
-  - `-s, --site-name <siteName>`: Site name
-  - `-p, --site-config-remote-path <path>`: Site config remote path
-- `publish`: Publish a Docker image
-- `deploy-from-site`: Deploy an application for a specific site
-  - `-f, --from-env <fromEnv>`: Source environment
-  - `-t, --to-env <toEnv>`: Target environment
-  - `-F, --from-site <fromSite>`: Source site
-  - `-T, --to-site <toSite>`: Target site
-  - `-c, --deploy-core <deployCore>`: Deploy Core (default: "false")
-  - `-C, --deploy-connect <deployConnect>`: Deploy Connect (default: "false")
-- `deploy-template`: Deploy an application for a specific site
-- `deploy-app <application>`: Deploy an application for a specific site
-- `deploy-core <env> <site>`: Deploy Core
-  - `-l, --liquibase <liquibase>`: Application name (default: "true")
-  - `-b, --branch <branch>`: Branch (default: "master")
-- `deploy-connect <env> <site>`: Deploy Connect
-  - `-l, --liquibase <liquibase>`: Application name (default: "true")
-  - `-b, --branch <branch>`: Branch (default: "master")
-- `deploy-core-pipeline <env> <site>`: Deploy Core via pipeline
-  - `-l, --liquibase <liquibase>`: Application name (default: "true")
-  - `-b, --branch <branch>`: Branch (default: "master")
-- `copy`: Copy a Docker image between registries
-  - `-a, --application <application>`: Application name
-  - `-f, --from-env <fromEnv>`: Source environment
-  - `-t, --to-env <toEnv>`: Target environment
-  - `-g, --tag <tag>`: Image tag
-- `run-pipeline`: Trigger a pipeline by name
-  - `-r, --repository <repository>`: Repository name
-  - `-p, --pipeline-name <pipelineName>`: Pipeline name
-  - `-b, --branch <branch>`: Branch name
-  - `-v, --variables <key=value>`: Pipeline variable as key=value pair
-  - `-w, --wait`: Wait for the pipeline to complete (default: false)
-
-### dp-changeset-cli
-
-Manages versioning and changesets for mono-repos and single-package repos.
-
-```bash
-dp-changeset-cli [command] [options]
-```
-
-**Commands:**
-
-- `validate`: Validate changesets for the provided PR
-- `version`: Run Changeset versioning
-- `commit-tag`: Commit and tag the new version
-- `version-commit-tag`: Run versioning and commit-and-tag in sequence
-- `close-version`: Close a version and create a release branch
-- `create-changeset`: Create a changeset based on the current branch and Jira ticket information
-
-### dp-auth0-cli
-
-Manages Auth0 tenant configuration across environments.
-
-```bash
-dp-auth0-cli [command] [options]
-```
-
-**Commands:**
-
-- `configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3>`: Configure Auth0 tenants
-- `getVaultSecrets <vaultPath>`: Get secrets from Vault
-- `configureAlias <site> <env> <username> <password> <realm>`: Configure Core Alias for the given site
-- `exportConf <site> <env>`: Export Auth0 configuration for the given site
-- `getAuth0Metadata <site> <env>`: Get Auth0 metadata for the given site
-
-## Environment Configuration
-
-The CLI tools look for environment configuration in the following locations:
-- `.env.pipeline.local`
-- `config/.env.pipeline.local`
-
-## Examples
-
-```bash
-# Deploy from one site to another
-dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true
-
-# Run a pipeline
-dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa
-
-# Validate changesets
-dp-changeset-cli validate
-
-# Create a new changeset
-dp-changeset-cli create-changeset
-
-# Configure Auth0 for a site
-dp-auth0-cli configureFromSite sourceSite targetSite dev prod true true true false
-```
-
-## License
-
-ISC

package/src/changeset/canny.js

@@ -1,116 +0,0 @@
-#!/usr/bin/env node
-import fetch from 'node-fetch';
-
-// Configuration
-const CANNY_API_KEY = process.env.CANNY_API_KEY;
-
-/**
- * Upload release notes to Canny
- * @param {Object} releaseNote - The release note data
- * @returns {Promise<Object>} - The full Canny entry object
- */
-export async function uploadToCanny(releaseNote, labelIDs) {
-  if (!CANNY_API_KEY) {
-    console.warn('Canny API key not provided. Skipping upload.');
-    return null;
-  }
-
-  try {
-    // Prepare the content for Canny based on the release notes
-    const title = releaseNote.title;
-    let content = '';
-
-    // Include user-facing description if available
-    if (
-      releaseNote.userFacingDescription &&
-      releaseNote.userFacingDescription.__line.trim()
-    ) {
-      content += `${releaseNote.userFacingDescription.__line}\n\n`;
-    } else {
-      content += `${releaseNote.summary}\n\n`;
-    }
-
-    // Include technical details if available
-    if (
-      releaseNote.technicalDescription &&
-      releaseNote.technicalDescription.__line.trim()
-    ) {
-      content += `**Technical Details**\n\n${releaseNote.technicalDescription.__line}\n\n`;
-    }
-
-    // Add JIRA reference
-    content += `**Reference**: JIRA ticket [${releaseNote.ticketId}]`;
-
-    // Map our changeType to Canny's type parameter
-    let entryType;
-    if (releaseNote.changeType === 'New') {
-      entryType = 'new';
-    } else if (releaseNote.changeType === 'Improved') {
-      entryType = 'improved';
-    } else if (releaseNote.changeType === 'Fixed') {
-      entryType = 'fixed';
-    }
-
-    // Create a new changelog entry in Canny
-    const createResponse = await fetch(
-      'https://canny.io/api/v1/entries/create',
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          apiKey: CANNY_API_KEY,
-          title: title,
-          details: content,
-          type: entryType,
-          published: false, // Keep as draft initially
-          labelIDs,
-        }),
-      },
-    );
-
-    if (!createResponse.ok) {
-      console.error(`Error from Canny API: ${createResponse.statusText}`);
-      return null;
-    }
-
-    const createData = await createResponse.json();
-    const entryId = createData.id;
-
-    // Fetch the complete entry details using the entries/list endpoint
-    const listResponse = await fetch('https://canny.io/api/v1/entries/list', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        apiKey: CANNY_API_KEY,
-      }),
-    });
-
-    if (!listResponse.ok) {
-      console.error(
-        `Error fetching entries list from Canny API: ${listResponse.statusText}`,
-      );
-      return createData; // Return just the create response as fallback
-    }
-
-    const listData = await listResponse.json();
-
-    // Find the entry we just created in the list
-    const fullEntry = listData.entries.find((entry) => entry.id === entryId);
-
-    if (!fullEntry) {
-      console.warn(
-        `Created entry with ID ${entryId} not found in entries list. Returning partial data.`,
-      );
-      return createData;
-    }
-
-    return fullEntry;
-  } catch (error) {
-    console.error(`Error uploading to Canny: ${error.message}`);
-    return null;
-  }
-}

package/src/changeset/changelog-module.cjs

@@ -1,26 +0,0 @@
-async function getReleaseLine(changeset, type, changelogOpts) {
-  return (async () => {
-    const { default: changelog } = await import('./changelog.js');
-    return await changelog.getReleaseLine(changeset, type, changelogOpts); // Now you can use `changelog` here
-  })();
-}
-
-async function getDependencyReleaseLine(
-  changesets,
-  dependenciesUpdated,
-  changelogOpts,
-) {
-  return (async () => {
-    const { default: changelog } = await import('./changelog.js');
-    return await changelog.getDependenciesReleaseLine(
-      changesets,
-      dependenciesUpdated,
-      changelogOpts,
-    ); // Now you can use `changelog` here
-  })();
-}
-
-module.exports = {
-  getReleaseLine,
-  getDependencyReleaseLine,
-};