From 7441c5f435dc424680681495f0f1020ffe0991fa Mon Sep 17 00:00:00 2001 From: KiraLT Date: Wed, 28 Dec 2022 13:57:09 +0200 Subject: [PATCH] chore: testmode fix --- app/handler.py | 8 +++++--- app/settings.py | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/handler.py b/app/handler.py index 8fa4e9f..e592b4a 100644 --- a/app/handler.py +++ b/app/handler.py @@ -2,6 +2,7 @@ import shutil from certbot._internal.plugins import disco as plugins_disco +from os import environ from app.settings import load_settings from app.services.certbot import obtain_certbot_certs @@ -9,9 +10,7 @@ def handler(_event, _context): - settings = load_settings() - - if settings.TESTMODE: + if environ.get('TESTMODE') == 'true': plugins = list(plugins_disco.PluginsRegistry.find_all()) dns_plugins = [v for v in plugins if v.startswith('dns-')] @@ -20,6 +19,9 @@ def handler(_event, _context): return else: + settings = load_settings() + + try: shutil.rmtree(str(settings.CERTBOT_DIR), ignore_errors=True) diff --git a/app/settings.py b/app/settings.py index 2cd0bb5..ac8742f 100644 --- a/app/settings.py +++ b/app/settings.py @@ -18,7 +18,6 @@ class Settings: CERTBOT_EXTRA_ARGS: list[str] = None CERTBOT_CREDENTIALS: str = None CERTBOT_PROPAGATION_SECONDS: str = None - TESTMODE: bool = False def read_env( @@ -61,5 +60,4 @@ def load_settings() -> Settings: CERTBOT_EXTRA_ARGS=read_env("CERTBOT_EXTRA_ARGS", multi=True, delimiter=" "), CERTBOT_CREDENTIALS=read_env("CERTBOT_CREDENTIALS"), CERTBOT_PROPAGATION_SECONDS=read_env("CERTBOT_PROPAGATION_SECONDS"), - TESTMODE=read_env('TESTMODE') == 'true' )