fixes for aws cli

couchbase-partners · Jul 7, 2023 · 95b27d5 · 95b27d5
1 parent 03424f7
commit 95b27d5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/aws/CouchbaseServer-Graviton/deploy.sh b/aws/CouchbaseServer-Graviton/deploy.sh
@@ -62,7 +62,9 @@ SUBNET_ID=$(aws ec2 describe-subnets --filter "Name=vpc-id,Values=${VPC_NAME}" -
 
 # Create Bucket
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET" --object-ownership BucketOwnerPreferred --region "$REGION"
+aws s3api create-bucket --acl private --bucket "$BUCKET" --object-ownership ObjectWriter --region "$REGION"
+aws s3api delete-public-access-block --bucket "$BUCKET" --region "$REGION"
+aws s3api put-bucket-acl --acl private --bucket "$BUCKET" --region "$REGION"
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE" --region "$REGION"
 

diff --git a/aws/CouchbaseServer/deploy.sh b/aws/CouchbaseServer/deploy.sh
@@ -63,7 +63,10 @@ SUBNET_ID=$(aws ec2 describe-subnets --filter "Name=vpc-id,Values=${VPC_NAME}" -
 
 # Create Bucket
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET" --object-ownership BucketOwnerPreferred --region "$REGION"
+aws s3api create-bucket --acl private --bucket "$BUCKET" --object-ownership ObjectWriter --region "$REGION"
+aws s3api delete-public-access-block --bucket "$BUCKET" --region "$REGION"
+aws s3api put-bucket-acl --acl private --bucket "$BUCKET" --region "$REGION"
+
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE"
 

diff --git a/aws/CouchbaseServerAndSyncGateway/deploy.sh b/aws/CouchbaseServerAndSyncGateway/deploy.sh
@@ -34,7 +34,9 @@ TEMPLATE_BODY_FILE="${SCRIPT_SOURCE}/../../build/aws/CouchbaseServerAndSyncGatew
 echo "$TEMPLATE_BODY_FILE"
 
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET"  --object-ownership BucketOwnerPreferred --region "$REGION"
+aws s3api create-bucket --acl private --bucket "$BUCKET" --object-ownership ObjectWriter --region "$REGION"
+aws s3api delete-public-access-block --bucket "$BUCKET" --region "$REGION"
+aws s3api put-bucket-acl --acl private --bucket "$BUCKET" --region "$REGION"
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE"