v1.3.1: fixes error handling in oldpuppet-sync; add home storage creation to new-system-user

Author: camillescottatwork

cheeto/__init__.py

@@ -1 +1 @@
-__version__ = '1.3.0'
+__version__ = '1.3.1'

cheeto/cmds/database.py

@@ -14,6 +14,7 @@
 from pathlib import Path
 import statistics as stat
 import sys
+from venv import logger
 
 from mongoengine import NotUniqueError, DoesNotExist
 from ponderosa import ArgParser, arggroup
@@ -691,7 +692,7 @@ def user_new_system(args: Namespace):
     except DuplicateGlobalUser as e:
         console.print(f'[red]{e}')
     else:
-        console.print(f'Created user {args.username} on all sites.')
+        console.print(f'Created user {args.username}, use `cheeto db user add site` to add to sites and create home storages.')
         if password is not None:
             console.print(f'Password: {password}')
             console.print('[red] Make sure to save this password in 1password!')
@@ -817,8 +818,23 @@ def user_remove_access(args: Namespace):
 @commands.register('database', 'user', 'add', 'site',
                    help='Add user(s) to site')
 def user_add_site(args):
+    logger = logging.getLogger(__name__)
     for user in args.user:
-        add_site_user(args.site, user)
+        try:
+            add_site_user(args.site, user)
+        except DuplicateSiteUser:
+            logger.info(f'User {user} already exists in site {args.site}.')
+        if args.create_storage:
+            logger.info(f'Creating home storage for {user} in site {args.site}.')
+            try:
+                create_home_storage(args.site, user)
+            except (NotUniqueError, DuplicateKeyError):
+                logger.info(f'Home storage for {user} in site {args.site} already exists.')
+
+
+@user_add_site.args()
+def _(parser: ArgParser):
+    parser.add_argument('--create-storage', action='store_true', default=False)
 
 
 @arggroup()

cheeto/database/crud.py

@@ -937,8 +937,9 @@ def user_to_puppet(user: SiteUser,
 
     try:
         home_storage = query_user_home_storage(user.sitename, user.parent)
-    except DoesNotExist:
+    except (DoesNotExist, NonExistentStorage):
         storage = None
+        logger.warning(f'No home storage found for {user.username} at {user.sitename}')
     else:
         storage = dict(autofs={'nas': home_storage.host,
                                'path': str(home_storage.host_path.parent)},

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cheeto"
-version = "1.3.0"
+version = "1.3.1"
 description = "Utilities for the UC Davis HPC Core Facility."
 license = "Proprietary"
 authors = [