From 4ea8c95d9a74e48d6fd44de92ef96389e53db66a Mon Sep 17 00:00:00 2001
From: Goutham Pratapa <goutham@appsmith.com>
Date: Thu, 3 Aug 2023 20:57:47 +0530
Subject: [PATCH] fix: dp deployments (#25992)

---
 scripts/cleanup_dp.sh     | 2 +-
 scripts/deploy_preview.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/cleanup_dp.sh b/scripts/cleanup_dp.sh
index 3d0ef5e79c..6c33093fa0 100755
--- a/scripts/cleanup_dp.sh
+++ b/scripts/cleanup_dp.sh
@@ -40,7 +40,7 @@ for i in $deployed_charts
       helm uninstall $i -n $i
       kubectl delete ns $i || true
       mongosh "mongodb+srv://$DB_USERNAME:$DB_PASSWORD@$DB_URL/$i?retryWrites=true&minPoolSize=1&maxPoolSize=10&maxIdleTimeMS=900000&authSource=admin" --eval 'db.dropDatabase()'
-      ACCESS_POINT_ID=$(aws efs describe-access-points --file-system-id "$APPSMITH_DP_EFS_ID" | jq -r '.AccessPoints[] | select(.Name=="'"ce$pr"'") | .AccessPointId')
+      ACCESS_POINT_ID=$(aws efs describe-access-points --file-system-id "$DP_EFS_ID" | jq -r '.AccessPoints[] | select(.Name=="'"ce$pr"'") | .AccessPointId')
       aws efs delete-access-point --access-point-id $ACCESS_POINT_ID
     fi
   done
diff --git a/scripts/deploy_preview.sh b/scripts/deploy_preview.sh
index c99e0b132f..169442374a 100755
--- a/scripts/deploy_preview.sh
+++ b/scripts/deploy_preview.sh
@@ -22,6 +22,7 @@ export cluster_name=uat-cluster
 echo "Region: $region"
 echo "Cluster name: $cluster_name"
 echo "Pull Request Number: $PULL_REQUEST_NUMBER"
+echo "DP_EFS_ID: $DP_EFS_ID"
 
 sts_output=$(aws sts assume-role --role-arn env.AWS_ROLE_ARN --role-session-name ekscisession)
 export AWS_ACCESS_KEY_ID=$(echo $sts_output | jq -r '.Credentials''.AccessKeyId');\
@@ -33,14 +34,14 @@ if [[ -n "${RECREATE-}" ]]
 then
   kubectl delete ns $NAMESPACE || true
   mongosh "mongodb+srv://$DB_USERNAME:$DB_PASSWORD@$DB_URL/$DBNAME?retryWrites=true&minPoolSize=1&maxPoolSize=10&maxIdleTimeMS=900000&authSource=admin" --eval 'db.dropDatabase()'
-  ACCESS_POINT_ID=$(aws efs describe-access-points --file-system-id "$APPSMITH_DP_EFS_ID" | jq -r '.AccessPoints[] | select(.Name=="'"ce$PULL_REQUEST_NUMBER"'") | .AccessPointId')
+  ACCESS_POINT_ID=$(aws efs describe-access-points --file-system-id "$DP_EFS_ID" | jq -r '.AccessPoints[] | select(.Name=="'"ce$PULL_REQUEST_NUMBER"'") | .AccessPointId')
   aws efs delete-access-point --access-point-id $ACCESS_POINT_ID
 fi
 
 echo "Create Access Point and Access Point ID"
 ## Use DP-EFS and create ACCESS_POINT
-ACCESS_POINT=$(aws efs create-access-point --file-system-id $APPSMITH_DP_EFS_ID --tags Key=Name,Value=ce$PULL_REQUEST_NUMBER)
-export ACCESS_POINT_ID=$(echo $ACCESS_POINT | jq -r '.AccessPointId');
+ACCESS_POINT=$(aws efs create-access-point --file-system-id $DP_EFS_ID --tags Key=Name,Value=ce$PULL_REQUEST_NUMBER)
+ACCESS_POINT_ID=$(echo $ACCESS_POINT | jq -r '.AccessPointId');
 
 export NAMESPACE=ce"$PULL_REQUEST_NUMBER"
 export CHARTNAME=ce"$PULL_REQUEST_NUMBER"