Clean up CLI

Author: pomo-mondreganto

cli/base/setup.py

@@ -6,24 +6,11 @@
 
 from cli import utils
 from cli.constants import BASE_DIR, CONFIG_PATH, FULL_COMPOSE_PATH, BASE_COMPOSE_FILE
+from cli.options import with_external_services_option
 
 
 @click.command(help='Initialize ForcAD configuration')
-@click.option(
-    '--redis',
-    metavar='ADDR',
-    help='External redis address (disables built-in redis container)',
-)
-@click.option(
-    '--database',
-    metavar='ADDR',
-    help='External Postgres address (disables built-in postgres container)',
-)
-@click.option(
-    '--rabbitmq',
-    metavar='ADDR',
-    help='External RabbitMQ address (disables built-in rabbitmq container)',
-)
+@with_external_services_option
 def setup(redis, database, rabbitmq, **_kwargs):
     override_config(redis=redis, database=database, rabbitmq=rabbitmq)
     config = utils.load_config()

cli/kube/setup.py

@@ -4,25 +4,12 @@
 from cli import utils
 from cli.base.setup import override_config
 from cli.constants import SECRETS_DIR, KUSTOMIZATION_BASE_PATH, KUSTOMIZATION_PATH
+from cli.options import with_external_services_option
 from .utils import write_secret
 
 
 @click.command(help='Initialize ForcAD configuration')
-@click.option(
-    '--redis',
-    metavar='ADDR',
-    help='External redis address (disables built-in redis container)',
-)
-@click.option(
-    '--database',
-    metavar='ADDR',
-    help='External Postgres address (disables built-in postgres container)',
-)
-@click.option(
-    '--rabbitmq',
-    metavar='ADDR',
-    help='External RabbitMQ address (disables built-in rabbitmq container)',
-)
+@with_external_services_option
 def setup(redis, database, rabbitmq, **_kwargs):
     override_config(redis=redis, database=database, rabbitmq=rabbitmq)
     config = utils.load_config()

cli/options.py

@@ -17,3 +17,23 @@ def with_workers_option(func):
         default=1,
         help='Number of celery worker instances',
     )(func)
+
+
+def with_external_services_option(func):
+    wrapped = click.option(
+        '--redis',
+        metavar='ADDR',
+        help='External redis address (disables built-in redis container)',
+    )(func)
+    wrapped = click.option(
+        '--database',
+        metavar='ADDR',
+        help='External Postgres address (disables built-in postgres container)',
+    )(wrapped)
+    wrapped = click.option(
+        '--rabbitmq',
+        metavar='ADDR',
+        help='External RabbitMQ address (disables built-in rabbitmq container)',
+    )(wrapped)
+
+    return wrapped