@docupace/pipeline 1.0.81-alpha.9 → 1.0.81

package/package.json

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

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

@@ -226,10 +226,6 @@ async function runPreparePhase(
       case 4:
         console.log(`✅ ${configName}: No Changes`);
         break;
-      case 5:
-        console.log(`❌ Stopping Merge`);
-        process.exit(1);
-        break;
       default:
         console.log(
           `❌ ${configName}: Unknown error (exit code: ${result.exitCode})`,
@@ -386,7 +382,7 @@ async function mergeAll(verbose = false) {
       config.repositories,
     );
 
-    /*if (existingPRs.length > 0) {
+    if (existingPRs.length > 0) {
       console.log(
         `❌ Found ${existingPRs.length} existing pull request(s) with "Automated merge with changeset" description. Exiting to prevent conflicts.`,
       );
@@ -398,7 +394,7 @@ async function mergeAll(verbose = false) {
         });
       }
       process.exit(1);
-    }*/
+    }
 
     if (verbose)
       console.log('✅ No existing automated merge PRs found. Proceeding...');
@@ -432,15 +428,6 @@ async function mergeAll(verbose = false) {
         verbose,
       );
 
-      if (
-        branchResult.success &&
-        branchResult.summary.successes > 0 &&
-        i < config.mergeBranches.length - 1
-      ) {
-        console.log('Pausing before next merge');
-        await new Promise((res) => setTimeout(res, 90000));
-      }
-
       if (!branchResult.success) {
         console.log(`Exiting due to failure of one or more merges`);
         process.exit(1);

package/src/merge/cli-merge.js

@@ -216,27 +216,9 @@ function mergeIntoTarget(
       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 (e) {
-      console.error('Failed to delete remote branch', e);
-    }
+    execSync(`git branch -d ${mergeBranchName}`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
 
     if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
   } else {
@@ -287,62 +269,6 @@ 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',
-    });
-
-    execSync(`git pull`, {
-      stdio: verbose ? 'inherit' : 'pipe',
-    });
-
-    // Check for .md files in .changeset directory (excluding README.md)
-    try {
-      const changesetFiles = execSync(
-        'find .changeset -name "*.md" -not -name "README.md" 2>/dev/null | head -1',
-        {
-          encoding: 'utf8',
-          stdio: 'pipe',
-        },
-      ).trim();
-
-      if (changesetFiles) {
-        console.log(
-          `❌ Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
-        );
-        process.exit(5);
-      }
-    } 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')
@@ -380,11 +306,6 @@ 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/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