Scripts harmonization

Author: godu

scripts/create-buckets.sh

@@ -1,22 +1,20 @@
 #!/bin/sh
 trap "exit 1" INT
 
-AWS_ENDPOINT_URL=${AWS_ENDPOINT_URL:-http://s3:9000}
-AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-local}
-AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-local}
-AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-eu-west-1}
+AWS_ENDPOINT_URL=${AWS_ENDPOINT_URL:-http://localhost:9000}
 
-echo  "here is ${AWS_ACCESS_KEY_ID} "
-
-aws configure set aws_access_key_id ${AWS_ACCESS_KEY_ID}
-aws configure set aws_secret_access_key ${AWS_SECRET_ACCESS_KEY}
-aws configure set default.region ${AWS_DEFAULT_REGION}
-
-
-aws --endpoint-url ${AWS_ENDPOINT_URL} s3 mb s3://documents
-aws --endpoint-url ${AWS_ENDPOINT_URL} s3 mb s3://pictures
-aws --endpoint-url ${AWS_ENDPOINT_URL} s3 mb s3://files
+BUCKETS="documents pictures files"
+for BUCKET in $BUCKETS
+do 
+    until aws --endpoint-url ${AWS_ENDPOINT_URL} s3 ls s3://${BUCKET} > /dev/null 2> /dev/null
+    do
+    echo "Creating bucket $BUCKET"
+    aws --endpoint-url ${AWS_ENDPOINT_URL} s3 \
+        mb s3://${BUCKET} \
+        > /dev/null 2> /dev/null
+    done &
+done
 
 wait
 
-trap - INT
+trap - INT

tests/serverless-plugins-integration/package.json

@@ -7,7 +7,7 @@
     "start:sqs": "sls --config serverless.sqs.yml offline",
     "start:s3": "sls --config serverless.s3.yml offline",
     "start:dynamodb-streams": "sls --config serverless.dynamodb-streams.yml offline",
-    "test": "npm run test:s3 && npm run test:sqs && npm run test:sqs:autocreate && npm run test:kinesis && npm run test:dynamodb-streams",
+    "test": "npm run test:dynamodb-streams && npm run test:kinesis && npm run test:s3 && npm run test:sqs && npm run test:sqs:autocreate",
     "setup-service": "../../scripts/clean-start.sh",
     "pretest:dynamodb-streams": "npm run -s setup-service dynamodb",
     "test:dynamodb-streams": "node test-dynamodb-streams",