Fixing requirements for certain functions (#385)

* Enforcing API token requirement better.

* Auto-format files

* Version bump.

---------

Co-authored-by: panther-bot-automation <github-service-account-automation@panther.io>

VERSION

@@ -1 +1 @@
-0.30.1
+0.30.2

panther_analysis_tool/constants.py

@@ -18,7 +18,7 @@
 
 PACKAGE_NAME: Final = "panther_analysis_tool"
 
-VERSION_STRING: Final = "0.30.1"
+VERSION_STRING: Final = "0.30.2"
 
 CONFIG_FILE = ".panther_settings.yml"
 DATA_MODEL_LOCATION = "./data_models"

panther_analysis_tool/main.py

@@ -1791,7 +1791,7 @@ def setup_parser() -> argparse.ArgumentParser:
     validate_parser.add_argument(filter_name, **filter_arg)
     validate_parser.add_argument(ignore_files_name, **ignore_files_arg)
     validate_parser.add_argument(path_name, **path_arg)
-    validate_parser.set_defaults(func=pat_utils.func_with_backend(validate.run))
+    validate_parser.set_defaults(func=pat_utils.func_with_api_backend(validate.run))
 
     # -- zip command
 
@@ -1871,7 +1871,7 @@ def setup_parser() -> argparse.ArgumentParser:
         help="Required if the rule supports multiple log types, optional otherwise. Must be one of the rule's log"
         " types.",
     )
-    benchmark_parser.set_defaults(func=pat_utils.func_with_backend(benchmark.run))
+    benchmark_parser.set_defaults(func=pat_utils.func_with_api_backend(benchmark.run))
 
     # -- enrich-test-data command
     enrich_test_data_parser = subparsers.add_parser(

panther_analysis_tool/util.py

@@ -113,6 +113,12 @@ def get_client(aws_profile: str, service: str) -> boto3.client:
     return client
 
 
+def func_with_api_backend(
+    func: Callable[[BackendClient, argparse.Namespace], Any]
+) -> Callable[[argparse.Namespace], Tuple[int, str]]:
+    return lambda args: func(get_api_backend(args), args)
+
+
 def func_with_backend(
     func: Callable[[BackendClient, argparse.Namespace], Any]
 ) -> Callable[[argparse.Namespace], Tuple[int, str]]:
@@ -136,6 +142,15 @@ def get_optional_backend(args: argparse.Namespace) -> Optional[BackendClient]:
     return None
 
 
+def get_api_backend(args: argparse.Namespace) -> BackendClient:
+    if not args.api_token:
+        raise BackendNotFoundException("This function requires an API token. API token not found.")
+
+    return PublicAPIClient(
+        PublicAPIClientOptions(token=args.api_token, user_id=PANTHER_USER_ID, host=args.api_host)
+    )
+
+
 def get_backend(args: argparse.Namespace) -> BackendClient:
     if args.api_token:
         return PublicAPIClient(
@@ -146,16 +161,13 @@ def get_backend(args: argparse.Namespace) -> BackendClient:
 
     datalake_lambda = get_datalake_lambda(args)
 
-    if hasattr(args, "aws_profile") and args.aws_profile is not None:
-        return LambdaClient(
-            LambdaClientOpts(
-                user_id=PANTHER_USER_ID,
-                aws_profile=args.aws_profile,
-                datalake_lambda=datalake_lambda,
-            )
+    return LambdaClient(
+        LambdaClientOpts(
+            user_id=PANTHER_USER_ID,
+            aws_profile=args.aws_profile,
+            datalake_lambda=datalake_lambda,
         )
-
-    raise BackendNotFoundException("Backend not found.")
+    )
 
 
 def get_datalake_lambda(args: argparse.Namespace) -> str: