Fix: Effective value of azul_current_{catalog,source} is not obvious (#7503)

Author: nadove-ucsc

scripts/mirror.py

@@ -74,10 +74,8 @@ def main(args):
     parser.add_argument('--catalog',
                         metavar='NAME',
                         choices=config.catalogs,
-                        default=config.default_catalog,
                         help='The name of the catalog to mirror.')
     parser.add_argument('--sources',
-                        default=config.current_sources,
                         nargs='+',
                         help='Limit mirroring to a subset of the configured sources. '
                              'Supports shell-style wildcards to match multiple sources per argument. '

scripts/reindex.py

@@ -57,21 +57,11 @@
 parser.add_argument('--catalogs',
                     nargs='+',
                     metavar='NAME',
-                    default=[
-                        catalog.name
-                        for catalog in config.catalogs.values()
-                        if not catalog.is_integration_test_catalog
-                    ]
-                    if config.current_catalog is None else
-                    [
-                        config.catalogs[config.current_catalog].name
-                    ],
                     choices=config.catalogs,
                     help='Limit reindexing to a a subset of the configured catalogs. If no values are passed, this '
                          'argument will be set from the environment variable ``azul_current_catalog``. If that '
                          'variable is unset, all non-IT catalogs will be used.')
 parser.add_argument('--sources',
-                    default=config.current_sources,
                     nargs='+',
                     help='Limit reindexing to a subset of the configured sources. '
                          'Supports shell-style wildcards to match multiple sources per argument. '
@@ -132,7 +122,30 @@ def main(argv: list[str]):
 
     azul = AzulClient(num_workers=args.num_workers)
 
-    source_globs = set(args.sources)
+    if args.catalogs is None:
+        catalog_origin = 'environment variable'
+        if config.current_catalog is None:
+            catalog_origin += ' (unset)'
+            catalogs = [
+                catalog.name
+                for catalog in config.catalogs.values()
+                if not catalog.is_integration_test_catalog
+            ]
+        else:
+            catalogs = [config.catalogs[config.current_catalog].name]
+    else:
+        catalog_origin = 'command line argument'
+        catalogs = args.catalogs
+    log.info('Using catalog(s) specified via %s: %r', catalog_origin, catalogs)
+
+    if args.sources is None:
+        source_origin = 'environment variable'
+        source_globs = set(config.current_sources)
+    else:
+        source_origin = 'command line argument'
+        source_globs = set(args.sources)
+    log.info('Using source glob(s) specified via %s: %r', source_origin, source_globs)
+
     every_source = '*' in source_globs
     deindex = args.deindex or (args.delete and not every_source)
     delete = args.delete and every_source
@@ -150,15 +163,15 @@ def main(argv: list[str]):
         parser.error('--deindex is incompatible with --create and --delete.')
         assert False
 
-    sources_by_catalog = azul.matching_sources(args.catalogs, source_globs)
+    sources_by_catalog = azul.matching_sources(catalogs, source_globs)
     azul.require_no_failures_before()
 
     if deindex:
         for catalog, sources in sources_by_catalog.items():
             if sources:
                 azul.deindex(catalog, sources)
 
-    azul.reset_indexer(args.catalogs,
+    azul.reset_indexer(catalogs,
                        purge_queues=args.purge,
                        delete_indices=delete,
                        create_indices=args.create or args.index and delete)
@@ -186,7 +199,7 @@ def main(argv: list[str]):
         if args.wait:
             if num_notifications == 0:
                 log.warning('No notifications for prefix %r and catalogs %r were sent',
-                            args.prefix, args.catalogs)
+                            args.prefix, catalogs)
             else:
                 azul.wait_for_indexer()
                 azul.require_no_failures_after()