Fix logic bug re: secrets basedir validation

davedittrich · Apr 27, 2023 · 1b9e7d6 · 1b9e7d6
1 parent d847715
commit 1b9e7d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/psec/cli/init.py b/psec/cli/init.py
@@ -46,10 +46,8 @@ class Init(Command):
     logger = logging.getLogger(__name__)
 
     def get_parser(self, prog_name):
-        try:
-            basedir = self.app.secrets_basedir
-        except AttributeError:
-            # For cliff
+        basedir = getattr(self.app, 'secrets_basedir', None)
+        if basedir is None:
             basedir = get_default_secrets_basedir()
         parser = super().get_parser(prog_name)
         parser.add_argument(

diff --git a/psec/utils.py b/psec/utils.py
@@ -204,7 +204,9 @@ def secrets_basedir_create(
 ):
     """Create secrets root directory"""
     if basedir is None:
-        raise RuntimeError("[-] a base directory is required")
+        raise RuntimeError(
+            "[-] no base directory path specified"
+        )
     secrets_basedir = Path(basedir)
     secrets_basedir.mkdir(
         parents=True,