@docupace/pipeline 1.0.78 → 1.0.80

package/package.json

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

package/src/next/deploy.js

@@ -1,14 +1,14 @@
+import axios from 'axios';
 import fs from 'fs';
-import path from 'path';
 import yaml from 'js-yaml';
-import { $ } from 'zx';
 import lodash from 'lodash';
+import path from 'path';
+import semver from 'semver';
+import { $ } from 'zx';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
 import { copy2 } from './copy.js';
-import axios from 'axios';
-import { deployConnect, deployCore } from './jenkins.js';
 import { gitDescribeToSemver } from './git-to-semver.js';
-import semver from 'semver';
+import { deployConnect, deployCore } from './jenkins.js';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -367,6 +367,35 @@ export async function deployAppWithTag(application, env, site, deployTag) {
   console.log(`Using deployment tag: ${deployTag}`);
   const appDetails = appInfo[application];
 
+  const repoPath = await cloneEnvRepository(env);
+  const { deployConfigFilePath: valuesFilePath } = getConfigPath(
+    application,
+    env,
+    site,
+    'values',
+  );
+  const { deployConfigFilePath: appFilePath } = getConfigPath(
+    application,
+    env,
+    site,
+    'app',
+  );
+
+  if (!fs.existsSync(valuesFilePath) || !fs.existsSync(appFilePath)) {
+    const missingFiles = [];
+    if (!fs.existsSync(valuesFilePath))
+      missingFiles.push(`${application}.values.yaml`);
+    if (!fs.existsSync(appFilePath))
+      missingFiles.push(`${application}.app.yaml`);
+    console.log(
+      `⚠️  Skipping deployment to ${site}: config file(s) missing: ${missingFiles.join(', ')}`,
+    );
+    console.log(
+      `   This site may not be configured for ${application} application`,
+    );
+    return;
+  }
+
   if (env !== 'dev') {
     await copy2(
       appDetails.repositoryName,
@@ -377,8 +406,12 @@ export async function deployAppWithTag(application, env, site, deployTag) {
     );
   }
 
-  const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig(application, env, site);
+  const { deployConfig, deployConfigFilePath } = await readDeployConfig(
+    application,
+    env,
+    site,
+    'values',
+  );
   const updatedConfigData = setTag(deployConfig, deployTag);
 
   const {

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