@docupace/pipeline 1.0.41 → 1.0.44

package/src/next/sonar.js

@@ -1,23 +1,23 @@
-import { $ } from 'zx';
-
-export async function sonar(GIT_SHA) {
-  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
-  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
-
-  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
-
-  // Remove existing container
-  const existingContainer = (
-    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
-  ).stdout.trim();
-  if (existingContainer) {
-    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
-  }
-
-  await $`docker run --rm \
-    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
-    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
-    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
-    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
-    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
-}
+import { $ } from 'zx';
+
+export async function sonar(GIT_SHA) {
+  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
+
+  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
+
+  // Remove existing container
+  const existingContainer = (
+    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
+  ).stdout.trim();
+  if (existingContainer) {
+    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
+  }
+
+  await $`docker run --rm \
+    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
+    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
+    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
+    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
+    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
+}

package/src/next/vault.js

@@ -1,43 +1,43 @@
-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
-
-  if (!VAULT_ADDR || !VAULT_TOKEN) {
-    throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
-  }
-
-  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';
-    }
-
-    const response = await axios.post(
-      vaultApiUrl,
-      {
-        data: {
-          AUTH0_CLIENT_ID: AUTH0_CLIENT_ID,
-          AUTH0_CLIENT_SECRET: AUTH0_CLIENT_SECRET,
-          SITE_CONFIG_REMOTE_PATH: SITE_CONFIG_REMOTE_PATH,
-        },
-      },
-      {
-        headers: {
-          '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);
-    throw error;
-  }
-}
+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
+
+  if (!VAULT_ADDR || !VAULT_TOKEN) {
+    throw new Error('Missing VAULT_ADDR or VAULT_TOKEN environment variable.');
+  }
+
+  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';
+    }
+
+    const response = await axios.post(
+      vaultApiUrl,
+      {
+        data: {
+          AUTH0_CLIENT_ID: AUTH0_CLIENT_ID,
+          AUTH0_CLIENT_SECRET: AUTH0_CLIENT_SECRET,
+          SITE_CONFIG_REMOTE_PATH: SITE_CONFIG_REMOTE_PATH,
+        },
+      },
+      {
+        headers: {
+          '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);
+    throw error;
+  }
+}

package/terraform/apply.sh

@@ -1,26 +1,37 @@
-#!/usr/bin/env bash
-set -e
-
-PROJECT=$1
-export ROLE_NAME="${2:-atlassian-bitbucket-pipelines-runner-eks-role}"
-
-if [[ -z "$PROJECT" ]]; then
-  echo "Error: Project name is required."
-  echo "Usage: $0 <project-name>"
-  exit 1
-fi
-
-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"
-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')
-export TF_IN_AUTOMATION=1
-
-aws sts get-caller-identity
-
-cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
-
-terraform apply -input=false .tfplan
+#!/usr/bin/env bash
+set -e
+
+PROJECT=$1
+export ROLE_NAME="${2:-atlassian-bitbucket-pipelines-runner-eks-role}"
+
+if [[ -z "$PROJECT" ]]; then
+  echo "Error: Project name is required."
+  echo "Usage: $0 <project-name>"
+  exit 1
+fi
+
+if [ "$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 "Using EKS cluster: $EKS_CLUSTER_NAME"
+
+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')
+export TF_IN_AUTOMATION=1
+
+aws sts get-caller-identity
+
+cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
+
+terraform apply -input=false .tfplan

package/terraform/init.sh

@@ -1,61 +1,72 @@
-#!/bin/bash
-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."
-  echo "Usage: $0 <project-name> $1 <environment>"
-  exit 1
-fi
-
-if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
-  echo "Error: ENVIRONMENT is required."
-  echo "Usage: $0 <project-name> $1 <environment>"
-  exit 1
-fi
-
-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"
-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}"
-mkdir -p ~/.ssh
-
-echo "$atlassian_workspace_runner_ssh_key" | base64 -d > ~/.ssh/id_ed25519
-chmod 600 ~/.ssh/id_ed25519
-ssh-keyscan bitbucket.org > ~/.ssh/known_hosts
-
-info () {
-  echo "PROJECT => $PROJECT"
-  echo "CURRENT_ENVIRONMENT => $CURRENT_ENVIRONMENT"
-  echo "SITE_NAME => $SITE_NAME"
-  echo "Using AWS Role: $ROLE_NAME"
-}
-
-if [[ "$PROJECT" == "s3" ]]; 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"
-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"
-else
-  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
-fi
+#!/bin/bash
+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."
+  echo "Usage: $0 <project-name> $1 <environment>"
+  exit 1
+fi
+
+if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
+  echo "Error: ENVIRONMENT is required."
+  echo "Usage: $0 <project-name> $1 <environment>"
+  exit 1
+fi
+
+if [ "$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 "Using EKS cluster: $EKS_CLUSTER_NAME"
+
+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}"
+mkdir -p ~/.ssh
+
+echo "$atlassian_workspace_runner_ssh_key" | base64 -d > ~/.ssh/id_ed25519
+chmod 600 ~/.ssh/id_ed25519
+ssh-keyscan bitbucket.org > ~/.ssh/known_hosts
+
+info () {
+  echo "PROJECT => $PROJECT"
+  echo "CURRENT_ENVIRONMENT => $CURRENT_ENVIRONMENT"
+  echo "SITE_NAME => $SITE_NAME"
+  echo "Using AWS Role: $ROLE_NAME"
+}
+
+if [[ "$PROJECT" == "s3" ]]; 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"
+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"
+else
+  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+fi

package/terraform/plan.sh

@@ -1,63 +1,76 @@
-#!/bin/bash
-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."
-  echo "Usage: $0 <project-name> $1 <environment>"
-  exit 1
-fi
-
-if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
-  echo "Error: ENVIRONMENT is required."
-  echo "Usage: $0 <project-name> $1 <environment>"
-  exit 1
-fi
-
-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"
-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}"
-
-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
-  elif [[ "$CURRENT_ENVIRONMENT" == "qa" ]]; then
-    echo "$qa_build_agent_configuration" | base64 -d > ./env/${CURRENT_ENVIRONMENT}/us-west-2/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" \
-                 -out .tfplan
-elif [[ "$PROJECT" == "s3" ]];then
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/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" \
-          -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}" \
-          -out .tfplan
-else
-  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
-fi
+#!/bin/bash
+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."
+  echo "Usage: $0 <project-name> $1 <environment>"
+  exit 1
+fi
+
+if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
+  echo "Error: ENVIRONMENT is required."
+  echo "Usage: $0 <project-name> $1 <environment>"
+  exit 1
+fi
+
+if [ "$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 "Using EKS cluster: $EKS_CLUSTER_NAME"
+
+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}"
+
+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
+  elif [[ "$CURRENT_ENVIRONMENT" == "qa" ]]; then
+    echo "$qa_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/us-west-2/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" \
+    -out .tfplan
+elif [[ "$PROJECT" == "s3" ]]; then
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/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" \
+    -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}" \
+    -out .tfplan
+else
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
+fi

package/terraform/validate.sh

@@ -1,17 +1,17 @@
-#!/bin/bash
-set -e
-
-PROJECT=$1
-
-if [[ -z "$PROJECT" ]]; then
-  echo "Error: Project name is required."
-  echo "Usage: $0 <project-name>"
-  exit 1
-fi
-
-cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
-
-terraform version
-terraform init -backend=false
-terraform validate
-terraform fmt -check -recursive --diff || exit 0
+#!/bin/bash
+set -e
+
+PROJECT=$1
+
+if [[ -z "$PROJECT" ]]; then
+  echo "Error: Project name is required."
+  echo "Usage: $0 <project-name>"
+  exit 1
+fi
+
+cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
+
+terraform version
+terraform init -backend=false
+terraform validate
+terraform fmt -check -recursive --diff || exit 0