Merge pull request #180 from minrk/reset-exclusive

Enforce that `--reset` is an exclusive argument

Author: consideRatio

chartpress.py

@@ -8,6 +8,7 @@
 import os
 import pipes
 import re
+import shlex
 import shutil
 import subprocess
 import sys
@@ -1038,7 +1039,7 @@ def __call__(self, parser, namespace, values, option_string=None):
         getattr(namespace, self.dest).append(values)
 
 
-def main(args=None):
+def main(argv=None):
     """Run chartpress"""
     argparser = argparse.ArgumentParser(description=__doc__)
 
@@ -1127,24 +1128,33 @@ def main(args=None):
     )
     argparser.add_argument(
         "--version",
-        action="store_true",
-        help="Print current chartpress version and exit.",
+        action="version",
+        version=f"chartpress version {__version__}",
     )
 
-    args = argparser.parse_args(args)
+    args = argparser.parse_args(argv)
     if args.builder == Builder.DOCKER_BUILD and args.platform:
         argparser.error(f"--platform is not supported with {Builder.DOCKER_BUILD}")
 
+    if args.reset:
+        # reset conflicts with everything
+        # this could probably be clearer by using subparsers
+        argv = list(argv or sys.argv[1:])
+        if len(argv) > 1:
+            argv = list(argv)
+            argv.remove("--reset")
+            extra_args = " ".join(shlex.quote(arg) for arg in argv if arg != "--reset")
+            argparser.error(
+                f"`chartpress --reset` takes no additional arguments: {extra_args}"
+            )
+
     # allow simple checks for whether publish will happen
     if args.force_publish_chart:
         args.publish_chart = True
 
-    if args.version:
-        print(f"chartpress version {__version__}")
-        return
-
-    if args.list_images:
+    if args.list_images or args.reset:
         args.no_build = True
+        args.publish_chart = False
 
     with open("chartpress.yaml") as f:
         config = yaml.load(f)

tests/test_repo_interactions.py

@@ -75,11 +75,6 @@ def test_chartpress_run(git_repo, capfd, base_version):
         f"Updating testchart/values.yaml: image: testchart/testimage:{reset_tag}" in out
     )
 
-    # --tag overrides resetVersion config
-    out = _capture_output(["--reset", "--tag=1.0.0-dev"], capfd)
-    assert "Updating testchart/Chart.yaml: version: 1.0.0-dev" in out
-    assert "Updating testchart/values.yaml: image: testchart/testimage:1.0.0-dev" in out
-
     # verify that we don't need to rebuild the image
     out = _capture_output([], capfd)
     assert "Skipping build" in out
@@ -406,3 +401,10 @@ def test_reset(git_repo, capfd):
     expected_tag = chart_cfg["resetTag"]
 
     assert values["image"] == f"testchart/testimage:{expected_tag}"
+
+
+def test_reset_exclusive(git_repo, capfd):
+    with pytest.raises(SystemExit):
+        chartpress.main(["--reset", "--tag", "1.2.3"])
+    out, err = capfd.readouterr()
+    assert "no additional arguments" in err