Replace --run-from-* boolean flags with a single --run-from option

Reviewed By: tianhan0

Differential Revision: D108142946

fbshipit-source-id: e302f70c047af6aee7854bd18e209e62d3578e43

Author: arthaud

documentation/deliberately_vulnerable_flask_app/run_integration_tests.sh

@@ -7,7 +7,7 @@
 cd "$(dirname "$0")" || exit
 exec python3 ../../tools/pysa_integration_tests/run.py \
     --skip-model-verification \
-    --run-from-source \
+    --run-from=python-package \
     --ignore-positions \
     --write-actual-results-on-failure \
     "$@"

tools/pysa_integration_tests/run.py

@@ -30,8 +30,7 @@ def main(
     filter_issues: bool,
     skip_model_verification: bool,
     skip_model_verification_with_pyrefly: bool,
-    run_from_source: bool,
-    run_from_buck: bool,
+    run_from: test_runner_lib.RunFrom,
     passthrough_args: Optional[List[str]],
     save_results_to: Optional[Path],
     typeshed: Optional[Path],
@@ -67,8 +66,7 @@ def main(
     pysa_results = test_runner_lib.run_pysa(
         passthrough_args=passthrough_args,
         skip_model_verification=skip_model_verification,
-        run_from_source=run_from_source,
-        run_from_buck=run_from_buck,
+        run_from=run_from,
         save_results_to=save_results_to,
         typeshed=typeshed,
         compact_ocaml_heap=compact_ocaml_heap,
@@ -108,15 +106,21 @@ def main(
         action="store_true",
         help="Skip model verification when using pyrefly",
     )
+    parser.add_argument(
+        "--run-from",
+        choices=[run_from.value for run_from in test_runner_lib.RunFrom],
+        default=test_runner_lib.RunFrom.PYRE_IN_PATH.value,
+        help="How to run pysa: `pyre-in-path` (default; uses the `pyre` client on PATH), `python-package` (open source setup, runs `python -mpyre-check.client.pyre`), `internal-buck` (runs `buck run fbcode//tools/pyre/facebook/client:pysa`), or `oss-buck` (runs `buck run fbcode//tools/pyre/client:pyre`).",
+    )
     parser.add_argument(
         "--run-from-source",
         action="store_true",
-        help="Run pysa from source with the open source setup",
+        help="Deprecated alias for --run-from=python-package",
     )
     parser.add_argument(
         "--run-from-buck",
         action="store_true",
-        help="Run pysa from buck with `buck run fbcode//tools/pyre/facebook/client:pysa`",
+        help="Deprecated alias for --run-from=internal-buck",
     )
     parser.add_argument(
         "--require-pyre-env",
@@ -169,13 +173,17 @@ def main(
     )
 
     parsed: argparse.Namespace = parser.parse_args()
+    run_from = test_runner_lib.RunFrom(parsed.run_from)
+    if parsed.run_from_source:
+        run_from = test_runner_lib.RunFrom.PYTHON_PACKAGE
+    elif parsed.run_from_buck:
+        run_from = test_runner_lib.RunFrom.INTERNAL_BUCK
     main(
         working_directory=parsed.working_directory or Path(os.getcwd()),
         filter_issues=parsed.filter_issues,
         skip_model_verification=parsed.skip_model_verification,
         skip_model_verification_with_pyrefly=parsed.skip_model_verification_with_pyrefly,
-        run_from_source=parsed.run_from_source,
-        run_from_buck=parsed.run_from_buck,
+        run_from=run_from,
         passthrough_args=parsed.passthrough_args,
         save_results_to=parsed.save_results_to,
         typeshed=parsed.typeshed,

tools/pysa_integration_tests/runner_lib.py

@@ -58,6 +58,13 @@ class ExitCode(enum.IntEnum):
     TEST_MODEL_VERIFICATION_ERROR = 31
 
 
+class RunFrom(enum.Enum):
+    PYRE_IN_PATH = "pyre-in-path"
+    PYTHON_PACKAGE = "python-package"
+    INTERNAL_BUCK = "internal-buck"
+    OSS_BUCK = "oss-buck"
+
+
 def is_test_function(define: str, code: int) -> bool:
     return f"test_{code}_" in define
 
@@ -209,8 +216,7 @@ def run_pysa(
     isolation_prefix: Optional[str] = None,
     repository_root: Optional[Path] = None,
     excludes: Optional[Sequence[str]] = None,
-    run_from_source: bool = False,
-    run_from_buck: bool = False,
+    run_from: RunFrom = RunFrom.PYRE_IN_PATH,
     typeshed: Optional[Path] = None,
     compact_ocaml_heap: bool = False,
     check_invariants: bool = False,
@@ -225,20 +231,29 @@ def run_pysa(
     skip_buck_dependencies: bool = False,
 ) -> str:
     """Run pysa for the given test and produce a list of errors in JSON."""
-    if run_from_source:
+    if run_from == RunFrom.PYRE_IN_PATH:
+        command = ["pyre"]
+    elif run_from == RunFrom.PYTHON_PACKAGE:
         command = [
             "python",
             "-mpyre-check.client.pyre",
         ]
-    elif run_from_buck:
+    elif run_from == RunFrom.INTERNAL_BUCK:
         command = [
             "buck",
             "run",
             "fbcode//tools/pyre/facebook/client:pysa",
             "--",
         ]
+    elif run_from == RunFrom.OSS_BUCK:
+        command = [
+            "buck",
+            "run",
+            "fbcode//tools/pyre/client:pyre",
+            "--",
+        ]
     else:
-        command = ["pyre"]
+        raise ValueError(f"Unexpected run_from value: {run_from}")
 
     command.append("--noninteractive")