Beautify createAMI.sh scripts

openvidu-server/deployments/ce/aws/createAMI.sh

@@ -10,7 +10,6 @@ fi
 
 export AWS_DEFAULT_REGION=eu-west-1
 
-
 DATESTAMP=$(date +%s)
 TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
 
@@ -22,8 +21,8 @@ getUbuntuAmiId() {
   local AMI_ID=$(
     aws --region ${1} ec2 describe-images \
       --filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \
-        --query "sort_by(Images, &CreationDate)" \
+      --query "sort_by(Images, &CreationDate)" |
-        | jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
+      jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
   )
   echo $AMI_ID
 }
@@ -94,10 +93,9 @@ aws cloudformation delete-stack --stack-name openvidu-ce-${DATESTAMP}
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
 WAIT_MAX_RETRIES=3
-until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]
+until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
-do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
-   WAIT_RETRIES=$((WAIT_RETRIES+1)) 
+  WAIT_RETRIES=$((WAIT_RETRIES + 1))
   sleep 5
 done
 
@@ -109,7 +107,7 @@ if [[ $CF_RELEASE == "true" ]]; then
 fi
 
 # Updating the template
-sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu.yaml.template > CF-OpenVidu-${OPENVIDU_VERSION}.yaml
+sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu.yaml.template >CF-OpenVidu-${OPENVIDU_VERSION}.yaml
 sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" CF-OpenVidu-${OPENVIDU_VERSION}.yaml
 
 # Update CF template

openvidu-server/deployments/pro/aws/createAMIs.sh

@@ -20,8 +20,8 @@ getUbuntuAmiId() {
   local AMI_ID=$(
     aws --region ${1} ec2 describe-images \
       --filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \
-        --query "sort_by(Images, &CreationDate)" \
+      --query "sort_by(Images, &CreationDate)" |
-        | jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
+      jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
   )
   echo $AMI_ID
 }
@@ -103,10 +103,9 @@ aws cloudformation delete-stack --stack-name kms-${DATESTAMP}
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
 WAIT_MAX_RETRIES=3
-until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]
+until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
-do
   aws ec2 wait image-available --image-ids ${KMS_RAW_AMI_ID} && break
-   WAIT_RETRIES=$((WAIT_RETRIES+1)) 
+  WAIT_RETRIES=$((WAIT_RETRIES + 1))
   sleep 5
 done
 
@@ -120,8 +119,8 @@ fi
 ## OpenVidu AMI
 
 # Copy template to S3
-  aws s3 cp cfn-mkt-ov-ami.yaml s3://aws.openvidu.io
+aws s3 cp cfn-mkt-ov-ami.yaml s3://aws.openvidu.io
-  TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ami.yaml
+TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ami.yaml
 
 # Update installation script
 if [[ ${UPDATE_INSTALLATION_SCRIPT} == "true" ]]; then
@@ -164,10 +163,9 @@ aws cloudformation delete-stack --stack-name openvidu-${DATESTAMP}
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
 WAIT_MAX_RETRIES=3
-until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]
+until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
-do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
-   WAIT_RETRIES=$((WAIT_RETRIES+1)) 
+  WAIT_RETRIES=$((WAIT_RETRIES + 1))
   sleep 5
 done
 
@@ -178,9 +176,8 @@ if [[ $CF_RELEASE == "true" ]]; then
   aws ec2 modify-snapshot-attribute --snapshot-id ${SNAPSHOT_ID} --create-volume-permission "Add=[{Group=all}]"
 fi
 
-
 # Updating the template
-sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" cfn-openvidu-server-pro-no-market.yaml.template > cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml
+sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" cfn-openvidu-server-pro-no-market.yaml.template >cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml
 sed -i "s/KMS_AMI_ID/${KMS_RAW_AMI_ID}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml
 sed -i "s/AWS_DOCKER_TAG/${AWS_DOCKER_TAG}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml