globus-cli 3.32.0__tar.gz → 3.33.0__tar.gz

{globus_cli-3.32.0/src/globus_cli.egg-info → globus_cli-3.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: globus-cli
-Version: 3.32.0
+Version: 3.33.0
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 Project-URL: homepage, https://github.com/globus/globus-cli
@@ -15,24 +15,16 @@ 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
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: globus-sdk==3.46.0
+Requires-Dist: globus-sdk==3.51.0
 Requires-Dist: click<9,>=8.1.4
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
 Requires-Dist: typing_extensions>=4.0; python_version < "3.11"
-Requires-Dist: requests<3.0.0,>=2.19.1
-Provides-Extra: test
-Requires-Dist: coverage>=7; extra == "test"
-Requires-Dist: pytest>=7; extra == "test"
-Requires-Dist: pytest-xdist<4; extra == "test"
-Requires-Dist: pytest-timeout<3; extra == "test"
-Requires-Dist: click-type-test==1.0.0; python_version >= "3.10" and extra == "test"
-Requires-Dist: responses==0.25.3; extra == "test"
-Requires-Dist: ruamel.yaml==0.18.6; extra == "test"
-Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
+Requires-Dist: requests<3.0.0,>=2.32.3
 
 .. image:: https://github.com/globus/globus-cli/workflows/build/badge.svg?event=push
     :alt: build status

{globus_cli-3.32.0 → globus_cli-3.33.0}/pyproject.toml

@@ -25,39 +25,61 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 requires-python = ">=3.8"
 dependencies = [
-    "globus-sdk==3.46.0",
+    "globus-sdk==3.51.0",
     "click>=8.1.4,<9",
     "jmespath==1.0.1",
     "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
     # declare them here in case the underlying lib ever changes
-    "requests>=2.19.1,<3.0.0",
+    "requests>=2.32.3,<3.0.0",
 ]
 dynamic = ["version"]
 
 [project.urls]
 homepage = "https://github.com/globus/globus-cli"
 
-[project.optional-dependencies]
+[project.scripts]
+globus = "globus_cli:main"
+
+[dependency-groups]
+coverage = [
+    "coverage[toml]>=7"
+]
 test = [
-    "coverage>=7",
+    {include-group = "coverage"},
     "pytest>=7",
     "pytest-xdist<4",
     "pytest-timeout<3",
-    "click-type-test==1.0.0;python_version>='3.10'",
-    "responses==0.25.3",
+    "click-type-test==1.1.0;python_version>='3.10'",
+    "responses==0.25.6",
     # loading test fixture data
-    "ruamel.yaml==0.18.6",
-    # Python 3.12 needs setuptools.
-    "setuptools;python_version>='3.12'",
+    "ruamel.yaml==0.18.10",
+]
+test-mindeps = [
+    {include-group = "test"},
+    "click==8.1.4",
+    "requests==2.32.3",
+    "pyjwt==2.0.0",
+    "cryptography==3.3.1",
+    "packaging==17.0",
+    "typing_extensions==4.0",
+]
+typing = [
+    "mypy==1.15.0",
+    "types-jwt",
+    "types-requests",
+    "types-jmespath",
+]
+# `dev` is what's installed if you `make install`
+dev = [
+    {include-group = "test"},
+    {include-group = "typing"},
 ]
-
-[project.scripts]
-globus = "globus_cli:main"
 
 [tool.setuptools.dynamic.version]
 attr = "globus_cli.version.__version__"
@@ -90,5 +112,5 @@ disallow_untyped_defs = false
 disallow_incomplete_defs = false
 module = [
     "globus_cli.services.transfer.recursive_ls",
-    "globus_cli.termio.awscli_text",
+    "globus_cli.termio.printers.unix_printer.awscli_text",
 ]

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/_warnings.py

@@ -8,7 +8,7 @@ _TEST_WARNING_CONTROL: bool = False
 
 
 def simplefilter(
-    filterstr: t.Literal["default", "error", "ignore", "always", "module", "once"]
+    filterstr: t.Literal["default", "error", "ignore", "always", "module", "once"],
 ) -> None:
     """
     Wrap `warnings.simplefilter` with a check on `_TEST_WARNING_CONTROL`.

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/api.py

@@ -23,14 +23,17 @@ class QueryParamType(click.ParamType):
         return "Key=Value"
 
     def get_type_annotation(self, param: click.Parameter) -> type:
-        return tuple[str, str]
+        # this is a "<typing special form>" vs "type" issue, so type ignore for now
+        # click-type-test has an issue for improving this, with details, see:
+        #   https://github.com/sirosen/click-type-test/issues/14
+        return t.Tuple[str, str]  # type: ignore[return-value]
 
     def convert(
         self,
         value: str | None,
         param: click.Parameter | None,
         ctx: click.Context | None,
-    ) -> t.Tuple[str, str] | None:
+    ) -> tuple[str, str] | None:
         value = super().convert(value, param, ctx)
         if value is None:
             return None
@@ -45,14 +48,17 @@ class HeaderParamType(click.ParamType):
         return "Key:Value"
 
     def get_type_annotation(self, param: click.Parameter) -> type:
-        return tuple[str, str]
+        # this is a "<typing special form>" vs "type" issue, so type ignore for now
+        # click-type-test has an issue for improving this, with details, see:
+        #   https://github.com/sirosen/click-type-test/issues/14
+        return t.Tuple[str, str]  # type: ignore[return-value]
 
     def convert(
         self,
         value: str | None,
         param: click.Parameter | None,
         ctx: click.Context | None,
-    ) -> t.Tuple[str, str] | None:
+    ) -> tuple[str, str] | None:
         value = super().convert(value, param, ctx)
         if value is None:
             return None

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/cli_profile_list.py

@@ -5,7 +5,7 @@ import typing as t
 
 import click
 
-from globus_cli.login_manager import is_client_login, token_storage_adapter
+from globus_cli.login_manager import LoginManager, is_client_login
 from globus_cli.parsing import command
 from globus_cli.termio import Field, display, formatters
 
@@ -29,13 +29,16 @@ def _profilestr_to_datadict(s: str) -> dict[str, t.Any] | None:
 
 
 def _parse_and_filter_profiles(
+    login_manager: LoginManager,
     all: bool,
 ) -> tuple[list[dict[str, t.Any]], list[dict[str, t.Any]]]:
     globus_env = os.getenv("GLOBUS_SDK_ENVIRONMENT", "production")
 
     client_profiles = []
     user_profiles = []
-    for n in token_storage_adapter().iter_namespaces(include_config_namespaces=True):
+    for n in login_manager.storage.adapter.iter_namespaces(
+        include_config_namespaces=True
+    ):
         data = _profilestr_to_datadict(n)
         if not data:  # skip any parse failures
             continue
@@ -86,8 +89,8 @@ def cli_profile_list(*, all: bool) -> None:
     These are the values for GLOBUS_PROFILE which have been recorded, as well as
     GLOBUS_CLI_CLIENT_ID values which have been used.
     """
-
-    client_profiles, user_profiles = _parse_and_filter_profiles(all)
+    login_manager = LoginManager()
+    client_profiles, user_profiles = _parse_and_filter_profiles(login_manager, all)
 
     if user_profiles:
         fields = [

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/collection/_common.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import click
 import globus_sdk
 
-from globus_cli.login_manager.utils import get_current_identity_id
+from globus_cli.login_manager import LoginManager
 from globus_cli.termio import Field, formatters
 from globus_cli.types import DATA_CONTAINER_T
 
@@ -12,10 +12,9 @@ class LazyCurrentIdentity:
     def __init__(self, value: str | None) -> None:
         self._value = value
 
-    @property
-    def value(self) -> str:
+    def resolve(self, login_manager: LoginManager) -> str:
         if self._value is None:
-            self._value = get_current_identity_id()
+            self._value = login_manager.get_current_identity_id()
         return str(self._value)
 
 

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/collection/create/guest.py

@@ -91,7 +91,10 @@ def collection_create_guest(
 
     if not user_credential_id:
         user_credential_id = _select_user_credential_id(
-            gcs_client, mapped_collection_id, local_username, identity_id.value
+            gcs_client,
+            mapped_collection_id,
+            local_username,
+            identity_id.resolve(login_manager),
         )
 
     converted_kwargs: dict[str, t.Any] = ExplicitNullType.nullify_dict(
@@ -105,7 +108,7 @@ def collection_create_guest(
             "display_name": display_name,
             "enable_https": enable_https,
             "force_encryption": force_encryption,
-            "identity_id": identity_id.value,
+            "identity_id": identity_id.resolve(login_manager),
             "info_link": info_link,
             "keywords": keywords,
             "mapped_collection_id": mapped_collection_id,

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/collection/create/mapped.py

@@ -284,7 +284,7 @@ def collection_create_mapped(
             "domain_name": domain_name,
             "enable_https": enable_https,
             "force_encryption": force_encryption,
-            "identity_id": identity_id.value,
+            "identity_id": identity_id.resolve(login_manager),
             "info_link": info_link,
             "keywords": keywords,
             "organization": organization,

globus_cli-3.33.0/src/globus_cli/commands/collection/delete.py

@@ -0,0 +1,30 @@
+import uuid
+
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import collection_id_arg, command
+from globus_cli.termio import display
+
+
+@command("delete", short_help="Delete an existing Collection.")
+@collection_id_arg
+@LoginManager.requires_login("transfer")
+def collection_delete(login_manager: LoginManager, *, collection_id: uuid.UUID) -> None:
+    """
+    Delete an existing Collection.
+
+    This requires that you are an owner or administrator on the Collection.
+
+    Endpoint owners and administrators may delete Collections on the Endpoint.
+    For Guest Collections, administrators of the Mapped Collection may also delete.
+
+    If the collection has the 'delete_protection' property set to true, the Collection
+    can not be deleted.
+
+    All Collection-specific roles and 'sharing_policies' are also deleted.
+
+    If a Mapped Collection is deleted, then all Guest Collections and roles associated
+    with it are also deleted.
+    """
+    gcs_client = login_manager.get_gcs_client(collection_id=collection_id)
+    res = gcs_client.delete_collection(collection_id)
+    display(res, text_mode=display.RAW, response_key="code")

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/permission/_common.py

@@ -1,6 +1,13 @@
 from __future__ import annotations
 
+import typing as t
+
+import click
+
 from globus_cli.termio import formatters
+from globus_cli.types import AnyCommand
+
+C = t.TypeVar("C", bound=AnyCommand)
 
 
 class AclPrincipalFormatter(formatters.auth.PrincipalDictFormatter):
@@ -18,3 +25,10 @@ class AclPrincipalFormatter(formatters.auth.PrincipalDictFormatter):
     # it could be made multi-environment using `globus_sdk.config.get_webapp_url()`
     def render_group_id(self, group_id: str) -> str:
         return f"https://app.globus.org/groups/{group_id}"
+
+
+def expiration_date_option(f: C) -> C:
+    return click.option(
+        "--expiration-date",
+        help="Expiration date for the permission in ISO 8601 format",
+    )(f)

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/permission/create.py

@@ -9,6 +9,8 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import ENDPOINT_PLUS_REQPATH, command, security_principal_opts
 from globus_cli.termio import Field, display
 
+from ._common import expiration_date_option
+
 
 @command(
     "create",
@@ -50,6 +52,7 @@ $ globus endpoint permission create $ep_id:/ --permissions rw --identity go@glob
     help="A custom message to add to email notifications",
 )
 @click.argument("endpoint_plus_path", type=ENDPOINT_PLUS_REQPATH)
+@expiration_date_option
 @LoginManager.requires_login("auth", "transfer")
 def create_command(
     login_manager: LoginManager,
@@ -59,6 +62,7 @@ def create_command(
     endpoint_plus_path: tuple[uuid.UUID, str | None],
     notify_email: str | None,
     notify_message: str | None,
+    expiration_date: str | None,
 ) -> None:
     """
     Create a new access control rule on the target endpoint, granting users new
@@ -105,6 +109,7 @@ def create_command(
         path=path,
         notify_email=notify_email,
         notify_message=notify_message,
+        expiration_date=expiration_date,
     )
 
     res = transfer_client.add_endpoint_acl_rule(endpoint_id, rule_data)

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/permission/show.py

@@ -47,5 +47,6 @@ def show_command(
                 formatter=AclPrincipalFormatter(auth_client=auth_client),
             ),
             Field("Path", "path"),
+            Field("Expiration Date", "expiration_date"),
         ],
     )

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/permission/update.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import typing as t
 import uuid
 
@@ -7,6 +9,8 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import display
 
+from ._common import expiration_date_option
+
 
 @command(
     "update",
@@ -25,17 +29,18 @@ $ globus endpoint permission update $ep_id $rule_id --permissions r
 @click.argument("rule_id")
 @click.option(
     "--permissions",
-    required=True,
     type=click.Choice(("r", "rw"), case_sensitive=False),
     help="Permissions to add. Read-Only or Read/Write",
 )
+@expiration_date_option
 @LoginManager.requires_login("transfer")
 def update_command(
     login_manager: LoginManager,
     *,
-    permissions: t.Literal["r", "rw"],
+    permissions: t.Literal["r", "rw"] | None,
     rule_id: str,
     endpoint_id: uuid.UUID,
+    expiration_date: str | None,
 ) -> None:
     """
     Update an existing access control rule's permissions.
@@ -47,6 +52,8 @@ def update_command(
 
     transfer_client = login_manager.get_transfer_client()
 
-    rule_data = assemble_generic_doc("access", permissions=permissions)
+    rule_data = assemble_generic_doc(
+        "access", permissions=permissions, expiration_date=expiration_date
+    )
     res = transfer_client.update_endpoint_acl_rule(endpoint_id, rule_id, rule_data)
     display(res, text_mode=display.RAW, response_key="message")

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/search.py

@@ -68,6 +68,21 @@ $ globus endpoint search --filter-scope my-endpoints
     type=click.IntRange(1, 1000),
     help="The maximum number of results to return.",
 )
+@click.option(
+    "--filter-entity-type",
+    default=None,
+    type=click.Choice(
+        (
+            "GCP_mapped_collection",
+            "GCP_guest_collection",
+            "GCSv5_endpoint",
+            "GCSv5_mapped_collection",
+            "GCSv5_guest_collection",
+        ),
+        case_sensitive=False,
+    ),
+    help="Filter search results to endpoints of a specific entity type.",
+)
 @click.argument("filter_fulltext", required=False)
 @LoginManager.requires_login("auth", "transfer")
 def endpoint_search(
@@ -86,6 +101,16 @@ def endpoint_search(
         "shared-by-me",
         "shared-with-me",
     ],
+    filter_entity_type: (
+        t.Literal[
+            "GCP_mapped_collection",
+            "GCP_guest_collection",
+            "GCSv5_endpoint",
+            "GCSv5_mapped_collection",
+            "GCSv5_guest_collection",
+        ]
+        | None
+    ),
 ) -> None:
     """
     Search for Globus endpoints with search filters. If --filter-scope is set to the
@@ -121,6 +146,7 @@ def endpoint_search(
             filter_fulltext=filter_fulltext,
             filter_scope=filter_scope,
             filter_owner_id=owner_id,
+            filter_entity_type=filter_entity_type,
         ).items(),
         limit=limit,
     )

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/endpoint/set_subscription_id.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import typing as t
 import uuid
 
 import click
@@ -11,14 +10,9 @@ from globus_cli.termio import display
 
 
 class SubscriptionIdType(click.ParamType):
-    def get_type_annotation(self, param: click.Parameter) -> type:
-        return t.cast(type, str)
-
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
-    ) -> t.Any:
-        if value is None or (ctx and ctx.resilient_parsing):
-            return None
+    ) -> str:
         if value.lower() == "null":
             return "null"
         try:

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/flows/run/resume.py

@@ -8,7 +8,6 @@ import click
 import globus_sdk
 
 from globus_cli.login_manager import LoginManager
-from globus_cli.login_manager.utils import get_current_identity_id
 from globus_cli.parsing import command, run_id_arg
 from globus_cli.termio import Field, display, formatters
 from globus_cli.utils import CLIAuthRequirementsError
@@ -106,7 +105,7 @@ def check_inactive_reason(
 
 
 def _get_inactive_reason(
-    run_doc: dict[str, t.Any] | globus_sdk.GlobusHTTPResponse
+    run_doc: dict[str, t.Any] | globus_sdk.GlobusHTTPResponse,
 ) -> GARE | None:
     from globus_sdk.gare import to_gare
 
@@ -124,6 +123,6 @@ def _has_required_consent(
     login_manager: LoginManager, required_scopes: list[str]
 ) -> bool:
     auth_client = login_manager.get_auth_client()
-    user_identity_id = get_current_identity_id()
+    user_identity_id = login_manager.get_current_identity_id()
     consents = auth_client.get_consents(user_identity_id).to_forest()
     return consents.meets_scope_requirements(required_scopes)

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/flows/validate.py

@@ -87,13 +87,11 @@ def _validate_flow_scope_output_handler(scopes_response: dict[str, str]) -> None
         for k, scopes in scopes_response.items()
         for scope in scopes
     ]
+
     click.echo("Discovered Scopes")
     click.echo("=================")
     if scope_entries:
-        display.render_table(
-            scope_entries,
-            fields=scopes_fields,
-        )
+        display(scope_entries, text_mode=display.TABLE, fields=scopes_fields)
     else:
         click.echo("No scopes discovered")
 

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/gcp/set_subscription_id.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import typing as t
 import uuid
 
 import click
@@ -13,15 +12,9 @@ from globus_cli.termio import display
 
 
 class GCPSubscriptionIdType(click.ParamType):
-    def get_type_annotation(self, _: click.Parameter) -> type:
-        return t.cast(type, uuid.UUID | ExplicitNullType)
-
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
-    ) -> t.Any:
-        if ctx and ctx.resilient_parsing:
-            return None
-
+    ) -> uuid.UUID | ExplicitNullType:
         if value.lower() == "null":
             return EXPLICIT_NULL
 

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/gcs/endpoint/set_subscription_id.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 import typing as t
 import uuid
 
@@ -10,17 +11,16 @@ from globus_cli.login_manager import LoginManager
 from globus_cli.parsing import command, endpoint_id_arg
 from globus_cli.termio import display
 
+if sys.version_info >= (3, 9):
+    from typing import Literal
+else:
+    from typing_extensions import Literal
 
-class GCSSubscriptionIdType(click.ParamType):
-    def get_type_annotation(self, _: click.Parameter) -> type:
-        return t.cast(type, uuid.UUID | t.Literal["DEFAULT"] | ExplicitNullType)
 
+class GCSSubscriptionIdType(click.ParamType):
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
-    ) -> t.Any:
-        if ctx and ctx.resilient_parsing:
-            return None
-
+    ) -> uuid.UUID | Literal["DEFAULT"] | ExplicitNullType:
         if value.lower() == "null":
             return EXPLICIT_NULL
         elif value.lower() == "default":

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/gcs/endpoint/update.py

@@ -19,17 +19,12 @@ F = t.TypeVar("F", bound=AnyCallable)
 
 
 class SubscriptionIdType(click.ParamType):
-    def get_type_annotation(self, _: click.Parameter) -> type:
-        return t.cast(type, str | ExplicitNullType)
-
     def get_metavar(self, _: click.Parameter) -> t.Optional[str]:
         return "[<uuid>|DEFAULT|null]"
 
     def convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
-    ) -> t.Any:
-        if value is None or (ctx and ctx.resilient_parsing):
-            return None
+    ) -> str | ExplicitNullType:
         if value.lower() == "null":
             return EXPLICIT_NULL
         if value.lower() == "default":

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/group/invite/_common.py

@@ -14,7 +14,7 @@ if t.TYPE_CHECKING:
 
 
 def get_invite_formatter(
-    case: t.Literal["accept", "decline"]
+    case: t.Literal["accept", "decline"],
 ) -> t.Callable[[globus_sdk.GlobusHTTPResponse], None]:
     action_word = "Accepted" if case == "accept" else "Declined"
 

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/login.py

@@ -57,15 +57,12 @@ Clients are always "logged in"
 class GCSEndpointType(click.ParamType):
     name = "GCS Server"
 
-    def get_type_annotation(self, _: click.Parameter) -> type:
-        return t.cast(type, t.Union[uuid.UUID, tuple[uuid.UUID, uuid.UUID]])
-
     def get_metavar(self, _: t.Optional[click.Parameter]) -> str:
         return "<endpoint_id>[:<collection_id>]"
 
     def convert(
         self, value: t.Any, param: Parameter | None, ctx: Context | None
-    ) -> t.Any:
+    ) -> uuid.UUID | tuple[uuid.UUID, uuid.UUID]:
         if isinstance(value, uuid.UUID):
             return value
         elif isinstance(value, tuple) and len(value) == 2:

{globus_cli-3.32.0 → globus_cli-3.33.0}/src/globus_cli/commands/logout.py

@@ -1,14 +1,7 @@
 import click
 import globus_sdk
 
-from globus_cli.login_manager import (
-    LoginManager,
-    delete_templated_client,
-    internal_native_client,
-    is_client_login,
-    remove_well_known_config,
-    token_storage_adapter,
-)
+from globus_cli.login_manager import LoginManager, is_client_login
 from globus_cli.parsing import command
 
 
@@ -105,7 +98,7 @@ def logout_command(
     # Always skip for client logins, which don't use a templated client
     if delete_client and not is_client_login():
         try:
-            delete_templated_client()
+            login_manager.storage.delete_templated_client()
         except globus_sdk.AuthAPIError:
             if not ignore_errors:
                 warnecho(
@@ -121,10 +114,9 @@ def logout_command(
 
     # Attempt to revoke all tokens in storage; use the internal native client to ensure
     # we have a valid Auth client
-    native_client = internal_native_client()
-    adapter = token_storage_adapter()
+    native_client = login_manager.storage.cli_native_client
 
-    for rs, tokendata in adapter.get_by_resource_server().items():
+    for rs, tokendata in login_manager.storage.adapter.get_by_resource_server().items():
         for tok_key in ("access_token", "refresh_token"):
             token = tokendata[tok_key]
 
@@ -145,9 +137,9 @@ def logout_command(
                         "Continuing... (--ignore-errors)",
                     )
 
-        adapter.remove_tokens_for_resource_server(rs)
+        login_manager.storage.adapter.remove_tokens_for_resource_server(rs)
 
-    remove_well_known_config("auth_user_data")
+    login_manager.storage.remove_well_known_config("auth_user_data")
 
     if is_client_login():
         click.echo(_CLIENT_LOGOUT_EPILOG)