globus-cli 3.41.0__tar.gz → 3.42.0__tar.gz

{globus_cli-3.41.0 → globus_cli-3.42.0}/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.4
 Name: globus-cli
-Version: 3.41.0
+Version: 3.42.0
 Summary: Globus CLI
 Keywords: globus,cli,command line
 Author-email: Stephen Rosen <sirosen@globus.org>
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-Expression: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
-Requires-Dist: globus-sdk==4.3.0
-Requires-Dist: click>=8.1.4,<8.4
-Requires-Dist: jmespath==1.0.1
+Requires-Dist: globus-sdk==4.8.0
+Requires-Dist: click>=8.4,<8.5
+Requires-Dist: jmespath==1.1.0
 Requires-Dist: packaging>=17.0
 Requires-Dist: typing_extensions>=4.0;python_version<'3.11'
 Requires-Dist: requests>=2.32.3,<3.0.0

{globus_cli-3.41.0 → globus_cli-3.42.0}/changelog.adoc

@@ -2,6 +2,33 @@
 
 // scriv-insert-here
 
+== 3.42.0 (2026-06-10)
+
+Bugfixes:
+
+* `globus api transfer` no longer prepends `/v0.10/` to `/v2/` paths
+
+Enhancements:
+
+* Added Domain field to default output of `globus endpoint search` and `globus endpoint show`
+
+* Added `globus streams tunnel events` command to show tunnel events
+
+* When using table output on narrow terminals, the Globus CLI will now stack
+  table elements in a new "folded table" layout. This behavior is only used
+  when the output device is a TTY. To disable the new output altogether, users
+  can set `GLOBUS_CLI_FOLD_TABLES=0`.
+
+* Added Subscription ID to the text output of `globus group list`
+
+* Added `globus flows registered-api show` command to display details of a registered API
+
+* Added `globus flows registered-api list` command to list registered APIs
+
+Other:
+
+* Removed support for Python 3.9 .
+
 == 3.41.0 (2026-01-14)
 
 Bugfixes:

{globus_cli-3.41.0 → globus_cli-3.42.0}/pyproject.toml

@@ -20,17 +20,19 @@ classifiers = [
     "Intended Audience :: Developers",
     "Operating System :: POSIX",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
-    "globus-sdk==4.3.0",
-    "click>=8.1.4,<8.4",
-    "jmespath==1.0.1",
+    "globus-sdk==4.8.0",
+    # NOTE: `click` does not use semver; minor releases are expected to contain
+    #       minor breaking changes
+    "click>=8.4,<8.5",
+    "jmespath==1.1.0",
     "packaging>=17.0",
     "typing_extensions>=4.0;python_version<'3.11'",
     # these are dependencies of the SDK, but they are used directly in the CLI
@@ -61,7 +63,7 @@ test = [
 ]
 test-mindeps = [
     {include-group = "test"},
-    "click==8.1.8",
+    "click==8.4.0",
     "requests==2.32.4",
     "pyjwt==2.0.0",
     "cryptography==3.3.1",

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/api.py

@@ -10,7 +10,6 @@ import globus_sdk
 from globus_sdk.scopes import ScopeParser
 
 from globus_cli import termio, version
-from globus_cli._click_compat import shim_get_metavar
 from globus_cli.login_manager import LoginManager, is_client_login
 from globus_cli.login_manager.scopes import CLI_SCOPE_REQUIREMENTS
 from globus_cli.parsing import command, endpoint_id_arg, group, mutex_option_group
@@ -20,8 +19,7 @@ from globus_cli.types import AnyCommand, ServiceNameLiteral
 C = t.TypeVar("C", bound=AnyCommand)
 
 
-class QueryParamType(click.ParamType):
-    @shim_get_metavar
+class QueryParamType(click.ParamType[tuple[str, str] | None]):
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return "Key=Value"
 
@@ -33,21 +31,17 @@ class QueryParamType(click.ParamType):
 
     def convert(
         self,
-        value: str | None,
+        value: str,
         param: click.Parameter | None,
         ctx: click.Context | None,
     ) -> tuple[str, str] | None:
-        value = super().convert(value, param, ctx)
-        if value is None:
-            return None
         if "=" not in value:
             self.fail("invalid query param", param=param, ctx=ctx)
         left, right = value.split("=", 1)
         return (left, right)
 
 
-class HeaderParamType(click.ParamType):
-    @shim_get_metavar
+class HeaderParamType(click.ParamType[tuple[str, str] | None]):
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return "Key:Value"
 
@@ -59,13 +53,10 @@ class HeaderParamType(click.ParamType):
 
     def convert(
         self,
-        value: str | None,
+        value: str,
         param: click.Parameter | None,
         ctx: click.Context | None,
     ) -> tuple[str, str] | None:
-        value = super().convert(value, param, ctx)
-        if value is None:
-            return None
         if ":" not in value:
             self.fail("invalid header param", param=param, ctx=ctx)
         left, right = value.split(":", 1)
@@ -172,7 +163,7 @@ def _get_url(service_name: str) -> str:
         "search": "https://search.api.globus.org/",
         "transfer": "https://transfer.api.globus.org/v0.10/",
         "timers": "https://timer.automate.globus.org/",
-        "gcs": "https://$GCS_MANAGER/",
+        "gcs": "https://GCS_MANAGER/",
     }[service_name]
 
 
@@ -324,7 +315,9 @@ def _execute_service_command(
         if path.startswith("/"):
             path = path[1:]
         path = f"/v2/{path}"
-    if isinstance(client, globus_sdk.TransferClient) and not path.startswith("/v0.10/"):
+    if isinstance(client, globus_sdk.TransferClient) and not (
+        path.startswith(("/v0.10/", "/v2/"))
+    ):
         if path.startswith("/"):
             path = path[1:]
         path = f"/v0.10/{path}"
@@ -379,16 +372,26 @@ def build_command(
     )
     hidden: bool = command_name == "timer"
 
+    example_command_name: str = command_name
+    helptext_epilog: str = ""
+    service_title: str = service_name.title()
+
+    if command_name == "gcs":
+        service_title = "GCS"
+        example_command_name = "gcs ENDPOINT_ID"
+        helptext_epilog = "\nWhere GCS_MANAGER is looked up from ENDPOINT_ID."
+
     helptext = f"""\
-Make API calls to Globus {service_name.title()}
+Make API calls to Globus {service_title}
 
 The arguments are an HTTP method name and a path within the service to which the request
 should be made. The path will be joined with the known service URL.
 For example, a call of
 
-    globus api {command_name} GET /foo/bar
+    globus api {example_command_name} GET /foo/bar
 
 sends a 'GET' request to `{_get_url(service_name)}foo/bar`
+{helptext_epilog}
 """
 
     if service_name != "gcs":

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/collection/list.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 import typing as t
 import uuid
 
@@ -12,22 +11,8 @@ from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import Field, display, formatters
 from globus_cli.utils import PagingWrapper
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
 
-# until our minimum click version is 8.2.0+ , we need to handle the fact that
-# click.Choice became a generic in 8.2.0
-# we cannot leave it without a defined type parameter, as we have
-# "no-any-generics" set for mypy
-if t.TYPE_CHECKING:
-    ChoiceType: TypeAlias = click.Choice[str]
-else:
-    ChoiceType = click.Choice
-
-
-class ChoiceSlugified(ChoiceType):
+class ChoiceSlugified(click.Choice[str]):
     """
     Allow either hyphens or underscores, e.g. both 'mapped-collections' or
     'mapped_collections'
@@ -37,10 +22,8 @@ class ChoiceSlugified(ChoiceType):
         return t.cast(type, t.Literal[tuple(self._slugify(c) for c in self.choices)])
 
     def convert(
-        self, value: t.Any, param: click.Parameter | None, ctx: click.Context | None
+        self, value: str, param: click.Parameter | None, ctx: click.Context | None
     ) -> t.Any:
-        if value is None:
-            return None
         return self._slugify(super().convert(value.replace("_", "-"), param, ctx))
 
     def _slugify(self, value: str) -> str:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/endpoint/set_subscription_id.py

@@ -9,7 +9,7 @@ from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import display
 
 
-class SubscriptionIdType(click.ParamType):
+class SubscriptionIdType(click.ParamType[str]):
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
     ) -> str:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/endpoint/show.py

@@ -5,12 +5,14 @@ import click
 from globus_cli.endpointish import Endpointish
 from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
+from globus_cli.services.transfer import DOMAIN_FIELD
 from globus_cli.termio import Field, display, formatters
 
 STANDARD_FIELDS = [
     Field("Display Name", "display_name"),
     Field("ID", "id"),
     Field("Owner", "owner_string"),
+    DOMAIN_FIELD,
     Field("Description", "description", wrap_enabled=True),
     Field("Shareable", "shareable"),
     Field("Keywords", "keywords"),

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/flows/__init__.py

@@ -13,6 +13,8 @@ from globus_cli.parsing import group
         "start": (".start", "start_command"),
         # "run" is a subgroup of commands.
         "run": (".run", "run_command"),
+        # "registered-api" is a subgroup of commands.
+        "registered-api": (".registered_api", "registered_api_command"),
     },
 )
 def flows_command() -> None:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/flows/_common.py

@@ -125,7 +125,9 @@ keywords_option = click.option(
 )
 
 
-class SubscriptionIdType(click.ParamType):
+class SubscriptionIdType(
+    click.ParamType[uuid.UUID | t.Literal["DEFAULT"] | globus_sdk.MissingType]
+):
     name = "SUBSCRIPTION_ID"
 
     def __init__(self, *, omittable: bool = False) -> None:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/flows/_fields.py

@@ -111,3 +111,57 @@ def flow_run_format_fields(
         Field("Run Managers", "run_managers", formatter=csv_principal_list),
         Field("Run Monitors", "run_monitors", formatter=csv_principal_list),
     ]
+
+
+class RegisteredAPIPrincipalFormatter(PrincipalURNFormatter):
+    """A principal formatter which pre-registers all principals for a registered API."""
+
+    def __init__(
+        self, auth_client: globus_sdk.AuthClient, registered_api: dict[str, t.Any]
+    ) -> None:
+        super().__init__(auth_client)
+        roles = registered_api.get("roles", {})
+        self.add_items(*roles.get("owners", ()))
+        self.add_items(*roles.get("administrators", ()))
+        self.add_items(*roles.get("viewers", ()))
+
+
+def registered_api_format_fields(
+    auth_client: globus_sdk.AuthClient,
+    registered_api: dict[str, t.Any],
+) -> list[Field]:
+    """
+    The standard list of fields to render for a registered API resource.
+
+    :param auth_client: An AuthClient, used to resolve principal URNs.
+    :param registered_api: The registered API resource, used to pre-register
+        principals.
+    """
+    principal = RegisteredAPIPrincipalFormatter(auth_client, registered_api)
+    csv_principal_list = formatters.ArrayFormatter(
+        element_formatter=principal,
+        delimiter=", ",
+    )
+
+    return [
+        Field("Registered API ID", "id"),
+        Field("Name", "name"),
+        Field("Description", "description"),
+        Field("Status", "status"),
+        Field("Subscription ID", "subscription_id"),
+        Field("Created At", "created_timestamp", formatter=formatters.Date),
+        Field("Updated At", "updated_timestamp", formatter=formatters.Date),
+        Field("Edited At", "edited_timestamp", formatter=formatters.Date),
+        Field(
+            "Scheduled Deletion",
+            "scheduled_deletion_timestamp",
+            formatter=formatters.Date,
+        ),
+        Field("Owners", "roles.owners", formatter=csv_principal_list),
+        Field("Administrators", "roles.administrators", formatter=csv_principal_list),
+        Field("Viewers", "roles.viewers", formatter=csv_principal_list),
+        Field("Target Type", "target.type"),
+        Field("OpenAPI Version", "target.openapi_version"),
+        Field("Destination Method", "target.destination.method"),
+        Field("Destination URL", "target.destination.url"),
+    ]

globus_cli-3.42.0/src/globus_cli/commands/flows/registered_api/__init__.py

@@ -0,0 +1,12 @@
+from globus_cli.parsing import group
+
+
+@group(
+    "registered-api",
+    lazy_subcommands={
+        "show": (".show", "show_command"),
+        "list": (".list", "list_command"),
+    },
+)
+def registered_api_command() -> None:
+    """Interact with registered APIs in the Globus Flows service."""

globus_cli-3.42.0/src/globus_cli/commands/flows/registered_api/list.py

@@ -0,0 +1,92 @@
+from __future__ import annotations
+
+import typing as t
+
+import click
+import globus_sdk
+from globus_sdk.paging import Paginator
+
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import ColonDelimitedChoiceTuple, command
+from globus_cli.termio import Field, display, formatters
+from globus_cli.utils import PagingWrapper
+
+ROLE_TYPES = ("owner", "administrator", "viewer")
+ORDER_BY_FIELDS = ("id", "name", "created_timestamp", "updated_timestamp")
+
+
+@command("list")
+@click.option(
+    "--filter-role",
+    "filter_roles",
+    type=click.Choice(ROLE_TYPES),
+    help="Filter results by the registered API's role type associated with the caller",
+    multiple=True,
+)
+@click.option(
+    "--orderby",
+    default=("created_timestamp:DESC",),
+    show_default=True,
+    type=ColonDelimitedChoiceTuple(
+        choices=tuple(
+            f"{field}:{order}" for field in ORDER_BY_FIELDS for order in ("ASC", "DESC")
+        ),
+        case_sensitive=False,
+    ),
+    multiple=True,
+    metavar=f"[{'|'.join(ORDER_BY_FIELDS)}]:[ASC|DESC]",
+    help="""
+        Sort results by the given field and ordering.
+        ASC for ascending, DESC for descending.
+
+        This option can be specified multiple times to sort by multiple fields.
+    """,
+)
+@click.option(
+    "--limit",
+    default=25,
+    show_default=True,
+    metavar="N",
+    type=click.IntRange(1),
+    help="The maximum number of results to return.",
+)
+@LoginManager.requires_login("flows")
+def list_command(
+    login_manager: LoginManager,
+    *,
+    filter_roles: tuple[t.Literal["owner", "administrator", "viewer"], ...],
+    orderby: tuple[
+        tuple[
+            t.Literal["id", "name", "created_timestamp", "updated_timestamp"],
+            t.Literal["ASC", "DESC"],
+        ],
+        ...,
+    ],
+    limit: int,
+) -> None:
+    """
+    List registered APIs.
+    """
+    flows_client = login_manager.get_flows_client()
+    paginator = Paginator.wrap(flows_client.list_registered_apis)
+    api_iterator = PagingWrapper(
+        paginator(
+            filter_roles=filter_roles or globus_sdk.MISSING,
+            orderby=",".join(f"{field} {order}" for field, order in orderby),
+        ).items(),
+        json_conversion_key="registered_apis",
+        limit=limit,
+    )
+
+    fields = [
+        Field("Registered API ID", "id"),
+        Field("Name", "name"),
+        Field("Created At", "created_timestamp", formatter=formatters.Date),
+        Field("Updated At", "updated_timestamp", formatter=formatters.Date),
+    ]
+
+    display(
+        api_iterator,
+        fields=fields,
+        json_converter=api_iterator.json_converter,
+    )

globus_cli-3.42.0/src/globus_cli/commands/flows/registered_api/show.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+import uuid
+
+import click
+
+from globus_cli.commands.flows._fields import registered_api_format_fields
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import command
+from globus_cli.termio import display
+
+
+@command("show")
+@click.argument("registered_api_id", type=click.UUID)
+@LoginManager.requires_login("auth", "flows")
+def show_command(login_manager: LoginManager, *, registered_api_id: uuid.UUID) -> None:
+    """
+    Show a registered API.
+    """
+    flows_client = login_manager.get_flows_client()
+
+    res = flows_client.get_registered_api(registered_api_id)
+
+    auth_client = login_manager.get_auth_client()
+    fields = registered_api_format_fields(auth_client, res.data)
+
+    display(res, fields=fields, text_mode=display.RECORD)

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/flows/run/resume.py

@@ -94,13 +94,11 @@ def check_inactive_reason(
             "This run has additional authentication requirements that must be met "
             "in order to resume.",
             gare=gare,
-            epilog=textwrap.dedent(
-                f"""\
+            epilog=textwrap.dedent(f"""\
                 After updating your session, resume the run with
 
                     globus flows run resume --skip-inactive-reason-check {run_id}
-                """
-            ),
+                """),
         )
 
 

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/flows/start.py

@@ -8,7 +8,6 @@ import uuid
 import click
 import globus_sdk
 
-from globus_cli._click_compat import shim_get_metavar
 from globus_cli.commands.flows._common import FlowScopeInjector
 from globus_cli.commands.flows._fields import flow_run_format_fields
 from globus_cli.login_manager import LoginManager
@@ -43,7 +42,6 @@ class ActivityNotificationPolicyType(JSONStringOrFile):
 
     choices = ("INACTIVE", "FAILED", "SUCCEEDED")
 
-    @shim_get_metavar
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return f"[{{{','.join(self.choices)}}}|JSON_FILE|JSON]"
 

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/gcp/create/_common.py

@@ -35,10 +35,8 @@ def _deprecated_verify_warning_callback(
     ctx: click.Context, param: click.Parameter, value: bool | None
 ) -> bool | None:
     if value is not None:
-        print_command_hint(
-            """\
+        print_command_hint("""\
 '--disable-verify/--no-disable-verify' is deprecated
 
-Use the '--verify' option instead."""
-        )
+Use the '--verify' option instead.""")
     return value

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/gcp/set_subscription_id.py

@@ -11,7 +11,7 @@ from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import display
 
 
-class GCPSubscriptionIdType(click.ParamType):
+class GCPSubscriptionIdType(click.ParamType[uuid.UUID | ExplicitNullType]):
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
     ) -> uuid.UUID | ExplicitNullType:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/gcs/endpoint/set_subscription_id.py

@@ -11,7 +11,9 @@ from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import display
 
 
-class GCSSubscriptionIdType(click.ParamType):
+class GCSSubscriptionIdType(
+    click.ParamType[uuid.UUID | t.Literal["DEFAULT"] | ExplicitNullType]
+):
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
     ) -> uuid.UUID | t.Literal["DEFAULT"] | ExplicitNullType:

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/gcs/endpoint/update.py

@@ -7,7 +7,6 @@ import uuid
 import click
 import globus_sdk
 
-from globus_cli._click_compat import shim_get_metavar
 from globus_cli.commands.gcs.endpoint._common import GCS_ENDPOINT_FIELDS
 from globus_cli.constants import EXPLICIT_NULL, ExplicitNullType
 from globus_cli.login_manager import LoginManager
@@ -19,8 +18,7 @@ from globus_cli.types import AnyCallable
 F = t.TypeVar("F", bound=AnyCallable)
 
 
-class SubscriptionIdType(click.ParamType):
-    @shim_get_metavar
+class SubscriptionIdType(click.ParamType[str | ExplicitNullType]):
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return "[<uuid>|DEFAULT|null]"
 

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/group/_common.py

@@ -78,7 +78,7 @@ def group_id_arg(f: C) -> C:
     return click.argument("GROUP_ID", type=click.UUID)(f)
 
 
-class GroupSubscriptionVerifiedIdType(click.ParamType):
+class GroupSubscriptionVerifiedIdType(click.ParamType[uuid.UUID | ExplicitNullType]):
     name = "TEXT"
 
     def convert(

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/group/list.py

@@ -21,5 +21,6 @@ def group_list(login_manager: LoginManager) -> None:
             Field("Type", "group_type"),
             SESSION_ENFORCEMENT_FIELD,
             Field("Roles", "my_memberships[].role", formatter=formatters.SortedArray),
+            Field("Subscription ID", "subscription_id"),
         ],
     )

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/login.py

@@ -13,7 +13,6 @@ from globus_sdk.scopes import (
 )
 from globus_sdk.services.flows import SpecificFlowClient
 
-from globus_cli._click_compat import shim_get_metavar
 from globus_cli.login_manager import LoginManager, is_client_login
 from globus_cli.parsing import command, no_local_server_option
 from globus_cli.termio import verbosity
@@ -30,27 +29,17 @@ Logout of the Globus CLI with
   globus logout
 """
 
-_LOGIN_EPILOG = (
-    (
-        """\
+_LOGIN_EPILOG = ("""\
 
 You have successfully logged in to the Globus CLI!
-"""
-    )
-    + _SHARED_EPILOG
-)
+""") + _SHARED_EPILOG
 
-_LOGGED_IN_RESPONSE = (
-    (
-        """\
+_LOGGED_IN_RESPONSE = ("""\
 You are already logged in!
 
 You may force a new login with
   globus login --force
-"""
-    )
-    + _SHARED_EPILOG
-)
+""") + _SHARED_EPILOG
 
 _IS_CLIENT_ID_RESPONSE = """\
 GLOBUS_CLI_CLIENT_ID and GLOBUS_CLI_CLIENT_SECRET are both set.
@@ -60,10 +49,9 @@ Clients are always "logged in"
 """
 
 
-class GCSEndpointType(click.ParamType):
+class GCSEndpointType(click.ParamType[uuid.UUID | tuple[uuid.UUID, uuid.UUID]]):
     name = "GCS Server"
 
-    @shim_get_metavar
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return "<endpoint_id>[:<collection_id>]"
 
@@ -98,10 +86,9 @@ class GCSEndpointType(click.ParamType):
         return endpoint_id if not collection_id else (endpoint_id, collection_id)
 
 
-class TimerResourceType(click.ParamType):
+class TimerResourceType(click.ParamType[tuple[t.Literal["flow"], uuid.UUID]]):
     name = "TIMER_RESOURCE"
 
-    @shim_get_metavar
     def get_metavar(self, param: click.Parameter, ctx: click.Context) -> str:
         return "flow:<flow_id>"
 

{globus_cli-3.41.0 → globus_cli-3.42.0}/src/globus_cli/commands/streams/tunnel/__init__.py

@@ -10,6 +10,7 @@ from globus_cli.parsing import group
         "list": (".list", "list_tunnel_command"),
         "show": (".show", "show_tunnel_command"),
         "stop": (".stop", "stop_tunnel_command"),
+        "events": (".events", "events_command"),
     },
 )
 def tunnel_command() -> None: