use sub-commands.

Author: guettli

Tests/kaas/sonobuoy_handler/run_sonobuoy.py

@@ -11,23 +11,30 @@
 logger = logging.getLogger(__name__)
 
 
-@click.command()
-@click.option("-k", "--kubeconfig", "kubeconfig", required=False, type=click.Path(exists=True), help="path/to/kubeconfig_file.yaml",)
+@click.group()
+def cli():
+    pass
+
+
+@cli.command("run")
+@click.option("-k", "--kubeconfig", "kubeconfig", required=True, type=click.Path(exists=True), help="path/to/kubeconfig_file.yaml",)
 @click.option("-r", "--result_dir_name", "result_dir_name", type=str, default="sonobuoy_results", help="directory name to store results at",)
 @click.option("-c", "--check", "check_name", type=str, default="sonobuoy_executor", help="this MUST be the same name as the id in 'scs-compatible-kaas.yaml'",)
-@click.option("--sonobuoy-config", "sonobuoy_config", type=click.Path(exists=True), default="kaas/sonobuoy-config.yaml", help="Configuration for Sonobuoy (yaml format)")
-@click.option("--sonobuoy-result-yaml", "sonobuoy_result_yaml", type=click.Path(exists=True), default="", help="Test the provided sonobuoy result yaml file. Sonobuoy will not be executed!")
+@click.option("--sonobuoy-config", "sonobuoy_config_yaml", type=click.Path(exists=True), default="kaas/sonobuoy-config.yaml", help="Configuration for Sonobuoy (yaml format)")
 @click.option("-a", "--arg", "args", multiple=True)
-def sonobuoy_run(kubeconfig, result_dir_name, check_name, sonobuoy_config, sonobuoy_result_yaml, args):
-    if sonobuoy_result_yaml:
-        check_sonobuoy_result(sonobuoy_config, sonobuoy_result_yaml)
-        sys.exit(0)
-    if not kubeconfig:
-        raise click.UsageError("--kubeconfig/-k is required unless --sonobuoy-result-yaml is provided")
-    sonobuoy_handler = SonobuoyHandler(check_name, kubeconfig, result_dir_name, sonobuoy_config, args)
+def sonobuoy_run(kubeconfig, result_dir_name, check_name, sonobuoy_config_yaml, args):
+    sonobuoy_handler = SonobuoyHandler(check_name, kubeconfig, result_dir_name, sonobuoy_config_yaml, args)
     sys.exit(sonobuoy_handler.run())
 
 
+@cli.command("check-results")
+@click.argument("sonobuoy_config_yaml", type=click.Path(exists=True))
+@click.argument("sonobuoy_result_yaml", type=click.Path(exists=True))
+def check_results(sonobuoy_config_yaml, sonobuoy_result_yaml):
+    check_sonobuoy_result(sonobuoy_config_yaml, sonobuoy_result_yaml)
+    sys.exit(0)
+
+
 if __name__ == "__main__":
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
-    sonobuoy_run()
+    cli()