paasta-tools 1.22.0__tar.gz → 1.36.11__tar.gz

{paasta_tools-1.22.0/paasta_tools.egg-info → paasta_tools-1.36.11}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.22.0
+Version: 1.36.11
 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
@@ -22,6 +22,7 @@ Requires-Dist: cookiecutter>=1.4.0
 Requires-Dist: croniter
 Requires-Dist: docker
 Requires-Dist: dulwich>=0.17.3
+Requires-Dist: environment-tools
 Requires-Dist: ephemeral-port-reserve>=1.0.1
 Requires-Dist: graphviz
 Requires-Dist: grpcio
@@ -33,7 +34,7 @@ Requires-Dist: ipaddress>=1.0.22
 Requires-Dist: isodate>=0.7.2
 Requires-Dist: jsonschema[format]
 Requires-Dist: kazoo>=2.0.0
-Requires-Dist: kubernetes<26.0.0,>=18.20.0
+Requires-Dist: kubernetes<35.0.0,>=29.0.0
 Requires-Dist: ldap3
 Requires-Dist: manhole
 Requires-Dist: mypy-extensions>=0.3.0
@@ -41,11 +42,11 @@ Requires-Dist: nats-py
 Requires-Dist: nulltype
 Requires-Dist: objgraph
 Requires-Dist: ply
-Requires-Dist: progressbar2>=3.10.0
+Requires-Dist: progressbar2>=4.3.2
 Requires-Dist: prometheus-client
 Requires-Dist: pymesos>=0.2.0
-Requires-Dist: pyramid>=1.8
 Requires-Dist: pyramid-swagger>=2.3.0
+Requires-Dist: pyramid>=2.0.2
 Requires-Dist: pysensu-yelp>=0.3.4
 Requires-Dist: PyStaticConfiguration
 Requires-Dist: python-crontab>=2.1.1
@@ -53,21 +54,26 @@ Requires-Dist: python-dateutil>=2.4.0
 Requires-Dist: python-iptables
 Requires-Dist: pytimeparse>=1.1.0
 Requires-Dist: pytz>=2014.10
-Requires-Dist: requests<2.32.0,>=2.18.4
+Requires-Dist: requests>=2.18.4
 Requires-Dist: requests-cache>=0.4.10
 Requires-Dist: retry
 Requires-Dist: ruamel.yaml
 Requires-Dist: sensu-plugin
-Requires-Dist: service-configuration-lib>=3.3.2
+Requires-Dist: service-configuration-lib>=3.3.8
 Requires-Dist: signalfx
 Requires-Dist: slackclient>=1.2.1
 Requires-Dist: sticht>=1.1.0
 Requires-Dist: syslogmp
-Requires-Dist: task-processing
-Requires-Dist: thriftpy2
 Requires-Dist: transitions
 Requires-Dist: typing-extensions
 Requires-Dist: tzlocal
 Requires-Dist: urllib3
 Requires-Dist: utaw>=0.2.0
 Requires-Dist: wsgicors
+Dynamic: author
+Dynamic: author-email
+Dynamic: license-file
+Dynamic: provides
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/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.22.0"
+__version__ = "1.36.11"

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/paasta_tools/api/api_docs/swagger.json

@@ -2,7 +2,7 @@
     "swagger": "2.0",
     "info": {
         "title": "Paasta API",
-        "version": "1.2.0"
+        "version": "1.3.0"
     },
     "basePath": "/v1",
     "schemes": [
@@ -322,8 +322,14 @@
                                 },
                                 "min_instances": {
                                     "type": "integer",
+                                    "x-nullable": true,
                                     "description": "Minimum number of instances to run"
                                 },
+                                "max_instances": {
+                                    "type": "integer",
+                                    "x-nullable": true,
+                                    "description": "Maximum number of instances to run"
+                                },
                                 "expire_after": {
                                     "type": "number",
                                     "format": "float",
@@ -930,7 +936,15 @@
                         }
                     },
                     "403": {
-                        "description": "Unauthorized to remote-run this service"
+                        "description": "Unauthorized to remote-run this service",
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "reason": {
+                                    "type": "string"
+                                }
+                            }
+                        }
                     },
                     "404": {
                         "description": "Deployment key not found"
@@ -981,7 +995,15 @@
                         }
                     },
                     "403": {
-                        "description": "Unauthorized to remote-run this service"
+                        "description": "Unauthorized to remote-run this service",
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "reason": {
+                                    "type": "string"
+                                }
+                            }
+                        }
                     },
                     "404": {
                         "description": "Service instance not found"
@@ -1037,6 +1059,9 @@
                     "404": {
                         "description": "Service instance not found"
                     },
+                    "409": {
+                        "description": "A pod was found but is currently being terminated"
+                    },
                     "500": {
                         "description": "Failure"
                     }
@@ -1705,17 +1730,24 @@
             "properties": {
                 "min_instances": {
                     "type": "integer",
-                    "description": "Minimum number of instances to run",
-                    "minimum": 1
+                    "x-nullable": true,
+                    "description": "Minimum number of instances to run"
+                },
+                "max_instances": {
+                    "type": "integer",
+                    "x-nullable": true,
+                    "description": "Maximum number of instances to run"
                 },
                 "expire_after": {
                     "type": "number",
                     "format": "float",
-                    "description": "Unix timestamp when this override is no longer valid"
+                    "description": "Unix timestamp when this override is no longer valid",
+                    "minimum": 1
                 }
             },
             "required": [
                 "min_instances",
+                "max_instances",
                 "expire_after"
             ]
         },
@@ -1756,6 +1788,11 @@
         "KubernetesVersion": {
             "type": "object",
             "properties": {
+                "container_port": {
+                    "description": "Port the container is expecting to receive traffic on",
+                    "type": "integer",
+                    "format": "int32"
+                },
                 "type": {
                     "description": "Type of version (ReplicaSet or ControllerRevision)",
                     "type": "string"
@@ -2292,6 +2329,9 @@
                 },
                 "toolbox": {
                     "type": "boolean"
+                },
+                "command": {
+                    "type": "string"
                 }
             },
             "required": [

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/paasta_tools/api/tweens/auth.py

@@ -77,7 +77,8 @@ class AuthTweenFactory:
         method: str,
         service: Optional[str],
     ) -> AuthorizationOutcome:
-        """Check if API request is authorized
+        """
+        Check if API request is authorized
 
         :param str path: API path
         :param str token: authentication token

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/paasta_tools/api/views/autoscaler.py

@@ -136,7 +136,7 @@ def set_autoscaling_override(request):
     Required parameters:
     - service: The service name
     - instance: The instance name
-    - min_instances: The minimum number of instances to enforce
+    - min_instances AND/OR max_instances: The minimum and/or maximum number of instances to enforce
     - expires_after: unix timestamp after which the override is no longer valid
     """
     service = request.swagger_data.get("service")
@@ -156,24 +156,29 @@ def set_autoscaling_override(request):
 
     json_body = request.swagger_data.get("json_body", {})
     min_instances_override = json_body.get("min_instances")
-    expire_after = json_body.get("expire_after")
+    max_instances_override = json_body.get("max_instances")
+    expire_after = json_body["expire_after"]
 
-    if not isinstance(min_instances_override, int) or min_instances_override < 1:
-        raise ApiFailure("min_instances must be a positive integer", 400)
+    # ideally we'd enforce this in our api spec - but since we're using both swagger and oapi, that's not quite so simple
+    if not min_instances_override and not max_instances_override:
+        raise ApiFailure(
+            "At least one of min_instances or max_instances must be provided", 400
+        )
 
-    if not expire_after:
-        raise ApiFailure("expire_after is required", 400)
+    # we can't currently enforce this in the API spec since the generator seems to have issues generating a validator
+    # for a nullable integer field with a minimum value as we get errors like:
+    # `TypeError: '<' not supported between instances of 'NoneType' and 'int'`
+    # that said, unless someone is manually crafting requests, this should never happen
+    # since the CLI includes a check for this as well
+    if min_instances_override is not None and min_instances_override < 1:
+        raise ApiFailure("min_instances must be a positive integer", 400)
+    if max_instances_override is not None and max_instances_override < 1:
+        raise ApiFailure("max_instances must be a positive integer", 400)
 
-    max_instances = instance_config.get_max_instances()
-    if max_instances is None:
+    # otherwise, we could have folks accidentally enable autoscaling (using cpu) for a non-autoscaled
+    if instance_config.is_autoscaling_enabled() is None:
         raise ApiFailure(f"Autoscaling is not enabled for {service}.{instance}", 400)
 
-    if max_instances < min_instances_override:
-        raise ApiFailure(
-            f"min_instances ({min_instances_override}) cannot be greater than max_instances ({max_instances})",
-            400,
-        )
-
     configmap, created = get_or_create_autoscaling_overrides_configmap()
     if created:
         log.info("Created new autoscaling overrides ConfigMap")
@@ -182,23 +187,54 @@ def set_autoscaling_override(request):
     if not configmap.data:
         configmap.data = {}
 
-    override_data = {
-        "min_instances": min_instances_override,
-        "created_at": datetime.now(timezone.utc).isoformat(),
-        # NOTE: we may want to also allow setting a max_instances override in the future, but if we do that
-        # we'd probably want to force folks to either set one or both and share the same expiration time
-        "expire_after": expire_after,
-    }
-
     service_instance = f"{service}.{instance}"
     existing_overrides = (
         json.loads(configmap.data[service_instance])
         if service_instance in configmap.data
         else {}
     )
-    merged_overrides = {**existing_overrides, **override_data}
+
+    # this is slightly funky as there's a hierarchy of what value to pick:
+    # 1. the override value provided in the request - as this should override any existing value
+    # 2. the existing override value in the configmap - this is used if we previously only set an override for min or
+    #    max instances and now want to set a value for the other
+    # 3. the value from the instance config - this is used as a final fallback since this means no override is present
+    min_instances = (
+        min_instances_override
+        or existing_overrides.get("min_instances")
+        or instance_config.get_min_instances()
+    )
+    max_instances = (
+        max_instances_override
+        or existing_overrides.get("max_instances")
+        or instance_config.get_max_instances()
+    )
+
+    # NOTE: the max_instances check is unnecessary here, but type-checkers can't see that the is_autoscaling_enabled()
+    # check above ensures that max_instances is not None
+    if max_instances is None or max_instances < min_instances:
+        raise ApiFailure(
+            f"min_instances ({min_instances_override}) cannot be greater than max_instances ({max_instances})",
+            400,
+        )
+
+    override_data = {
+        "min_instances": min_instances_override,
+        "max_instances": max_instances_override,
+        "created_at": datetime.now(timezone.utc).isoformat(),
+        "expire_after": expire_after,
+    }
+
+    # NOTE: we need to strip out null values from the incoming overrides since otherwise we'd remove existing overrides
+    # (since if only --set-min or --set-max is provided, the other will be sent as None)
+    merged_overrides = {
+        **existing_overrides,
+        **{k: v for k, v in override_data.items() if v is not None},
+    }
     serialized_overrides = json.dumps(merged_overrides)
 
+    # note: we can only append with patching - if we ever want to remove overrides outside of the cleanup cronjob,
+    # we would need to change this to use replace_namespaced_configmap
     patch_namespaced_configmap(
         name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
         namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
@@ -213,6 +249,7 @@ def set_autoscaling_override(request):
         "instance": instance,
         "cluster": cluster,
         "min_instances": min_instances_override,
+        "max_instances": max_instances_override,
         "expire_after": expire_after,
         "status": "SUCCESS",
     }

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/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.22.0 → paasta_tools-1.36.11}/paasta_tools/api/views/remote_run.py

@@ -35,6 +35,7 @@ def view_remote_run_start(request):
     interactive = request.swagger_data["json_body"].get("interactive", True)
     recreate = request.swagger_data["json_body"].get("recreate", False)
     is_toolbox = request.swagger_data["json_body"].get("toolbox", False)
+    command = request.swagger_data["json_body"].get("command", None)
     max_duration = min(
         request.swagger_data["json_body"].get("max_duration", DEFAULT_MAX_DURATION),
         get_max_job_duration_limit(),
@@ -49,6 +50,7 @@ def view_remote_run_start(request):
             recreate=recreate,
             max_duration=max_duration,
             is_toolbox=is_toolbox,
+            command=command,
         )
     except Exception:
         error_message = traceback.format_exc()

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/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.22.0 → paasta_tools-1.36.11}/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.22.0 → paasta_tools-1.36.11}/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.22.0 → paasta_tools-1.36.11}/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.36.11/paasta_tools/cleanup_expired_autoscaling_overrides.py

@@ -0,0 +1,155 @@
+import argparse
+import json
+import logging
+import sys
+import time
+from datetime import datetime
+from datetime import timezone
+
+from kubernetes.client.rest import ApiException
+
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAME
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE
+from paasta_tools.kubernetes_tools import get_namespaced_configmap
+from paasta_tools.kubernetes_tools import KubeClient
+from paasta_tools.kubernetes_tools import replace_namespaced_configmap
+
+log = logging.getLogger(__name__)
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description=f"Clean up expired entries from the {AUTOSCALING_OVERRIDES_CONFIGMAP_NAME} configmap"
+    )
+    parser.add_argument(
+        "--dry-run",
+        dest="dry_run",
+        action="store_true",
+        help="Print entries to be removed instead of removing them",
+    )
+    parser.add_argument(
+        "-v", "--verbose", dest="verbose", action="store_true", default=False
+    )
+    args = parser.parse_args()
+    return args
+
+
+def setup_logging(verbose):
+    level = logging.DEBUG if verbose else logging.INFO
+    logging.basicConfig(level=level)
+    # silence kubernetes client metadata logs since debug ones are pretty noisy
+    logging.getLogger("kubernetes.client.rest").setLevel(logging.ERROR)
+
+
+def main():
+    args = parse_args()
+    setup_logging(args.verbose)
+
+    kube_client = KubeClient()
+
+    try:
+        configmap = get_namespaced_configmap(
+            name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
+            namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
+            kube_client=kube_client,
+        )
+    except ApiException as e:
+        if e.status == 404:
+            log.debug(
+                f"ConfigMap {AUTOSCALING_OVERRIDES_CONFIGMAP_NAME} not found, nothing to clean up"
+            )
+            sys.exit(0)
+        else:
+            log.error(f"Error retrieving ConfigMap: {e}")
+            sys.exit(1)
+
+    if configmap is None:
+        log.debug(
+            f"ConfigMap {AUTOSCALING_OVERRIDES_CONFIGMAP_NAME} not found, nothing to clean up"
+        )
+        sys.exit(0)
+
+    if not configmap.data:
+        log.debug("ConfigMap has no data, nothing to clean up")
+        sys.exit(0)
+
+    current_timestamp = (
+        time.time()
+    )  # we'll fix the comparison time to the start of the script execution
+    expired_entries = []  # used just for logging
+    unexpired_data = {}  # used to replace the existing configmap data
+
+    log.debug(f"Current timestamp: {current_timestamp}")
+    for service_instance, override_json in configmap.data.items():
+        log.debug(f"Processing entry for {service_instance}")
+
+        try:
+            override_data = json.loads(override_json)
+        except json.JSONDecodeError:
+            log.exception(
+                f"Failed to parse JSON for {service_instance}, removing entry"
+            )
+            expired_entries.append(service_instance)
+            continue
+
+        if "expire_after" not in override_data:
+            log.warning(
+                f"Entry for {service_instance} missing expire_after field, removing entry"
+            )
+            expired_entries.append(service_instance)
+            continue
+
+        try:
+            expire_after = float(override_data["expire_after"])
+        except (ValueError, TypeError):
+            log.exception(
+                f"Failed to parse expire_after for {service_instance}, removing entry"
+            )
+            expired_entries.append(service_instance)
+            continue
+
+        if current_timestamp > expire_after:
+            expire_datetime = datetime.fromtimestamp(expire_after, tz=timezone.utc)
+            log.debug(
+                f"Entry for {service_instance} expired at {expire_after} ({expire_datetime})"
+            )
+            expired_entries.append(service_instance)
+        else:
+            expire_datetime = datetime.fromtimestamp(expire_after, tz=timezone.utc)
+            log.debug(
+                f"Entry for {service_instance} expires at {expire_after} ({expire_datetime}), keeping"
+            )
+            unexpired_data[service_instance] = override_json
+
+    if not expired_entries:
+        log.info("No expired entries found")
+        sys.exit(0)
+
+    if args.dry_run:
+        log.info(
+            "Would have removed the following expired entries:\n "
+            + "\n ".join(expired_entries)
+        )
+        sys.exit(0)
+
+    try:
+        configmap.data = (
+            unexpired_data  # naughtily re-use the existing configmap object
+        )
+        replace_namespaced_configmap(  # NOTE: this is not a patch since you cannot currently remove entries in a patch
+            name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
+            namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
+            body=configmap,
+            kube_client=kube_client,
+        )
+        log.info(
+            f"Successfully removed {len(expired_entries)} expired entries:\n "
+            + "\n ".join(expired_entries)
+        )
+    except ApiException as e:
+        log.error(f"Failed to update ConfigMap: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

{paasta_tools-1.22.0 → paasta_tools-1.36.11}/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)