Skip to content
This repository was archived by the owner on Aug 16, 2021. It is now read-only.

Commit ff080b2

Browse files
author
Dmitry
committed
aws zone validation changed
1 parent 326c0f0 commit ff080b2

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

nancy_run.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ function check_cli_parameters() {
387387
([[ ! -z ${COMMANDS_AFTER_CONTAINER_INIT+x} ]] && [[ -z $COMMANDS_AFTER_CONTAINER_INIT ]]) && unset -v COMMANDS_AFTER_CONTAINER_INIT
388388
([[ ! -z ${SQL_BEFORE_DB_RESTORE+x} ]] && [[ -z $SQL_BEFORE_DB_RESTORE ]]) && unset -v SQL_BEFORE_DB_RESTORE
389389
([[ ! -z ${SQL_AFTER_DB_RESTORE+x} ]] && [[ -z $SQL_AFTER_DB_RESTORE ]]) && unset -v SQL_AFTER_DB_RESTORE
390+
([[ ! -z ${AWS_ZONE+x} ]] && [[ -z $AWS_ZONE ]]) && unset -v AWS_ZONE
390391
### CLI parameters checks ###
391392
if [[ "$RUN_ON" == "aws" ]]; then
392393
if [ ! -z ${CONTAINER_ID+x} ]; then
@@ -408,12 +409,7 @@ function check_cli_parameters() {
408409
AWS_REGION='us-east-1'
409410
fi
410411
if [[ -z ${AWS_ZONE+x} ]]; then
411-
err "NOTICE: AWS EC2 zone not given. Will determined by min price."
412-
else
413-
if [[ -z $AWS_ZONE ]]; then
414-
err "NOTICE: AWS EC2 zone not given. Will determined by min price."
415-
unset -v AWS_ZONE
416-
fi
412+
err "NOTICE: AWS EC2 zone not given. Will be determined by min price."
417413
fi
418414
if [[ -z ${AWS_BLOCK_DURATION+x} ]]; then
419415
err "NOTICE: Container live time duration is not given. Will use 60 minutes."

0 commit comments

Comments
 (0)