Merge pull request #99 from aws-samples/s3-bucket-ownership

added bucket owner condition to s3 bucket check

Author: sivasadhu

README.md

@@ -11,8 +11,8 @@ We have also created a workshop that you can use as a reference to understand th
 - This reference architecture uses Python. Make sure you have Python 3.9 or above installed.
 - Make sure you have [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) installed.
 - Make sure you have the latest version of [AWS CDK CLI](https://docs.aws.amazon.com/cdk/latest/guide/cli.html) installed. Not having the release version of CDK can cause deployment issues.
-- Make sure you have the latest version of [git-remote-codecommit](https://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-git-remote-codecommit.html) installed.
 - Make sure that you have Node 18 or above.
+- Make sure that you have docker cli installed and docker daemon running.
 
 ## Deploying
 
@@ -25,7 +25,7 @@ cd scripts
 
 This script will deploy the following:
 
-- Creates a codecommit repo in your AWS account and pushes this reference solutions code to the repo
+- Creates a Amazon S3 bucket in your AWS account and pushes this reference solutions code to the bucket
 - Clones SaaS Builder Toolkit(SBT) control plane repo and installs control plane which has all shared services and control plane UI.
 - Deploys cdk stack `serverless-saas-ref-arch-bootstrap-stack` which provisions
   - SaaS Builder Toolkit(SBT) core application plane component which provides infrastructure to provision/de-provision a tenant

scripts/install.sh

@@ -15,10 +15,10 @@ export CDK_PARAM_S3_BUCKET_NAME="serverless-saas-${ACCOUNT_ID}-${REGION}"
 echo "CDK_PARAM_S3_BUCKET_NAME: ${CDK_PARAM_S3_BUCKET_NAME}"
 export CDK_SOURCE_NAME="source.zip"
 
-if aws s3api head-bucket --bucket $CDK_PARAM_S3_BUCKET_NAME 2>/dev/null; then
-    echo "Bucket $CDK_PARAM_S3_BUCKET_NAME already exists."
+if aws s3api head-bucket --bucket $CDK_PARAM_S3_BUCKET_NAME --expected-bucket-owner ${ACCOUNT_ID} 2>/dev/null; then
+    echo "Bucket $CDK_PARAM_S3_BUCKET_NAME already exists and owned by this account."
 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 or is not owned by this account. Creating a new bucket in $REGION region"
 
     if [ "$REGION" == "us-east-1" ]; then
       aws s3api create-bucket --bucket $CDK_PARAM_S3_BUCKET_NAME