From c5aa1a32dfce1388219017c3b8006794bbeb9ee3 Mon Sep 17 00:00:00 2001 From: doron segal Date: Wed, 12 Jul 2017 09:16:19 -0700 Subject: [PATCH] moving validation to load_settings --- zappa/cli.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/zappa/cli.py b/zappa/cli.py index 5974e6c60..87fb90c04 100644 --- a/zappa/cli.py +++ b/zappa/cli.py @@ -786,9 +786,6 @@ def update(self): # Make sure we're in a venv. self.check_venv() - # Validate settings - self.validate_settings() - # Execute the prebuild script if self.prebuild_script: self.execute_prebuild_script() @@ -1843,6 +1840,11 @@ def load_settings(self, settings_file=None, session=None): if not os.path.isfile(settings_file): raise ClickException("Please configure your zappa_settings file.") + # Validate settings + # Validate timeout seconds + if self.stage_config.get('timeout_seconds') > 300: + click.echo(click.style("Warning!", fg="red", bold=True) + "`timeout_seconds` must be less or equal to 300!" + # Load up file self.load_settings_file(settings_file) @@ -2455,14 +2457,6 @@ def check_venv(self): click.style("Zappa", bold=True) + " requires an " + click.style("active virtual environment", bold=True, fg="red") + "!\n" + "Learn more about virtual environments here: " + click.style("http://docs.python-guide.org/en/latest/dev/virtualenvs/", bold=False, fg="cyan")) - - def validate_settings(self): - """ Validate settings """ - # Validate timeout_seconds - if self.stage_config.get('timeout_seconds') > 300: - click.echo(click.style("Warning!", fg="red", bold=True) + "`timeout_seconds` must be less or equal to 300!" - - def silence(self): """ Route all stdout to null.