@docupace/pipeline 1.0.81-alpha.9 → 1.0.82

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/cli.js

@@ -4,7 +4,6 @@ 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,
@@ -12,7 +11,7 @@ import {
   getDefaultDeploySite,
   getDeployTag,
 } from './deploy.js';
-import { copy, copy2 } from './copy.js';
+import { copy2 } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
 import { addApacheSite } from './apache.js';
 import { haproxySync } from './haproxy.js';
@@ -83,14 +82,6 @@ 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')

package/terraform/import.sh

@@ -0,0 +1,111 @@
+#!/bin/bash
+set -e
+
+PROJECT=$1
+CURRENT_ENVIRONMENT=$2
+export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
+
+AWS_REGION="${4:-us-west-2}"
+CLUSTER_NAME="${5:-}"
+IMPORT_ADDRESS="${IMPORT_ADDRESS:-}"
+IMPORT_ID="${IMPORT_ID:-}"
+
+if [[ -z "$PROJECT" ]]; then
+  echo "Error: Project name is required."
+  echo "Usage: $0 <project-name> <environment> [role-name] [aws-region] [cluster-name]"
+  exit 1
+fi
+
+if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
+  echo "Error: ENVIRONMENT is required."
+  echo "Usage: $0 <project-name> <environment> [role-name] [aws-region] [cluster-name]"
+  exit 1
+fi
+
+if [[ -z "$IMPORT_ADDRESS" ]]; then
+  echo "Error: IMPORT_ADDRESS environment variable is required."
+  echo "Example: IMPORT_ADDRESS=module.vpc.aws_vpc.main"
+  exit 1
+fi
+
+if [[ -z "$IMPORT_ID" ]]; then
+  echo "Error: IMPORT_ID environment variable is required."
+  echo "Example: IMPORT_ID=vpc-1234567890abcdef0"
+  exit 1
+fi
+
+if [ -n "$CLUSTER_NAME" ]; then
+  export EKS_CLUSTER_NAME="$CLUSTER_NAME"
+elif [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
+  export EKS_CLUSTER_NAME="connect-next-prd-eks-cluster"
+  CURRENT_ENVIRONMENT="prod"
+elif [ "$CURRENT_ENVIRONMENT" == "stg" ]; then
+  export EKS_CLUSTER_NAME="connect-next-stg-eks-cluster"
+  CURRENT_ENVIRONMENT="stage"
+else
+  export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
+fi
+
+echo "=========================================="
+echo "Terraform Import Configuration"
+echo "=========================================="
+echo "Project: $PROJECT"
+echo "Environment: $CURRENT_ENVIRONMENT"
+echo "EKS Cluster: $EKS_CLUSTER_NAME"
+echo "AWS Region: $AWS_REGION"
+echo "Resource Address: $IMPORT_ADDRESS"
+echo "Resource ID: $IMPORT_ID"
+echo "=========================================="
+
+export SESSION_NAME="EKSAdminSession"
+export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
+export ASSUME_ROLE_OUTPUT=$(aws sts assume-role --role-arn $ROLE_ARN --role-session-name $SESSION_NAME)
+export AWS_ACCESS_KEY_ID=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.AccessKeyId')
+export AWS_SECRET_ACCESS_KEY=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.SecretAccessKey')
+export AWS_SESSION_TOKEN=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.SessionToken')
+
+aws sts get-caller-identity
+
+cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
+
+echo "Executing: terraform import \"$IMPORT_ADDRESS\" \"$IMPORT_ID\""
+
+if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
+  if [[ "$CURRENT_ENVIRONMENT" == "dev" ]]; then
+    echo "$dev_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/build_agent_configuration.tfvars.json
+  elif [[ "$CURRENT_ENVIRONMENT" == "qa" ]]; then
+    echo "$qa_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/build_agent_configuration.tfvars.json
+  fi
+
+  terraform import \
+    -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
+    -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/build_agent_configuration.tfvars.json" \
+    -- "$IMPORT_ADDRESS" "$IMPORT_ID"
+elif [[ "$PROJECT" == "s3" ]]; then
+  terraform import \
+    -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
+    -var="site=${SITE_NAME}" \
+    -var="env=${CURRENT_ENVIRONMENT}" \
+    -- "$IMPORT_ADDRESS" "$IMPORT_ID"
+elif [[ "$PROJECT" == "idp" ]]; then
+  terraform import \
+    -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
+    -var="site=${SITE_NAME}" \
+    -var="env=${CURRENT_ENVIRONMENT}" \
+    -var="docupace_domain=${DOCUPACE_DOMAIN}" \
+    -var="docupace_next_domain=${DOCUPACE_NEXT_DOMAIN}" \
+    -var="old_page_design=${USE_OLD_PAGE_DESIGN}" \
+    -var="use_new_domain=${USE_NEW_DOMAIN}" \
+    -var="configure_autologin=${CONFIGURE_AUTOLOGIN}" \
+    -var="configure_enterprise_ui=${CONFIGURE_ENTERPRISE_UI}" \
+    -var="enable_mfa=${ENABLE_MFA}" \
+    -var="configure_ui_cc=${CONFIGURE_UI_CC}" \
+    -var="configure_precisefp_client_credentials=${CONFIGURE_PRECISEFP_CLIENT_CREDENTIALS}" \
+    -var="use_azuread_app=${USE_AZUREAD_APP}" \
+    -var="deploy_azuread_app=${DEPLOY_AZUREAD_APP}" \
+    -- "$IMPORT_ADDRESS" "$IMPORT_ID"
+else
+  terraform import \
+    -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
+    -- "$IMPORT_ADDRESS" "$IMPORT_ID"
+fi

package/terraform/plan.sh

@@ -7,6 +7,8 @@ export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
 AWS_REGION="${4:-us-west-2}"
 CLUSTER_NAME="${5:-}"
+TF_OPTIONS="${TF_OPTIONS:-}"
+TARGET="${TARGET:-}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -34,6 +36,8 @@ fi
 
 echo "Using EKS cluster: $EKS_CLUSTER_NAME"
 echo "Current environment: $CURRENT_ENVIRONMENT"
+echo "TF_OPTIONS: $TF_OPTIONS"
+echo "TARGET: $TARGET"
 
 export SESSION_NAME="EKSAdminSession"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
@@ -55,12 +59,16 @@ if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
 
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
     -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/build_agent_configuration.tfvars.json" \
-    -out .tfplan
+    $TARGET \
+    -out .tfplan \
+    $TF_OPTIONS
 elif [[ "$PROJECT" == "s3" ]]; then
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
     -var="site=${SITE_NAME}" \
     -var="env=${CURRENT_ENVIRONMENT}" \
-    -out .tfplan
+    $TARGET \
+    -out .tfplan \
+    $TF_OPTIONS
 elif [[ "$PROJECT" == "idp" ]]; then
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
     -var="site=${SITE_NAME}" \
@@ -76,7 +84,12 @@ elif [[ "$PROJECT" == "idp" ]]; then
     -var="configure_precisefp_client_credentials=${CONFIGURE_PRECISEFP_CLIENT_CREDENTIALS}" \
     -var="use_azuread_app=${USE_AZUREAD_APP}" \
     -var="deploy_azuread_app=${DEPLOY_AZUREAD_APP}" \
-    -out .tfplan
+    $TARGET \
+    -out .tfplan \
+    $TF_OPTIONS
 else
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" -out .tfplan
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
+    $TARGET \
+    -out .tfplan \
+    $TF_OPTIONS
 fi

package/src/micro/deploy-microservice.js

@@ -1,153 +0,0 @@
-import { $ } from '../next/logger.js';
-import fs from 'fs';
-import path from 'path';
-import axios from 'axios';
-
-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"`;
-
-    if (process.env.BITBUCKET_STEP_TRIGGERER_UUID) {
-      try {
-        const response = await axios.get(
-          `https://api.bitbucket.org/2.0/users/${process.env.BITBUCKET_STEP_TRIGGERER_UUID}`,
-        );
-        const triggererUsername = response.data.display_name;
-        console.log(`📌 Run triggered by: ${triggererUsername}`);
-        await $`cd ${repoName} && git config user.name ${triggererUsername}`;
-      } catch (error) {
-        console.warn('Failed to fetch Bitbucket user info:', error.message);
-      }
-    }
-
-    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;