Merge branch 'master' into table_acls_in_chunks

Author: lorenzorubi-db

dbclient/WorkspaceClient.py

@@ -447,7 +447,7 @@ def log_all_workspace_items(self, ws_path, workspace_log_writer, libs_log_writer
         num_nbs = 0
         if self.is_verbose():
             logging.info("Listing: {0}".format(get_args['path']))
-        if items is not None:
+        if items:
             # list all the users folders only
             folders = self.filter_workspace_items(items, 'DIRECTORY')
             # should be no notebooks, but lets filter and can check later
@@ -522,7 +522,7 @@ def _recurse_log_all_workspace_items(folder):
                         if num_nbs_plus:
                             num_nbs += num_nbs_plus
         # log all repos
-        if repos_log_writer is not None:
+        if repos_log_writer and repos:
             for repo in repos:
                 repo_path = repo.get('path', "")
                 if not checkpoint_set.contains(repo_path) and not repo_path.startswith(tuple(exclude_prefixes)):

dbclient/parser.py

@@ -461,6 +461,9 @@ def get_pipeline_parser() -> argparse.ArgumentParser:
     parser.add_argument('--silent', action='store_true', default=False,
                         help='Silent all logging of export operations.')
 
+    parser.add_argument('--verbose', action='store_true', default=False,
+                        help='Verbose logging')
+
     parser.add_argument('--no-ssl-verification', action='store_true',
                         help='Set Verify=False when making http requests.')
 
@@ -550,4 +553,5 @@ def get_pipeline_parser() -> argparse.ArgumentParser:
 
     parser.add_argument('--groups-to-keep', nargs='+', type=str, default=[],
                         help='List of groups (and therefore users/notebooks) to keep if specified')
+
     return parser

migration_pipeline.py

@@ -55,6 +55,8 @@ def build_pipeline(args) -> Pipeline:
     client_config['base_dir'] = client_config['export_dir']
     client_config['export_dir'] = os.path.join(client_config['base_dir'], session) + '/'
 
+    client_config['verbose'] = args.verbose
+
     if not args.dry_run:
         os.makedirs(client_config['export_dir'], exist_ok=True)