@docupace/pipeline 1.0.39-newrelease.11 → 1.0.39-newrelease.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-newrelease.11",
+  "version": "1.0.39-newrelease.13",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/cli.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
   .command(
-    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3>',
+    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3> <deployCCUI>',
   )
   .description('Configure the Auth0 tenants in env for the given site')
   .action(
@@ -28,6 +28,7 @@ program
       deployGraphQLServer,
       useNewDomain,
       useS3,
+      deployCCUI,
     ) => {
       await configureFromSite(
         fromSite,
@@ -38,6 +39,7 @@ program
         deployGraphQLServer,
         useNewDomain,
         useS3 === 'true' || useS3 === true,
+        deployCCUI,
       );
     },
   );

package/src/auth0/configure.js

@@ -57,6 +57,7 @@ export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
 async function configureUI(
   siteHost,
   coreURL,
+  connectURL,
   docupaceHost,
   site,
   env,
@@ -74,6 +75,7 @@ async function configureUI(
   );
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
+  connectURL = connectURL.replace('https://', '');
 
   try {
     const auth0Response = await axios.get(
@@ -129,7 +131,7 @@ uiMain:
   auth0ClientId: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_ID
   graphqlClientUrl: https://${siteHost}/api/graphql
   graphqlServerUrl: https://${siteHost}/api/graphql
-  connectUrl: https://${siteHost}
+  connectUrl: https://${connectURL}
   coreUrl: https://${coreURL}
   env:
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_SECRET
@@ -244,6 +246,167 @@ externalConnectService:
   }
 }
 
+async function configureCCUI(
+  siteHost,
+  coreURL,
+  connectURL,
+  docupaceHost,
+  site,
+  env,
+  auth0Domain,
+  auth0ClientId,
+  auth0ClientSecret,
+  auth0Token,
+  vaultSiteSecretsPath,
+  imageTag,
+  repoPath,
+  useS3,
+  ccUrl,
+) {
+  console.log(
+    `Configuring CC UI for site: ${site} Host: ${siteHost} in env: ${env}`,
+  );
+  siteHost = siteHost.replace('https://', '');
+  coreURL = coreURL.replace('https://', '');
+  connectURL = connectURL.replace('https://', '');
+  ccUrl = ccUrl.replace('https://', '');
+
+  try {
+    const auth0Response = await axios.get(
+      `https://${auth0Domain}/api/v2/clients`,
+      {
+        headers: { authorization: `Bearer ${auth0Token}` },
+      },
+    );
+
+    const uiClient = auth0Response.data.find(
+      (client) => client.name === 'docupace-ui-cc',
+    );
+    const uiAuth0ClientId = uiClient.client_id;
+    const uiAuth0ClientSecret = uiClient.client_secret;
+
+    // Generate Auth0 Secret
+    const uiAuth0Secret = crypto
+      .randomBytes(48)
+      .toString('base64')
+      .replace(/[^a-zA-Z0-9]/g, '');
+
+    // Prepare data payload
+    console.log('Preparing Vault CC UI data payload...');
+    const ccUISecretData = JSON.stringify({
+      data: {
+        AUTH0_CLIENT_ID: uiAuth0ClientId,
+        AUTH0_CLIENT_SECRET: uiAuth0ClientSecret,
+        AUTH0_SECRET: uiAuth0Secret,
+      },
+    });
+    console.log('Updating Vault Site Secret =>', vaultSiteSecretsPath);
+    await updateVaultSecrets(vaultSiteSecretsPath, ccUISecretData);
+
+    let siteAWSSecrets = null;
+
+    if (useS3 === true || useS3 === 'true') {
+      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
+      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
+      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
+    }
+
+    // Prepare cc.app.yaml
+    const uiССAppYaml = `
+repo: docupace-ui-main
+revision: master
+`.trim();
+    // Prepare cc.values.yaml
+    const uiССValuesYaml = `
+uiMain:
+  auth0BaseUrl: https://${ccUrl}
+  auth0IssuerBaseUrl: https://${auth0Domain}
+  auth0ClientId: vault:secret/data/${site}/ui-cc/config#AUTH0_CLIENT_ID
+  graphqlClientUrl: https://${siteHost}/api/graphql
+  graphqlServerUrl: https://${siteHost}/api/graphql
+  connectUrl: https://${connectURL}
+  coreUrl: https://${coreURL}
+  env:
+    AUTH0_AUDIENCE: core-api-access
+    AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_CLIENT_SECRET
+    AUTH0_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_SECRET
+    ${
+      useS3 === true || useS3 === 'true'
+        ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+image:
+  repository: registry.paperout.com/docupace-ui-main-dev-docker-local/cc-ui-app
+  tag: ${imageTag}
+imagePullSecrets:
+  - name: jf-artifactory
+ingress:
+  enabled: true
+  className: nginx
+  annotations:
+    external-dns.alpha.kubernetes.io/hostname: ${ccUrl}
+    external-dns.alpha.kubernetes.io/zone: public
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+  hosts:
+    - host: ${ccUrl}
+      paths:
+        - path: /
+          pathType: Prefix
+  tls:
+    - hosts:
+        - ${ccUrl}
+      secretName: dp-cc-ui-cert
+    `.trim()
+        : ''
+    }
+${
+  useS3 === true || useS3 === 'true'
+    ? `
+serviceAccount:
+  create: true
+  annotations:
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket
+`.trim()
+    : ''
+}
+`.trim();
+
+    console.log('Writing configuration files...');
+    await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
+
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/cc.app.yaml`,
+      uiССAppYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
+
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/cc.values.yaml`,
+      uiССValuesYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
+    console.log('Done!');
+    console.log('Updating Core Site Config...');
+    await updateCoreSiteConfig(site, env, useS3);
+  } catch (error) {
+    console.error('Error configuring UI:', error);
+  }
+}
+
 export async function cleanAndWritePropertiesFile(configPath, content) {
   try {
     const cleanedContent = content
@@ -456,6 +619,7 @@ export async function configureFromSite(
   deployGraphQLServer,
   useNewDomain,
   useS3,
+  deployCCUI,
 ) {
   console.log(
     `Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`,
@@ -480,10 +644,14 @@ export async function configureFromSite(
     auth0ClientSecret,
   );
 
-  // UI app
+  // UI MAIN app
   const uiSecretsPath = getVaultSecretsConfigs(toSite).uiSecretsPath;
   console.log(`uiSecretsPath => ${uiSecretsPath}`);
 
+  // UI CC app
+  const ccUISecretsPath = getVaultSecretsConfigs(toSite).ccUISecretsPath;
+  console.log(`ccUISecretsPath => ${ccUISecretsPath}`);
+
   // GraphQL-Server app
   const graphqlSecretsPath =
     getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
@@ -533,17 +701,22 @@ export async function configureFromSite(
   const envConfig = environmentConfig[toEnv];
 
   let CORE_URL, SITE_HOST, CORE_API_CONTEXT, CONNECT_URL, DOCUPACE_HOST;
-  if (useNewDomain) {
+  const newUrl = envConfig.newUrl(toSite);
+  const ccUrl = envConfig.ccUrl(toSite);
+
+  SITE_HOST = `${newUrl}`;
+
+  if (useNewDomain === true || useNewDomain === 'true') {
     const newUrl = envConfig.newUrl(toSite);
     CORE_URL = `${newUrl}/core`;
-    SITE_HOST = newUrl;
+    // SITE_HOST = newUrl;
     CORE_API_CONTEXT = 'core';
     CONNECT_URL = `${newUrl}/connect`;
     DOCUPACE_HOST = envConfig.docupaceHost();
   } else {
     const oldUrl = envConfig.oldUrl(toSite);
     CORE_URL = oldUrl;
-    SITE_HOST = oldUrl;
+    // SITE_HOST = oldUrl;
     CORE_API_CONTEXT = toSite;
     CONNECT_URL = `${oldUrl}_ui`;
   }
@@ -552,6 +725,7 @@ export async function configureFromSite(
     await configureUI(
       SITE_HOST,
       CORE_URL,
+      CONNECT_URL,
       DOCUPACE_HOST,
       toSite,
       toEnv,
@@ -566,6 +740,26 @@ export async function configureFromSite(
     );
   }
 
+  if (deployCCUI === true || deployCCUI === 'true') {
+    await configureCCUI(
+      SITE_HOST,
+      CORE_URL,
+      CONNECT_URL,
+      DOCUPACE_HOST,
+      toSite,
+      toEnv,
+      auth0Domain,
+      auth0ClientId,
+      auth0ClientSecret,
+      auth0Token,
+      ccUISecretsPath,
+      uiImageTag,
+      repoPathToEnv,
+      useS3,
+      ccUrl,
+    );
+  }
+
   await configureGraphQLServer(
     SITE_HOST,
     CORE_URL,

package/src/changeset/canny.js

@@ -25,6 +25,7 @@ export async function uploadToCanny(releaseNote, labelIDs) {
       releaseNote.userFacingDescription &&
       releaseNote.userFacingDescription.__line.trim()
     ) {
+      content += `${releaseNote.summary}\n\n`;
       content += `${releaseNote.userFacingDescription.__line}\n\n`;
     } else {
       content += `${releaseNote.summary}\n\n`;

package/src/changeset/changelog.js

@@ -89,8 +89,8 @@ async function fetchNewLink(oldLink, params) {
     } else {
       const changes = getChanges(params);
       const labels = getLabels(changes);
-      const labelIDs = getLabelIDs(labels);
       const jiraVersions = getJiraVersions(changes);
+      const labelIDs = getLabelIDs([...labels, ...jiraVersions]);
       const data = await uploadToCanny(releaseNote, labelIDs);
       await updateJiraReleaseNotes(
         releaseNote.ticketId,

package/src/changeset/config.js

@@ -1,11 +1,17 @@
 export const componentConfig = {
-  '@docupace/enterprise-ui-app': 'Enterprise',
-  '@docupace/cc-ui-app': 'C & C',
+  '@docupace/enterprise-ui-app': 'Enterprise Application',
+  '@docupace/cc-ui-app': 'C & C Application',
   '@docupace/core': 'Enterprise Core',
-  '@docupace/graphql-server': 'Enterprise',
+  '@docupace/graphql-server': 'GraphQL Server',
+  '@docupace/enterprise-template': 'Enterprise Configuration',
+  '@docupace/cc-template': 'CC Configuration',
 };
 
 export const labelIDMap = {
   Enterprise: '6836d53ad8622b2abab1fbd9',
   'Enterprise Core': '6836d532716bbe32f53661fb',
+  'Enterprise Core - 25.0': '68400cea3c20ce44785cca3e',
+  'Enterprise Core - 25.1': '68401502fa2d977cfcd6e102',
+  'Enterprise Core - 25.2': '6840151b0915e310b1766005',
+  'Enterprise Core - 25.3': '684018c7f11b9e5d5d24936f',
 };

package/src/changeset/create.js

@@ -60,10 +60,9 @@ async function writeChangesetFile(
     .map((pkg) => `'${pkg.name}': ${changeType}`)
     .join('\n');
 
-  const relYamlFilePath = path.relative(
-    path.resolve(process.cwd(), '.changeset'),
-    yamlFilePath,
-  );
+  const relYamlFilePath = path
+    .relative(path.resolve(process.cwd(), '.changeset'), yamlFilePath)
+    .replaceAll('\\', '/');
 
   const changesetContent = `---
 ${packageEntries}

package/src/changeset/version.js

@@ -17,7 +17,7 @@ const changeSetPackage = `{
   "dependencies": {},
   "devDependencies": {
     "@changesets/cli": "^2.27.10",
-    "@docupace/pipeline": "1.0.39-newrelease.11"
+    "@docupace/pipeline": "1.0.39-newrelease.13"
   }
 }
 `;

package/src/next/cli.js

@@ -11,7 +11,7 @@ import {
   getDefaultDeploySite,
   getDeployTag,
 } from './deploy.js';
-import { copy } from './copy.js';
+import { copy, copy2 } from './copy.js';
 import { vaultAddSiteData } from './vault.js';
 import { addApacheSite } from './apache.js';
 import { haproxySync } from './haproxy.js';
@@ -176,13 +176,14 @@ program
 program
   .command('copy')
   .description('Copy a Docker image between registries')
-  .requiredOption('-a, --application <application>', 'Application name')
+  .requiredOption('-r, --repository <repository>', 'Repostory name')
   .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
   .requiredOption('-t, --to-env <toEnv>', 'Target environment')
   .requiredOption('-g, --tag <tag>', 'Image tag')
+  .requiredOption('-a, --application <application>', 'Application name')
   .action(async (options) => {
-    const { application, fromEnv, toEnv, tag } = options;
-    await copy(application, fromEnv, toEnv, tag);
+    const { repository, fromEnv, toEnv, tag, application } = options;
+    await copy2(repository, fromEnv, toEnv, tag, application);
   });
 
 program

package/src/next/config.js

@@ -9,41 +9,66 @@ export const environmentConfig = {
     newUrl: (site) => `https://${site}.dev.dpai.tech`,
     oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
     docupaceHost: () => 'www.dev.docupaceinc.com',
+    ccUrl: (site) => `https://${site}-cc.dev.dpai.tech`,
   },
   qa: {
     newUrl: (site) => `https://${site}.qa.dpai.tech`,
     oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
     docupaceHost: () => 'www.preprod.docupaceinc.com',
+    ccUrl: (site) => `https://${site}-cc.qa.dpai.tech`,
   },
   uat: {
-    newUrl: (site) => `https://${site}.qa.dpai.tech`,
+    newUrl: (site) => `https://${site}.uat.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
     docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
   },
   stage: {
-    newUrl: (site) => `https://${site}.stage.dpai.tech`,
+    newUrl: (site) => `https://${site}.stg.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
     docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.stg.dpai.tech`,
   },
   prod: {
     newUrl: (site) => `https://${site}.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}`,
     docupaceHost: () => 'www2.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.dpai.tech`,
   },
 };
 
 export const appInfo = {
   'graphql-server': {
     repositoryName: 'docupace-graphql-server',
+    imageName: 'docupace-graphql-server',
     deployAttributes: [
       'image.tag',
       'graphqlServer.siteConfigRemoteBranch',
       'graphqlServer.standardConfigRemoteBranch',
     ],
   },
+  cc: {
+    repositoryName: 'docupace-ui-main',
+    imageName: 'cc-ui-app',
+    deployAttributes: ['image.tag'],
+    getAppRevision: (config) => {
+      const version = config.image.tag.slice(1);
+      return 'cc-ui-app@' + version;
+    },
+  },
   ui: {
     repositoryName: 'docupace-ui-main',
+    imageName: 'enterprise-ui-app',
     deployAttributes: ['image.tag'],
+    getAppRevision: (config) => {
+      const tag = config.image.tag;
+      const version = tag.startsWith('v') ? tag.slice(1) : tag;
+      if (semver.gt(version, UI_MONO_VERSION)) {
+        return 'enterprise-ui-app@' + version;
+      } else {
+        return tag;
+      }
+    },
     updateConfigFunction: (config) => {
       if (config.image.repository.endsWith('/docupace-ui-main')) {
         const tag = config.image.tag;
@@ -96,6 +121,7 @@ export const getVaultSecretsConfigs = (site) => {
     siteCommonSecretsPath: `secret/data/${site}/common/config`,
     graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
     uiSecretsPath: `secret/data/${site}/ui/config`,
+    ccUISecretsPath: `secret/data/${site}/ui-cc/config`,
     awsSecretsPath: `secret/data/${site}/aws/config`,
   };
 };

package/src/next/copy.js

@@ -11,7 +11,7 @@ export async function copy(application, fromEnv, toEnv, tag) {
   const repositoryName = appInfo[application].repositoryName;
   const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
   const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
+  const imageName = `${appInfo[application].imageName}:${tag}`;
   const fromFullImageName = `${fromRegistry}/${imageName}`;
   const toFullImageName = `${toRegistry}/${imageName}`;
 
@@ -29,14 +29,20 @@ export async function copy(application, fromEnv, toEnv, tag) {
   await $`docker push ${toFullImageName}`;
 }
 
-export async function copy2(repositoryName, fromEnv, toEnv, tag) {
+export async function copy2(
+  repositoryName,
+  fromEnv,
+  toEnv,
+  tag,
+  applicationName,
+) {
   console.log(
     `Copying repository ${repositoryName} from ${fromEnv} to ${toEnv} for tag ${tag}`,
   );
   const envInfo = getEnvInfo();
   const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
   const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
+  const imageName = `${applicationName ?? repositoryName}:${tag}`;
   const fromFullImageName = `${fromRegistry}/${imageName}`;
   const toFullImageName = `${toRegistry}/${imageName}`;
 

package/src/next/deploy.js

@@ -303,7 +303,13 @@ export async function deployAppWithTag(application, env, site, deployTag) {
 
   if (env !== 'dev') {
     const appDetails = appInfo[application];
-    await copy2(appDetails.repositoryName, 'dev', env, deployTag);
+    await copy2(
+      appDetails.repositoryName,
+      'dev',
+      env,
+      deployTag,
+      appDetails.imageName,
+    );
   }
 
   const { repoPath, deployConfigFilePath, deployConfig } =
@@ -390,6 +396,7 @@ export async function deployApp(
       fromEnv,
       toEnv,
       fromDeployConfig.image.tag,
+      appDetails.imageName,
     );
   }
 
@@ -419,7 +426,9 @@ export async function deployApp(
     deployConfigFilePath: toDeployAppConfigFilePath,
   } = await readDeployConfig(application, toEnv, toSite, 'app');
 
-  toDeployAppConfig.revision = fromDeployConfig.image.tag;
+  toDeployAppConfig.revision = appDetails.getAppRevision
+    ? appDetails.getAppRevision(fromDeployConfig)
+    : fromDeployConfig.image.tag;
 
   // Write updated configuration to the target YAML file
   writeDeployConfig(toDeployConfigFilePath, toDeployConfig);

package/src/next/haproxy.js

@@ -1,10 +1,22 @@
 import { $ } from 'zx';
+import fs from 'fs-extra';
+import path from 'path';
+
+export async function haproxySync(cluster) {
+  if (cluster !== 'preprod' && cluster !== 'stage') {
+    console.log('Error: Cluster must be preprod or stage');
+    process.exit(1);
+  }
 
-export async function haproxySync() {
   const repoPath = '/root/repo/docupace-ansible';
-  const inventory = path.join(repoPath, 'inventories/preprod/inventory');
+  const inventory = path.join(repoPath, `inventories/${cluster}/inventory`);
 
   // Create haproxy.sh
+  const cluserHostMap = {
+    preprod: '10.10.28.198',
+    stage: '10.12.28.10',
+  };
+
   const scriptContent = `
   #!/bin/bash
   
@@ -18,11 +30,11 @@ export async function haproxySync() {
   git submodule foreach --recursive git checkout master
   git submodule foreach --recursive git pull origin master
   
-  ansible-playbook -i inventories/preprod/inventory haproxy.yml -e "cluster=preprod"
+  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}"
   
   echo "proceeding"
   echo "committing changes"
-  git add preprod-haproxy.cfg
+  git add ${cluster}-haproxy.cfg
   git commit -m "Sync haproxy"
   git push origin master
   `;
@@ -32,18 +44,16 @@ export async function haproxySync() {
   // Private key
   const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
   if (!haproxyPrivateKey) {
-    log('Error: HAPROXY_PRIVATE_KEY not set.');
+    console.log('Error: HAPROXY_PRIVATE_KEY not set.');
     process.exit(1);
   }
 
   await fs.writeFile('private.key', Buffer.from(haproxyPrivateKey, 'base64'));
   await fs.chmod('private.key', 0o600);
 
-  await $`cat private.key`; // Just to mimic the script's behavior
-
   // Copy script to remote
-  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@10.10.28.198:/tmp/haproxy.sh`;
+  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster]}:/tmp/haproxy.sh`;
 
   // Execute script on remote
-  await $`ssh -i private.key -o StrictHostKeyChecking=no root@10.10.28.198 "bash /tmp/haproxy.sh"`;
+  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster]} "bash /tmp/haproxy.sh"`;
 }

package/terraform/apply.sh

@@ -2,6 +2,7 @@
 set -e
 
 PROJECT=$1
+export ROLE_NAME="${2:-atlassian-bitbucket-pipelines-runner-eks-role}"
 
 if [[ -z "$PROJECT" ]]; then
   echo "Error: Project name is required."
@@ -9,7 +10,6 @@ if [[ -z "$PROJECT" ]]; then
   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"

package/terraform/init.sh

@@ -3,6 +3,7 @@ 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."
@@ -16,7 +17,6 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   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"
@@ -37,6 +37,7 @@ info () {
   echo "PROJECT => $PROJECT"
   echo "CURRENT_ENVIRONMENT => $CURRENT_ENVIRONMENT"
   echo "SITE_NAME => $SITE_NAME"
+  echo "Using AWS Role: $ROLE_NAME"
 }
 
 if [[ "$PROJECT" == "s3" ]]; then

package/terraform/plan.sh

@@ -3,6 +3,7 @@ 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."
@@ -16,7 +17,6 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   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"
@@ -53,8 +53,10 @@ elif [[ "$PROJECT" == "idp" ]];then
           -var="old_page_design=${USE_OLD_PAGE_DESIGN}" \
           -var="use_new_domain=${USE_NEW_DOMAIN}" \
           -var="configure_autologin=${CONFIGURE_AUTOLOGIN}" \
-          -var="configure_ui_main=${CONFIGURE_UI_MAIN}" \
+          -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