diff --git a/gen3/bin/s3.sh b/gen3/bin/s3.sh index e89d3ca7b..0625bdf83 100644 --- a/gen3/bin/s3.sh +++ b/gen3/bin/s3.sh @@ -103,7 +103,8 @@ _add_bucket_to_cloudtrail() { # _bucket_exists() { local bucketName=$1 - if [[ -z "$(gen3_aws_run aws s3api head-bucket --bucket $bucketName 2>&1)" ]]; then + gen3_aws_run aws s3api head-bucket --bucket $bucketName > /dev/null 2>&1 + if [[ $? -eq 0 ]]; then echo 0 else echo 1 @@ -173,10 +174,12 @@ gen3_s3_info() { gen3_log_err "Unable to fetch AWS account ID." return 1 fi - if [[ ! -z "$(gen3_aws_run aws s3api head-bucket --bucket $1 2>&1)" ]]; then + + if [[ $(_bucket_exists $bucketName) -ne 0 ]]; then gen3_log_err "Bucket does not exist" return 1 fi + local rootPolicyArn="arn:aws:iam::${AWS_ACCOUNT_ID}:policy" if gen3_aws_run aws iam get-policy --policy-arn ${rootPolicyArn}/${writerName} >/dev/null 2>&1; then writerPolicy="{ \"name\": \"$writerName\", \"policy_arn\": \"${rootPolicyArn}/${writerName}\" } "