@docupace/pipeline 1.0.4-2.apache.3 → 1.0.4-4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.42.apache.3",
+  "version": "1.0.44.2",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/configure.js

@@ -146,7 +146,7 @@ uiMain:
         : ''
     }
 image:
-  repository: registry.paperout.com/docupace-ui-main-dev-docker-local/docupace-ui-main
+  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/docupace-ui-main
   tag: ${imageTag}
 ${
   useS3 === true || useS3 === 'true'
@@ -337,7 +337,7 @@ uiMain:
     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
+  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/cc-ui-app
   tag: ${imageTag}
 imagePullSecrets:
   - name: jf-artifactory
@@ -554,7 +554,7 @@ graphqlServer:
     AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
     AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET
 image:
-  repository: registry.paperout.com/docupace-graphql-server-dev-docker-local/docupace-graphql-server
+  repository: registry.paperout.com/docupace-graphql-server-${env}-docker-local/docupace-graphql-server
   tag: ${imageTag}
 imagePullSecrets:
   - name: jf-artifactory

package/src/next/connect.js

@@ -15,9 +15,42 @@ const vaultAddr = process.env.VAULT_ADDR;
 const connectUIEnvMap = {
   dev: 'dev',
   qa: 'preprod',
-  stg: 'stg',
+  stage: 'stg',
   uat: 'uat',
-  prd: 'prod-las',
+  prod: 'prod-www3',
+};
+
+
+const siteSettingsEnvMap = {
+  dev: 'dev',
+  preprod: 'preprod',
+  qa: 'preprod',
+  stage: 'staging',
+  stg: 'staging',
+  uat: 'uat',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
+};
+
+const idpEnvMap = {
+  dev: 'dev',
+  preprod: 'qa',
+  qa: 'qa',
+  stage: 'stage',
+  stg: 'stage',
+  uat: 'uat',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
 };
 
 function log(msg) {
@@ -47,8 +80,10 @@ async function gitCheckout(repository, destDir, branch = 'master') {
 }
 
 export async function connectClone() {
-  const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
-  const connectToEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+  // const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
+  const connectFromEnv = process.env.FROM_BUILD_ENVIRONMENT;
+  const connectToEnv = process.env.BUILD_ENVIRONMENT;
+
   if (!vaultToken || !vaultAddr) {
     console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
     throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
@@ -81,7 +116,7 @@ export async function connectClone() {
   log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
   log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
 
-  process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
+  process.env.AUTH0_DOMAIN = `docupace-${idpEnvMap[process.env.BUILD_ENVIRONMENT]}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
 
   const projectRoot = process.cwd();
   // 4) Clone 'connect-deploy' into CONNECT_DIR
@@ -89,8 +124,8 @@ export async function connectClone() {
   await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
 
   await gitCheckout(
-    `${connectToEnv}-site-settings`,
-    `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`,
+    `${siteSettingsEnvMap[connectToEnv]}-site-settings`,
+    `${process.env.CONNECT_DIR}/${siteSettingsEnvMap[connectToEnv]}-site-settings`,
   );
 
   // 5) Create site clone (emulating the dock.sh call)

package/terraform/apply.sh

@@ -10,8 +10,19 @@ if [[ -z "$PROJECT" ]]; then
   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 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')

package/terraform/init.sh

@@ -17,8 +17,19 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   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 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')

package/terraform/plan.sh

@@ -17,8 +17,19 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
   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 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')
@@ -31,33 +42,35 @@ 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}/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
+    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
+    -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
+    -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
+    -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