paasta-tools 1.30.8__tar.gz → 1.30.10__tar.gz

{paasta_tools-1.30.8/paasta_tools.egg-info → paasta_tools-1.30.10}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.30.8
+Version: 1.30.10
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com
 Provides: paasta_tools
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 License-File: LICENSE
 Requires-Dist: a-sync>=0.5.0
 Requires-Dist: aiohttp>=3.5.4

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.30.8"
+__version__ = "1.30.10"

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/api/views/instance.py

@@ -26,6 +26,7 @@ from typing import Mapping
 from typing import Optional
 
 import a_sync
+from pyramid.request import Request
 from pyramid.response import Response
 from pyramid.view import view_config
 
@@ -139,7 +140,10 @@ def no_configuration_for_service_message(cluster, service, instance):
 @view_config(
     route_name="service.instance.status", request_method="GET", renderer="json"
 )
-def instance_status(request):
+def instance_status(
+    request: Request,
+) -> dict[str, Any]:  # godspeed to anyone typing the retval here
+    # NOTE: swagger_data is populated by pyramid_swagger
     service = request.swagger_data.get("service")
     instance = request.swagger_data.get("instance")
     verbose = request.swagger_data.get("verbose") or 0
@@ -353,7 +357,10 @@ def get_deployment_version(
     request_method="GET",
     renderer="json",
 )
-def instance_mesh_status(request):
+def instance_mesh_status(
+    request: Request,
+) -> dict[str, Any]:  # godspeed to anyone typing the retval here
+    # NOTE: swagger_data is populated by pyramid_swagger
     service = request.swagger_data.get("service")
     instance = request.swagger_data.get("instance")
     include_envoy = request.swagger_data.get("include_envoy")

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/async_utils.py

@@ -3,9 +3,11 @@ import functools
 import time
 import weakref
 from collections import defaultdict
+from typing import Any
 from typing import AsyncIterable
 from typing import Awaitable
 from typing import Callable
+from typing import Coroutine
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -97,7 +99,8 @@ async def aiter_to_list(
 def async_timeout(
     seconds: int = 10,
 ) -> Callable[
-    [Callable[..., Awaitable[T]]], Callable[..., Awaitable[T]]  # wrapped  # inner
+    [Callable[..., Coroutine[Any, Any, T]]],
+    Callable[..., Coroutine[Any, Any, T]],  # wrapped  # inner
 ]:
     def outer(wrapped):
         @functools.wraps(wrapped)

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/bounce_lib.py

@@ -42,11 +42,14 @@ BounceMethodResult = TypedDict(
 
 BounceMethod = Callable[
     [
-        Arg(BounceMethodConfigDict, "new_config"),
-        Arg(bool, "new_app_running"),
-        Arg(Collection, "happy_new_tasks"),
-        Arg(Sequence, "old_non_draining_tasks"),
-        DefaultArg(float, "margin_factor"),
+        Arg(
+            BounceMethodConfigDict,
+            "new_config",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        Arg(bool, "new_app_running"),  # noqa: F821  # flake8 false-positive
+        Arg(Collection, "happy_new_tasks"),  # noqa: F821  # flake8 false-positive
+        Arg(Sequence, "old_non_draining_tasks"),  # noqa: F821  # flake8 false-positive
+        DefaultArg(float, "margin_factor"),  # noqa: F821  # flake8 false-positive
     ],
     BounceMethodResult,
 ]

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/check_services_replication_tools.py

@@ -56,10 +56,16 @@ log = logging.getLogger(__name__)
 
 CheckServiceReplication = Callable[
     [
-        Arg(InstanceConfig_T, "instance_config"),
-        Arg(Dict[str, Dict[str, List[V1Pod]]], "pods_by_service_instance"),
-        Arg(Any, "replication_checker"),
-        NamedArg(bool, "dry_run"),
+        Arg(
+            InstanceConfig_T,
+            "instance_config",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        Arg(
+            Dict[str, Dict[str, List[V1Pod]]],
+            "pods_by_service_instance",  # noqa: F821  # flake8 false-positive
+        ),
+        Arg(Any, "replication_checker"),  # noqa: F821  # flake8 false-positive
+        NamedArg(bool, "dry_run"),  # noqa: F821  # flake8 false-positive
     ],
     Optional[bool],
 ]

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/check_spark_jobs.py

@@ -124,7 +124,7 @@ def format_framework(info):
 def format_message_for_service(service, frameworks):
     output = f"Found the following long-running Spark frameworks associated with service {service}.\n"
     output += (
-        f"Please check why they are still running and terminate if appropriate.\n\n"
+        "Please check why they are still running and terminate if appropriate.\n\n"
     )
     output += "\n".join(format_framework(f) for f in frameworks)
     return output

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cli.py

@@ -68,7 +68,7 @@ class PrintsHelpOnErrorArgumentParser(argparse.ArgumentParser):
 def list_external_commands():
     p = subprocess.check_output(["/bin/bash", "-p", "-c", "compgen -A command paasta-"])
     lines = p.decode("utf-8").strip().split("\n")
-    return {l.replace("paasta-", "", 1) for l in lines}
+    return {line.replace("paasta-", "", 1) for line in lines}
 
 
 def calling_external_command():
@@ -132,10 +132,10 @@ PAASTA_SUBCOMMANDS = {
 }
 
 
-def get_argparser(commands=None):
+def get_argparser(commands: list[str] | None = None) -> argparse.ArgumentParser:
     """Create and return argument parser for a set of subcommands.
 
-    :param commands: Union[None, List[str]] If `commands` argument is `None`,
+    :param commands: list[str] | None: If `commands` argument is `None`,
     add full parsers for all subcommands, if `commands` is empty list -
     add thin parsers for all subcommands, otherwise - add full parsers for
     subcommands in the argument.
@@ -170,7 +170,7 @@ def get_argparser(commands=None):
 
     # Adding a separate help subparser allows us to respond to "help" without --help
     help_parser = subparsers.add_parser(
-        "help", help=f"run `paasta <subcommand> -h` for help"
+        "help", help="run `paasta <subcommand> -h` for help"
     )
     help_parser.set_defaults(command=None)
 

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/logs.py

@@ -30,6 +30,7 @@ from typing import Callable
 from typing import ContextManager
 from typing import Dict
 from typing import Iterable
+from typing import Iterator
 from typing import List
 from typing import Mapping
 from typing import MutableSequence
@@ -52,10 +53,31 @@ try:
 except ImportError:
     scribereader = None
 
+# NOTE: this is an internal-only package, so we won't be able to typecheck against it with mypy
+# without these hacky inlined stubs
 try:
     from logreader.readers import S3LogsReader
+
+    s3reader_available = True
 except ImportError:
-    S3LogsReader = None
+    s3reader_available = False
+
+    class S3LogsReader:  # type: ignore[no-redef]  # stub class for internal-only package
+        def __init__(self, superregion: str) -> None:
+            raise ImportError(
+                "logreader (internal Yelp package) is not available - unable to display logs."
+            )
+
+        def get_log_reader(
+            self,
+            log_name: str,
+            start_datetime: datetime.datetime,
+            end_datetime: datetime.datetime,
+        ) -> Iterator[str]:
+            raise NotImplementedError(
+                "logreader (internal Yelp package) is not available - unable to display logs."
+            )
+
 
 from pytimeparse.timeparse import timeparse
 
@@ -156,7 +178,7 @@ def add_subparser(subparsers) -> None:
         dest="soa_dir",
         metavar="SOA_DIR",
         default=DEFAULT_SOA_DIR,
-        help=f"Define a different soa config directory. Defaults to %(default)s.",
+        help="Define a different soa config directory. Defaults to %(default)s.",
     )
 
     status_parser.add_argument(
@@ -1174,7 +1196,7 @@ class VectorLogsReader(LogReader):
     ) -> None:
         super().__init__()
 
-        if S3LogsReader is None:
+        if not s3reader_available:
             raise Exception("yelp_clog package must be available to use S3LogsReader")
 
         self.cluster_map = cluster_map
@@ -1226,16 +1248,16 @@ class VectorLogsReader(LogReader):
                 except ValueError:
                     timestamp = pytz.utc.localize(datetime.datetime.min)
 
-                line = {"raw_line": line, "sort_key": timestamp}
-                aggregated_logs.append(line)
+                formatted_line = {"raw_line": line, "sort_key": timestamp}
+                aggregated_logs.append(formatted_line)
 
         aggregated_logs = list(
             {line["raw_line"]: line for line in aggregated_logs}.values()
         )
         aggregated_logs.sort(key=lambda log_line: log_line["sort_key"])
 
-        for line in aggregated_logs:
-            print_log(line["raw_line"], levels, raw_mode, strip_headers)
+        for formatted_line in aggregated_logs:
+            print_log(formatted_line["raw_line"], levels, raw_mode, strip_headers)
 
     def tail_logs(
         self,

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/mark_for_deployment.py

@@ -1157,7 +1157,7 @@ class MarkForDeploymentProcess(RollbackSlackDeploymentProcess):
 
     def on_enter_deploy_errored(self) -> None:
         report_waiting_aborted(self.service, self.deploy_group)
-        self.update_slack_status(f"Deploy aborted, but it will still try to converge.")
+        self.update_slack_status("Deploy aborted, but it will still try to converge.")
         self.send_manual_rollback_instructions()
         if self.deploy_group_is_set_to_notify("notify_after_abort"):
             self.ping_authors("Deploy errored")
@@ -1317,7 +1317,7 @@ class MarkForDeploymentProcess(RollbackSlackDeploymentProcess):
         inactive_button_texts = {
             "forward": f"Continue Forward to {version_short_str} :arrow_forward:",
             "complete": f"Complete deploy to {version_short_str} :white_check_mark:",
-            "snooze": f"Reset countdown",
+            "snooze": "Reset countdown",
             "enable_auto_rollbacks": "Enable auto rollbacks :eyes:",
             "disable_auto_rollbacks": "Disable auto rollbacks :close_eyes_monkey:",
         }

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/mesh_status.py

@@ -124,7 +124,7 @@ def paasta_mesh_status_on_api_endpoint(
             [PaastaColors.red(f"Could not connect to API: {exc.__class__.__name__}")],
         )
     except Exception as e:
-        output = [PaastaColors.red(f"Exception when talking to the API:")]
+        output = [PaastaColors.red("Exception when talking to the API:")]
         output.extend(str(e).split("\n"))
         return 1, output
 

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/remote_run.py

@@ -116,7 +116,7 @@ def paasta_remote_run_copy(
     )
     if poll_response.status != 200:
         print(
-            f"Unable to find running remote-run pod: have you started one with `paasta remote-run start`?"
+            "Unable to find running remote-run pod: have you started one with `paasta remote-run start`?"
         )
         return 1
 

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/rollback.py

@@ -340,7 +340,7 @@ def paasta_rollback(args: argparse.Namespace) -> int:
         )
         print(
             PaastaColors.yellow(
-                f"WARNING: Failing to do so means that Jenkins will redeploy the latest code on the next scheduled build!"
+                "WARNING: Failing to do so means that Jenkins will redeploy the latest code on the next scheduled build!"
             )
         )
 

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/spark_run.py

@@ -902,15 +902,15 @@ def configure_and_run_docker_container(
         environment["YELP_SVC_AUTHZ_TOKEN"] = get_service_auth_token()
 
     webui_url = get_webui_url(spark_conf["spark.ui.port"])
-    webui_url_msg = PaastaColors.green(f"\nSpark monitoring URL: ") + f"{webui_url}\n"
+    webui_url_msg = PaastaColors.green("\nSpark monitoring URL: ") + f"{webui_url}\n"
 
     docker_cmd = get_docker_cmd(args, instance_config, spark_conf_str)
     if "history-server" in docker_cmd:
-        print(PaastaColors.green(f"\nSpark history server URL: ") + f"{webui_url}\n")
+        print(PaastaColors.green("\nSpark history server URL: ") + f"{webui_url}\n")
     elif any(c in docker_cmd for c in ["pyspark", "spark-shell", "spark-submit"]):
         grafana_url = get_grafana_url(spark_conf)
         dashboard_url_msg = (
-            PaastaColors.green(f"\nGrafana dashboard: ") + f"{grafana_url}\n"
+            PaastaColors.green("\nGrafana dashboard: ") + f"{grafana_url}\n"
         )
         print(webui_url_msg)
         print(dashboard_url_msg)

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/status.py

@@ -123,12 +123,15 @@ DEPLOYMENT_INSTANCE_CONFIG: Sequence[Type[InstanceConfig]] = [
 
 InstanceStatusWriter = Callable[
     [
-        Arg(str, "cluster"),
-        Arg(str, "service"),
-        Arg(str, "instance"),
-        Arg(List[str], "output"),
+        Arg(
+            str,
+            "cluster",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        Arg(str, "service"),  # noqa: F821  # flake8 false-positive
+        Arg(str, "instance"),  # noqa: F821  # flake8 false-positive
+        Arg(List[str], "output"),  # noqa: F821  # flake8 false-positive
         Arg(Any),
-        Arg(int, "verbose"),
+        Arg(int, "verbose"),  # noqa: F821  # flake8 false-positive
     ],
     int,
 ]
@@ -328,7 +331,7 @@ def paasta_status_on_api_endpoint(
         )
         return 1
     except Exception as e:
-        output.append(PaastaColors.red(f"Exception when talking to the API:"))
+        output.append(PaastaColors.red("Exception when talking to the API:"))
         output.append(str(e))
         return 1
 
@@ -528,7 +531,7 @@ def get_smartstack_status_human(
 
     output = ["Smartstack:"]
     output.append(f"  Haproxy Service Name: {registration}")
-    output.append(f"  Backends:")
+    output.append("  Backends:")
     for location in locations:
         backend_status = haproxy_backend_report(
             expected_backends_per_location, location.running_backends_count
@@ -586,7 +589,7 @@ def get_envoy_status_human(
 
     output = ["Envoy:"]
     output.append(f"  Service Name: {registration}")
-    output.append(f"  Backends:")
+    output.append("  Backends:")
     for location in locations:
         backend_status = envoy_backend_report(
             expected_backends_per_location, location.running_backends_count
@@ -829,7 +832,7 @@ def _print_flink_status_from_job_manager(
                 service=service, instance=instance, client=client
             )
         except Exception as e:
-            output.append(PaastaColors.red(f"Exception when talking to the API:"))
+            output.append(PaastaColors.red("Exception when talking to the API:"))
             output.append(str(e))
             return 1
 
@@ -858,7 +861,7 @@ def _print_flink_status_from_job_manager(
         output.append(f"{OUTPUT_HORIZONTAL_RULE}")
 
         # Print Flink Log Commands
-        output.append(f"    Flink Log Commands:")
+        output.append("    Flink Log Commands:")
         output.append(
             f"      Service:     paasta logs -a 1h -c {cluster} -s {service} -i {instance}"
         )
@@ -875,7 +878,7 @@ def _print_flink_status_from_job_manager(
         output.append(f"{OUTPUT_HORIZONTAL_RULE}")
 
         # Print Flink Metrics Links
-        output.append(f"    Flink Monitoring:")
+        output.append("    Flink Monitoring:")
         output.append(
             f"      Job Metrics: https://grafana.yelpcorp.com/d/flink-metrics/flink-job-metrics?orgId=1&var-datasource=Prometheus-flink&var-region=uswest2-{ecosystem}&var-service={service}&var-instance={instance}&var-job=All&from=now-24h&to=now"
         )
@@ -1316,7 +1319,7 @@ def get_version_table_entry(
                 (state, pod) for state, pod in replica_states if state.is_unhealthy()
             ]
             if unhealthy_replicas:
-                entry.append(f"    Unhealthy Replicas:")
+                entry.append("    Unhealthy Replicas:")
                 replica_table = create_replica_table(
                     unhealthy_replicas, service, instance, cluster, verbose
                 )
@@ -1523,7 +1526,7 @@ def create_replica_table(
                             f"  OOM Killed {human_oom_kill_timestamp} ({oom_kill_timestamp})."
                         ),
                         PaastaColors.red(
-                            f"    Check y/check-oom-events and consider increasing memory in yelpsoa_configs"
+                            "    Check y/check-oom-events and consider increasing memory in yelpsoa_configs"
                         ),
                     ]
                 )
@@ -1587,7 +1590,7 @@ def create_replica_table(
         elif state == ReplicaState.UNKNOWN:
             table.append(
                 PaastaColors.red(
-                    f"  Cannot determine pod state, please try again. If you continue to see this state, please contact #paasta"
+                    "  Cannot determine pod state, please try again. If you continue to see this state, please contact #paasta"
                 )
             )
     return format_table(table)
@@ -1607,7 +1610,7 @@ def get_autoscaling_table(
         table.append(f"       Last scale time: {autoscaling_status['last_scale_time']}")
         NA = PaastaColors.red("N/A")
         if len(autoscaling_status["metrics"]) > 0:
-            table.append(f"       Metrics:")
+            table.append("       Metrics:")
 
         metrics_table: List[List[str]] = [["Metric", "Current", "Target"]]
         for metric in autoscaling_status["metrics"]:
@@ -1695,10 +1698,10 @@ def print_kubernetes_status(
         output.append(
             f"       Last scale time: {autoscaling_status['last_scale_time']}"
         )
-        output.append(f"       Dashboard: y/was-it-the-autoscaler")
+        output.append("       Dashboard: y/was-it-the-autoscaler")
         NA = PaastaColors.red("N/A")
         if len(autoscaling_status["metrics"]) > 0:
-            output.append(f"       Metrics:")
+            output.append("       Metrics:")
 
         metrics_table: List[List[str]] = [["Metric", "Current", "Target"]]
         for metric in autoscaling_status["metrics"]:
@@ -2201,15 +2204,15 @@ def apply_args_filters(
         if args.service or args.instances:
             print(
                 PaastaColors.red(
-                    f"Invalid command. Do not include optional arguments -s or -i "
-                    f"when using shorthand notation."
+                    "Invalid command. Do not include optional arguments -s or -i "
+                    "when using shorthand notation."
                 )
             )
             return clusters_services_instances
         if "." in args.service_instance:
             args.service, args.instances = args.service_instance.split(".", 1)
         else:
-            print(PaastaColors.red(f'Use a "." to separate service and instance name'))
+            print(PaastaColors.red('Use a "." to separate service and instance name'))
             return clusters_services_instances
     if args.service:
         try:
@@ -2221,7 +2224,7 @@ def apply_args_filters(
                 args.service, all_services, n=5, cutoff=0.5
             )
             if suggestions:
-                print(PaastaColors.red(f"Did you mean any of these?"))
+                print(PaastaColors.red("Did you mean any of these?"))
                 for suggestion in suggestions:
                     print(PaastaColors.red(f"  {suggestion}"))
             return clusters_services_instances

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/cmds/validate.py

@@ -573,7 +573,7 @@ def validate_paasta_objects(service_path):
         errors = "\n".join(messages)
         print(failure((f"There were failures validating {service}: {errors}"), ""))
     else:
-        print(success(f"All PaaSTA Instances for are valid for all clusters"))
+        print(success("All PaaSTA Instances for are valid for all clusters"))
 
     return returncode
 
@@ -741,7 +741,7 @@ def validate_autoscaling_configs(service_path: str) -> bool:
                             and configured_provider_count > 1
                         ):
                             raise AutoscalingValidationError(
-                                f"cannot use bespoke autoscaling with HPA autoscaling"
+                                "cannot use bespoke autoscaling with HPA autoscaling"
                             )
                         if metrics_provider["type"] in seen_provider_types:
                             raise AutoscalingValidationError(
@@ -808,7 +808,7 @@ def validate_autoscaling_configs(service_path: str) -> bool:
                             ):
                                 link = "y/override-cpu-autotune"
                                 raise AutoscalingValidationError(
-                                    f"CPU override detected for a CPU-autoscaled instance; "
+                                    "CPU override detected for a CPU-autoscaled instance; "
                                     "see the following link for next steps:"
                                 )
                     except AutoscalingValidationError as e:

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/cli/utils.py

@@ -26,6 +26,7 @@ import socket
 import subprocess
 from collections import defaultdict
 from shlex import quote
+from typing import Any
 from typing import Callable
 from typing import Collection
 from typing import Generator
@@ -378,7 +379,7 @@ def list_service_instances(soa_dir: str = DEFAULT_SOA_DIR):
     return the_list
 
 
-def list_instances(**kwargs):
+def list_instances(**kwargs: Any) -> list[str]:
     """Returns a sorted list of all possible instance names
     for tab completion. We try to guess what service you might be
     operating on, otherwise we just provide *all* of them
@@ -597,42 +598,54 @@ def get_jenkins_build_output_url():
 
 InstanceListerSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(Optional[str], "cluster"),
-        NamedArg(str, "instance_type"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(Optional[str], "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "instance_type"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     List[Tuple[str, str]],
 ]
 
 InstanceLoaderSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(str, "instance"),
-        NamedArg(str, "cluster"),
-        NamedArg(bool, "load_deployments"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(str, "instance"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(bool, "load_deployments"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     InstanceConfig,
 ]
 
 LongRunningServiceListerSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(Optional[str], "cluster"),
-        NamedArg(str, "instance_type"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(Optional[str], "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "instance_type"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     List[Tuple[str, str]],
 ]
 
 LongRunningServiceLoaderSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(str, "instance"),
-        NamedArg(str, "cluster"),
-        NamedArg(bool, "load_deployments"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(str, "instance"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(bool, "load_deployments"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     LongRunningServiceConfig,
 ]

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/contrib/check_orphans.py

@@ -56,7 +56,7 @@ def get_zk_data(ignored_services: Set[str]) -> SmartstackData:
     zk = KazooClient(hosts=zk_hosts)
     zk.start()
 
-    logger.debug(f"pulling smartstack data from zookeeper")
+    logger.debug("pulling smartstack data from zookeeper")
     zk_data = {}
     services = zk.get_children(PREFIX)
     for service in services:

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/contrib/get_running_task_allocation.py

@@ -1,5 +1,6 @@
 #!/opt/venvs/paasta-tools/bin/python
 import argparse
+import json
 import time
 from typing import Any
 from typing import Dict
@@ -12,7 +13,6 @@ from typing import Optional
 from typing import Tuple
 
 import a_sync
-import simplejson as json
 from kubernetes.client import V1Pod
 from kubernetes.client import V1ResourceRequirements
 

{paasta_tools-1.30.8 → paasta_tools-1.30.10}/paasta_tools/instance/kubernetes.py

@@ -1,4 +1,5 @@
 import asyncio
+from asyncio.tasks import Task
 from collections import defaultdict
 from enum import Enum
 from typing import Any
@@ -1156,7 +1157,7 @@ async def kubernetes_status(
 
     # this task is necessary for mesh_status, but most other use cases want
     # just the list of pods
-    pods_task = asyncio.create_task(
+    pods_task: Task[Sequence[V1Pod]] = asyncio.create_task(
         kubernetes_tools.pods_for_service_instance(
             service=job_config.service,
             instance=job_config.instance,