@docupace/pipeline 1.0.24-alpha-3 → 1.0.24

package/src/next/deploy.js

@@ -4,10 +4,9 @@ import yaml from 'js-yaml';
 import { $ } from 'zx';
 import lodash from 'lodash';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
-import { copy } from './copy.js';
+import { copy2 } from './copy.js';
 import axios from 'axios';
-import { runPipeline } from './pipline.js';
-import { deployCore } from './jenkins.js';
+import { deployCore, deployConnect } from './jenkins.js';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -22,6 +21,66 @@ function getRepoLocalPath(env) {
   return { repoPath, repoName };
 }
 
+async function updateAndCommitConnectVersion(
+  toEnv,
+  toSite,
+  getComparedVersion,
+  connectDeployPath,
+) {
+  const filePath = path.join(
+    connectDeployPath,
+    'envs',
+    toEnv,
+    toSite,
+    'dock.sh',
+  );
+
+  try {
+    let content = fs.readFileSync(filePath, 'utf8');
+    content = content.replace(
+      /IMAGE_VERSION=.*/,
+      `IMAGE_VERSION=git-commit-${getComparedVersion}`,
+    );
+    fs.writeFileSync(filePath, content, 'utf8');
+
+    // Git commands to stage, commit and push changes
+    await $`cd ${connectDeployPath} && git config user.email "gitops@docupace.com"`;
+    await $`cd ${connectDeployPath} && git add .`;
+    await $`cd ${connectDeployPath} && git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}"`;
+    await $`cd ${connectDeployPath} && git push`;
+
+    console.log('🧹 Cleaning up...');
+    await $`rm -rf ${connectDeployPath}`;
+    console.log('✅ Cleanup complete.');
+  } catch (error) {
+    console.error('Error updating Connect version:', error);
+    throw error;
+  }
+}
+
+async function compareGetConnectSiteVersions(fromEnv, fromSite, toEnv, toSite) {
+  try {
+    const fromResponse = await axios.get(
+      `https://${fromSite}.${fromEnv}.dpai.tech/connect/loginFooter`,
+    );
+    const toResponse = await axios.get(
+      `https://${toSite}.${toEnv}.dpai.tech/connect/loginFooter`,
+    );
+
+    const fromMatch = fromResponse.data.match(/UI Build: ([a-f0-9]*)/);
+    const toMatch = toResponse.data.match(/UI Build: ([a-f0-9]*)/);
+
+    if (fromMatch && fromMatch[1] && toMatch && toMatch[1]) {
+      if (fromMatch[1] !== toMatch[1]) {
+        return fromMatch[1];
+      }
+    }
+    return false;
+  } catch (error) {
+    console.error('Error fetching Connect versions:', error);
+    throw error;
+  }
+}
 function getRepoLocalPathByRepoSlug(repoSlug) {
   const repoName = `${repoSlug}`;
   const repoPath = path.join(process.cwd(), repoName);
@@ -34,7 +93,7 @@ function cleanUpRepoPath(repoPath) {
     console.log(`${repoPath} directory exists. Removing it...`);
     fs.rmSync(repoPath, {
       recursive: true,
-      force: true
+      force: true,
     });
   }
 }
@@ -53,7 +112,7 @@ export async function cloneRepository(repoSlug) {
   const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
   const repoUrl = getRepUrl(repoName);
 
-  await cleanUpRepoPath(repoPath)
+  await cleanUpRepoPath(repoPath);
 
   console.log(`Cloning repository: ${repoName}`);
   await $`git clone --depth 1 ${repoUrl}`;
@@ -71,6 +130,23 @@ function getConfigPath(application, env, site, name) {
   return { repoPath, deployConfigFilePath };
 }
 
+function getAppTypesFromRepo(env, site) {
+  const { repoPath } = getRepoLocalPath(env);
+  const deployConfigFilePath = path.join(repoPath, `dp/${site}`);
+  const applications = [];
+  if (fs.existsSync(deployConfigFilePath)) {
+    const files = fs.readdirSync(deployConfigFilePath);
+    files.forEach((file) => {
+      if (file.includes('.values.yaml')) {
+        const appName = file.split('.')[0];
+        applications.push(appName);
+      }
+    });
+  }
+
+  return { applications };
+}
+
 export async function readDeployConfig(application, env, site, name) {
   const { deployConfigFilePath } = getConfigPath(application, env, site, name);
 
@@ -266,12 +342,72 @@ async function getCoreBranchName(fromEnv, fromSite) {
   return branchName;
 }
 
+export async function deployApp(
+  application,
+  appDetails,
+  fromEnv,
+  fromSite,
+  toEnv,
+  toSite,
+) {
+  let changesMade = false;
+  console.log(`Processing application: ${application}`);
+
+  // Read the deployment configuration for the source environment and site
+  const { deployConfig: fromDeployConfig } = await readDeployConfig(
+    application,
+    fromEnv,
+    fromSite,
+    'values',
+  );
+
+  if (fromEnv !== toEnv) {
+    await copy2(
+      appDetails.repositoryName,
+      fromEnv,
+      toEnv,
+      fromDeployConfig.image.tag,
+    );
+  }
+
+  // Read the deployment configuration for the target environment and site
+  const {
+    deployConfig: toDeployConfig,
+    deployConfigFilePath: toDeployConfigFilePath,
+  } = await readDeployConfig(application, toEnv, toSite, 'values');
+
+  // Update target configuration using attributes specified in appInfo
+  for (const attribute of appDetails.deployAttributes) {
+    const sourceValue = lodash.get(fromDeployConfig, attribute);
+
+    if (sourceValue !== undefined) {
+      // Update the target configuration with the source value
+      lodash.set(toDeployConfig, attribute, sourceValue);
+      changesMade = true;
+    }
+  }
+
+  const {
+    deployConfig: toDeployAppConfig,
+    deployConfigFilePath: toDeployAppConfigFilePath,
+  } = await readDeployConfig(application, toEnv, toSite, 'app');
+
+  toDeployAppConfig.revision = fromDeployConfig.image.tag;
+
+  // Write updated configuration to the target YAML file
+  writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
+
+  writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+  return changesMade;
+}
+
 export async function deployFromSite(
   fromEnv,
   fromSite,
   toEnv,
   toSite,
   isDeployCore,
+  isDeployConnect,
 ) {
   if (isDeployCore === 'true') {
     const branchName = await getCoreBranchName(fromEnv, fromSite);
@@ -288,6 +424,30 @@ export async function deployFromSite(
     });*/
   }
 
+  if (isDeployConnect === 'true') {
+    const branch = '';
+    const getComparedVersion = await compareGetConnectSiteVersions(
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+    );
+    if (getComparedVersion) {
+      console.log('Version to deploy is: ', getComparedVersion);
+      const connectDeployPath = await cloneRepository('connect-deploy');
+      // update target version set to git-commit-${getCommparedVersion}}
+      await updateAndCommitConnectVersion(
+        toEnv,
+        toSite,
+        getComparedVersion,
+        connectDeployPath,
+      );
+      // save and deploy
+      const runLiquibase = true;
+      await deployConnect(toEnv, toSite, runLiquibase, branch);
+    }
+  }
+
   // Clone repositories for source and target environments
   const fromRepoPath = await cloneEnvRepository(fromEnv);
   const toRepoPath =
@@ -295,52 +455,53 @@ export async function deployFromSite(
 
   // Initialize a flag to track changes
   let changesMade = false;
-
+  const applications = await getAppTypesFromRepo(toEnv, toSite);
+  console.log(applications);
   // Iterate over applications in appInfo
-  for (const [application, appDetails] of Object.entries(appInfo)) {
-    console.log(`Processing application: ${application}`);
 
-    // Read the deployment configuration for the source environment and site
-    const { deployConfig: fromDeployConfig } = await readDeployConfig(
-      application,
-      fromEnv,
+  let appInfoLocal = Object.fromEntries(
+    applications.applications
+      .filter((application) =>
+        Object.prototype.hasOwnProperty.call(appInfo, application),
+      )
+      .map((application) => [application, appInfo[application]]),
+  );
+
+  // let appInfoLocal = {};
+  // for (const application of applications.applications) {
+  //   if (Object.prototype.hasOwnProperty.call(appInfo, application)) {
+  //     appInfoLocal[application] = appInfo[application];
+  //   }
+  // }
+
+  if (Object.keys(appInfoLocal).length === 0) {
+    const { deployConfig: toDeployAppConfig } = await readDeployConfig(
       fromSite,
-      'values',
+      toEnv,
+      toSite,
+      'app',
     );
 
-    if (fromEnv !== toEnv) {
-      await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
-    }
-
-    // Read the deployment configuration for the target environment and site
-    const {
-      deployConfig: toDeployConfig,
-      deployConfigFilePath: toDeployConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'values');
+    appInfoLocal[fromSite] = {
+      repositoryName: toDeployAppConfig.repo,
+      deployAttributes: ['image.tag'],
+    };
+  }
 
-    // Update target configuration using attributes specified in appInfo
-    for (const attribute of appDetails.deployAttributes) {
-      const sourceValue = lodash.get(fromDeployConfig, attribute);
+  console.log('appinfoLocal', appInfoLocal);
 
-      if (sourceValue !== undefined) {
-        // Update the target configuration with the source value
-        lodash.set(toDeployConfig, attribute, sourceValue);
-        changesMade = true;
-      }
+  for (const [application, appDetails] of Object.entries(appInfoLocal)) {
+    let cm = await deployApp(
+      application,
+      appDetails,
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+    );
+    if (cm) {
+      changesMade = true;
     }
-
-    const {
-      deployConfig: toDeployAppConfig,
-      deployConfigFilePath: toDeployAppConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'app');
-
-    toDeployAppConfig.revision = fromDeployConfig.image.tag;
-
-    // Write updated configuration to the target YAML file
-    writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
-
-    writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
-
   }
 
   // Push all changes if any updates were made

package/src/next/jenkins.js

@@ -26,6 +26,7 @@ export async function deployCore(env, site, liquibase, gitBranch) {
   });
 }
 
+// eslint-disable-next-line no-unused-vars
 export async function deployConnect(env, site, liquibase, branch) {
   const parameters = {
     BUILD_ENVIRONMENT: env,

package/src/next/pipline.js

@@ -99,7 +99,6 @@ export async function runPipeline(
       return;
     }
 
-
     let status = '';
     do {
       console.log('Checking pipeline status...');

package/src/next/publish.js

@@ -1,48 +1,48 @@
-import { $ } from 'zx';
-
-export async function publish(GIT_SHA) {
-  const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
-  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
-  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
-  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
-
-  console.log(`Publishing Docker image: ${IMAGE_NAME}`);
-
-  // Docker login
-  await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
-
-  // Check if the image already exists
-  try {
-    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    console.log(
-      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
-    );
-  } catch {
-    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-  }
-
-  // Tag and push build image
-  await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-  await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-
-  // Fetch Git tags pointing to the current HEAD
-  const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
-  const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
-
-  // Tag and push each Git tag as a Docker tag
-  if (gitTags.length > 0) {
-    console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
-    for (const gitTag of gitTags) {
-      const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
-      console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
-      await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
-      await $`docker push ${dockerTag}`;
-    }
-  } else {
-    console.log('No Git tags found pointing to the current HEAD.');
-  }
-
-  // Docker logout
-  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
-}
+import { $ } from 'zx';
+
+export async function publish(GIT_SHA) {
+  const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
+  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+
+  console.log(`Publishing Docker image: ${IMAGE_NAME}`);
+
+  // Docker login
+  await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
+
+  // Check if the image already exists
+  try {
+    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+    console.log(
+      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
+    );
+  } catch {
+    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+    await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+  }
+
+  // Tag and push build image
+  await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+  await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+
+  // Fetch Git tags pointing to the current HEAD
+  const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
+  const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
+
+  // Tag and push each Git tag as a Docker tag
+  if (gitTags.length > 0) {
+    console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
+    for (const gitTag of gitTags) {
+      const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
+      console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
+      await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
+      await $`docker push ${dockerTag}`;
+    }
+  } else {
+    console.log('No Git tags found pointing to the current HEAD.');
+  }
+
+  // Docker logout
+  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
+}

package/src/next/pull.js

@@ -1,7 +1,7 @@
-import { $ } from 'zx';
-
-export async function pull(imageName) {
-  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
-  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
-  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
-}
+import { $ } from 'zx';
+
+export async function pull(imageName) {
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
+  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
+}

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,26 @@
-#!/usr/bin/env bash
-set -e
-
-PROJECT=$1
-
-if [[ -z "$PROJECT" ]]; then
-  echo "Error: Project name is required."
-  echo "Usage: $0 <project-name>"
-  exit 1
-fi
-
-export ROLE_NAME="atlassian-bitbucket-pipelines-runner-eks-role"
-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
+
+if [[ -z "$PROJECT" ]]; then
+  echo "Error: Project name is required."
+  echo "Usage: $0 <project-name>"
+  exit 1
+fi
+
+export ROLE_NAME="atlassian-bitbucket-pipelines-runner-eks-role"
+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