@docupace/pipeline 1.0.79 → 1.0.81-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.79",
+  "version": "1.0.81-alpha.0",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/merge/cli-merge-all.js

@@ -428,6 +428,10 @@ async function mergeAll(verbose = false) {
         verbose,
       );
 
+      if (i < config.mergeBranches - 1) {
+        await new Promise((res) => setTimeout(res, 1000));
+      }
+
       if (!branchResult.success) {
         console.log(`Exiting due to failure of one or more merges`);
         process.exit(1);

package/src/merge/cli-merge.js

@@ -216,9 +216,27 @@ function mergeIntoTarget(
       stdio: verbose ? 'inherit' : 'pipe',
     });
 
-    execSync(`git branch -d ${mergeBranchName}`, {
-      stdio: verbose ? 'inherit' : 'pipe',
-    });
+    // Delete local merge branch
+    try {
+      execSync(`git branch -d ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted local merge branch: ${mergeBranchName}`);
+    } catch {
+      // Branch doesn't exist, which is fine
+    }
+
+    // Delete remote merge branch
+    try {
+      execSync(`git push origin --delete ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted remote merge branch: ${mergeBranchName}`);
+    } catch {
+      // Remote branch doesn't exist, which is fine
+    }
 
     if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
   } else {
@@ -269,6 +287,56 @@ function cleanupFailedMerge(verbose = false) {
   }
 }
 
+/**
+ * Check if source branch has uncommitted changesets
+ */
+function checkForUncommittedChangesets(sourceBranch, verbose = false) {
+  if (verbose)
+    console.log(`🔍 Checking for uncommitted changesets in ${sourceBranch}`);
+
+  // Store current branch
+  const currentBranch = execSync('git branch --show-current', {
+    encoding: 'utf8',
+    stdio: 'pipe',
+  }).trim();
+
+  try {
+    // Checkout source branch
+    execSync(`git checkout ${sourceBranch}`, {
+      stdio: 'pipe',
+    });
+
+    // Check for .md files in .changeset directory
+    try {
+      const changesetFiles = execSync(
+        'find .changeset -name "*.md" 2>/dev/null | head -1',
+        {
+          encoding: 'utf8',
+          stdio: 'pipe',
+        },
+      ).trim();
+
+      if (changesetFiles) {
+        throw new Error(
+          `Cannot merge a branch where version has not been bumped. Found uncommitted changesets in ${sourceBranch}`,
+        );
+      }
+    } catch (error) {
+      if (error.message.includes('Cannot merge')) {
+        throw error;
+      }
+      // If find command fails (no .changeset directory), that's fine
+    }
+
+    if (verbose) console.log('✅ No uncommitted changesets found');
+  } finally {
+    // Return to original branch
+    execSync(`git checkout ${currentBranch}`, {
+      stdio: 'pipe',
+    });
+  }
+}
+
 export function setupMerge(program) {
   program
     .command('merge')
@@ -306,6 +374,11 @@ export function setupMerge(program) {
           );
         }
 
+        // Check for uncommitted changesets in source branch
+        if (!mergeFail && !mergeSuccess) {
+          checkForUncommittedChangesets(sourceBranch, verbose);
+        }
+
         // 1. Create merge branch from target branch
         const mergeBranchName = createMergeBranch(
           sourceBranch,

package/terraform/apply.sh

@@ -3,6 +3,7 @@ set -e
 
 PROJECT=$1
 export ROLE_NAME="${2:-atlassian-bitbucket-pipelines-runner-eks-role}"
+CLUSTER_NAME="${3:-}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -10,7 +11,9 @@ if [[ -z "$PROJECT" ]]; then
   exit 1
 fi
 
-if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
+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
@@ -21,6 +24,7 @@ else
 fi
 
 echo "Using EKS cluster: $EKS_CLUSTER_NAME"
+echo "Current environment: $CURRENT_ENVIRONMENT"
 
 export SESSION_NAME="EKSAdminSession"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"

package/terraform/init.sh

@@ -5,6 +5,9 @@ PROJECT=$1
 CURRENT_ENVIRONMENT=$2
 export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
+AWS_REGION="${4:-us-west-2}"
+CLUSTER_NAME="${5:-}"
+
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
   echo "Usage: $0 <project-name> $1 <environment>"
@@ -17,7 +20,9 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   exit 1
 fi
 
-if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
+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
@@ -28,6 +33,7 @@ else
 fi
 
 echo "Using EKS cluster: $EKS_CLUSTER_NAME"
+echo "Current environment: $CURRENT_ENVIRONMENT"
 
 export SESSION_NAME="EKSAdminSession"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
@@ -57,16 +63,16 @@ if [[ "$PROJECT" == "s3" ]]; then
      -input=false \
      -reconfigure \
      -backend=true \
-     -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars \
-     -backend-config="key=us-west-2/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
+     -backend-config=./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/backend.tfvars \
+     -backend-config="key=${AWS_REGION}/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
 elif [[ "$PROJECT" == "idp" ]]; then
   info
   terraform init \
      -input=false \
      -reconfigure \
      -backend=true \
-     -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars \
-     -backend-config="key=us-west-2/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
+     -backend-config=./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/backend.tfvars \
+     -backend-config="key=${AWS_REGION}/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
 else
-  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/backend.tfvars --reconfigure
 fi

package/terraform/plan.sh

@@ -5,6 +5,9 @@ PROJECT=$1
 CURRENT_ENVIRONMENT=$2
 export ROLE_NAME="${3:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
+AWS_REGION="${4:-us-west-2}"
+CLUSTER_NAME="${5:-}"
+
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
   echo "Usage: $0 <project-name> $1 <environment>"
@@ -17,7 +20,9 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   exit 1
 fi
 
-if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
+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
@@ -28,6 +33,7 @@ else
 fi
 
 echo "Using EKS cluster: $EKS_CLUSTER_NAME"
+echo "Current environment: $CURRENT_ENVIRONMENT"
 
 export SESSION_NAME="EKSAdminSession"
 export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
@@ -42,21 +48,21 @@ cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
 
 if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
   if [[ "$CURRENT_ENVIRONMENT" == "dev" ]]; then
-    echo "$dev_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json
+    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}/us-west-2/build_agent_configuration.tfvars.json
+    echo "$qa_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/build_agent_configuration.tfvars.json
   fi
 
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
-    -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json" \
+  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
 elif [[ "$PROJECT" == "s3" ]]; then
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
     -var="site=${SITE_NAME}" \
     -var="env=${CURRENT_ENVIRONMENT}" \
     -out .tfplan
 elif [[ "$PROJECT" == "idp" ]]; then
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" \
     -var="site=${SITE_NAME}" \
     -var="env=${CURRENT_ENVIRONMENT}" \
     -var="docupace_domain=${DOCUPACE_DOMAIN}" \
@@ -72,5 +78,5 @@ elif [[ "$PROJECT" == "idp" ]]; then
     -var="deploy_azuread_app=${DEPLOY_AZUREAD_APP}" \
     -out .tfplan
 else
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/${AWS_REGION}/terraform.tfvars" -out .tfplan
 fi