@@ -16,7 +16,7 @@ trap "pkill -P $$; exit 1;" INT
16
16
PYTHON_VERSIONS_FOR_AWS_CLI=(" python2.7" " python3.6" " python3.7" " python3.8" )
17
17
LAYER_PATHS=(" .layers/datadog_lambda_py2.7.zip" " .layers/datadog_lambda_py3.6.zip" " .layers/datadog_lambda_py3.7.zip" " .layers/datadog_lambda_py3.8.zip" )
18
18
AVAILABLE_LAYER_NAMES=(" Datadog-Python27" " Datadog-Python36" " Datadog-Python37" " Datadog-Python38" )
19
- AVAILABLE_REGIONS=(us-east-2 us-east-1 us-west-1 us-west-2 ap-east-1 ap-south-1 ap-northeast-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ca-central-1 eu-north-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 sa-east-1 )
19
+ AVAILABLE_REGIONS=$( aws ec2 describe-regions | jq -r ' .[] | .[] | .RegionName ' )
20
20
21
21
# Check that the layer files exist
22
22
for layer_file in " ${LAYER_PATHS[@]} "
30
30
# Check region arg
31
31
if [ -z " $1 " ]; then
32
32
echo " Region parameter not specified, running for all available regions."
33
- REGIONS=( " ${ AVAILABLE_REGIONS[@]} " )
33
+ REGIONS=$ AVAILABLE_REGIONS
34
34
else
35
35
echo " Region parameter specified: $1 "
36
- if [[ ! " ${ AVAILABLE_REGIONS[@]} " =~ " ${1} " ]]; then
37
- echo " Could not find $1 in available regions: ${ AVAILABLE_REGIONS[@]} "
36
+ if [[ ! " $ AVAILABLE_REGIONS" == * " $1 " * ]]; then
37
+ echo " Could not find $1 in available regions: $AVAILABLE_REGIONS "
38
38
echo " "
39
39
echo " EXITING SCRIPT."
40
40
exit 1
41
41
fi
42
42
REGIONS=($1 )
43
43
fi
44
44
45
- echo " Publishing layers for regions: ${ REGIONS[*]} "
45
+ echo " Starting publishing layers for regions: $REGIONS "
46
46
47
47
# Check layer_name arg
48
48
if [ -z " $2 " ]; then
@@ -85,7 +85,7 @@ publish_layer() {
85
85
echo " Published layer for region $region , python version $aws_version_key , layer_name $layer_name , layer_version $version_nbr "
86
86
}
87
87
88
- BATCH_SIZE=60
88
+ BATCH_SIZE=1
89
89
PIDS=()
90
90
91
91
wait_for_processes () {
@@ -95,7 +95,7 @@ wait_for_processes() {
95
95
PIDS=()
96
96
}
97
97
98
- for region in " ${ REGIONS[@]} "
98
+ for region in $ REGIONS
99
99
do
100
100
echo " Starting publishing layer for region $region ..."
101
101
0 commit comments