SBT v5.0 applied and source S3 bucket name fixed

Author: Hoseong-Seo

scripts/cleanup.sh

@@ -21,6 +21,7 @@ if ! confirm; then
 fi
 
 export REGION=$(aws ec2 describe-availability-zones --output text --query 'AvailabilityZones[0].[RegionName]')
+export ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 
 echo "$(date) emptying out buckets..."
 for i in $(aws s3 ls | awk '{print $3}' | grep -E "^tenant-update-stack-*|^controlplane-stack-*|^core-appplane-*|^saas-reference-architecture-*"); do
@@ -38,7 +39,7 @@ cd ../server
 npm install
 
 export CDK_PARAM_SYSTEM_ADMIN_EMAIL="NA"
-export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$REGION"
+export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$ACCOUNT_ID-$REGION"
 export CDK_PARAM_COMMIT_ID="NA"
 export CDK_PARAM_REG_API_GATEWAY_URL="NA"
 export CDK_PARAM_EVENT_BUS_ARN=arn:aws:service:::resource
@@ -60,7 +61,7 @@ versions=$(aws s3api list-object-versions --bucket $CDK_PARAM_S3_BUCKET_NAME --o
 if [ "$versions" -gt 0 ]; then 
 	aws s3api list-object-versions --bucket $CDK_PARAM_S3_BUCKET_NAME --output json \
 		| jq '{"Objects": [.Versions[] | {Key: .Key, VersionId: .VersionId}]}' > $TEMP_FILE
-	aws s3api delete-objects --bucket $CDK_PARAM_S3_BUCKET_NAME --delete file://$TEMP_FILE
+	aws s3api delete-objects --bucket $CDK_PARAM_S3_BUCKET_NAME --delete file://$TEMP_FILE --no-cli-pager
 fi 
 
 # Deleting object markers 
@@ -71,7 +72,7 @@ delete_markers=$(aws s3api list-object-versions --bucket $CDK_PARAM_S3_BUCKET_NA
 if [ "$delete_markers" -gt 0 ]; then 
 	aws s3api list-object-versions --bucket $CDK_PARAM_S3_BUCKET_NAME --output json \
 	    | jq '{"Objects": [.DeleteMarkers[] | {Key: .Key, VersionId: .VersionId}]}' > $TEMP_FILE
-	aws s3api delete-objects --bucket $CDK_PARAM_S3_BUCKET_NAME --delete file://$TEMP_FILE
+	aws s3api delete-objects --bucket $CDK_PARAM_S3_BUCKET_NAME --delete file://$TEMP_FILE --no-cli-pager
 fi
 
 

scripts/deprovision-tenant.sh

@@ -86,7 +86,7 @@ if [[ $TIER == "PREMIUM" || $TIER == "ADVANCED" ]]; then
   STACK_NAME=$(sed -e 's/^"//' -e 's/"$//' <<<$STACK_NAME)
   echo "Stack name from $TENANT_STACK_MAPPING_TABLE is  $STACK_NAME"
   # Copy to S3 Bucket
-  export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$REGION"
+  export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$ACCOUNT_ID-$REGION"
   export CDK_SOURCE_NAME="source.zip"
   CDK_PARAM_COMMIT_ID=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --query "Stacks[0].Outputs[?OutputKey=='S3SourceVersion'].OutputValue" --output text)
 

scripts/install.sh

@@ -8,14 +8,16 @@ if [[ -z "$CDK_PARAM_SYSTEM_ADMIN_EMAIL" ]]; then
 fi
 
 REGION=$(aws ec2 describe-availability-zones --output text --query 'AvailabilityZones[0].[RegionName]')  # Region setting
-export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$REGION"
+ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+
+export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$ACCOUNT_ID-$REGION"
 
 # Create S3 Bucket for provision source.
 
 if aws s3api head-bucket --bucket $CDK_PARAM_S3_BUCKET_NAME 2>/dev/null; then
     echo "Bucket $CDK_PARAM_S3_BUCKET_NAME already exists."
 else
-    echo "Bucket $CDK_PARAM_S3_BUCKET_NAME does not exist. Creating a new bucket in $REGION region"
+    echo "Bucket $CDK_PARAM_S3_BUCKET_NAME does not exist. Creating a new bucket in $REGION region in $ACCOUNT_ID"
 
     if [ "$REGION" == "us-east-1" ]; then
       aws s3api create-bucket --bucket $CDK_PARAM_S3_BUCKET_NAME
@@ -46,7 +48,7 @@ fi
 echo "Bucket exists: $CDK_PARAM_S3_BUCKET_NAME"
 
 cd ../
-zip -r source.zip . -x ".git/*" -x "**/node_modules/*" -x "**/cdk.out/*" -x "**/.aws-sam/*"
+zip -rq source.zip . -x ".git/*" -x "**/node_modules/*" -x "**/cdk.out/*" -x "**/.aws-sam/*" 
 export CDK_PARAM_COMMIT_ID=$(aws s3api put-object --bucket "${CDK_PARAM_S3_BUCKET_NAME}" --key "source.zip" --body "./source.zip"  --output text)
 
 rm source.zip
@@ -74,19 +76,19 @@ SERVICES=$(aws ecs list-services --cluster $CDK_BASIC_CLUSTER --query 'serviceAr
 for SERVICE in $SERVICES; do
     SERVICE_NAME=$(echo $SERVICE | rev | cut -d '/' -f 1 | rev)
 
+    echo -n "==== Service Connect Disable: "
     aws ecs update-service \
         --cluster $CDK_BASIC_CLUSTER \
         --service $SERVICE_NAME \
         --service-connect-configuration 'enabled=false' \
-        --no-cli-pager
+        --no-cli-pager --query 'service.serviceArn' --output text
 
-    echo "Service Connect disabled for service: $SERVICE_NAME"
 done
 
 npm install
 
 npx cdk bootstrap
-npx cdk deploy --all --require-approval never 
+npx cdk deploy --all --require-approval=never
 
 # Get SaaS application url
 ADMIN_SITE_URL=$(aws cloudformation describe-stacks --stack-name controlplane-stack --query "Stacks[0].Outputs[?OutputKey=='adminSiteUrl'].OutputValue" --output text)

scripts/provision-tenant.sh

@@ -16,7 +16,7 @@ export REGION=$(aws ec2 describe-availability-zones --output text --query 'Avail
 export ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 
 # Download from the ecs reference solution Bucket
-export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$REGION"
+export CDK_PARAM_S3_BUCKET_NAME="saas-reference-architecture-ecs-$ACCOUNT_ID-$REGION"
 export CDK_SOURCE_NAME="source.zip"
 
 VERSIONS=$(aws s3api list-object-versions --bucket "$CDK_PARAM_S3_BUCKET_NAME" --prefix "$CDK_SOURCE_NAME" --query 'Versions[?IsLatest==`true`].{VersionId:VersionId}' --output text 2>&1)

server/package-lock.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-lambda-python-alpha": "2.140.0-alpha.0",
-    "@cdklabs/sbt-aws": "0.4.3",
+    "@cdklabs/sbt-aws": "0.5.0",
     "aws-cdk-lib": "2.140.0",
     "constructs": "10.0.5"
   }