globus-cli 3.35.2__tar.gz → 3.37.0__tar.gz

{globus_cli-3.35.2/src/globus_cli.egg-info → globus_cli-3.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: globus-cli
-Version: 3.35.2
+Version: 3.37.0
 Summary: Globus CLI
 Author-email: Stephen Rosen <sirosen@globus.org>
 License-Expression: Apache-2.0
@@ -10,17 +10,16 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 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
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: globus-sdk==3.56.1
-Requires-Dist: click<9,>=8.1.4
+Requires-Dist: globus-sdk==3.63.0
+Requires-Dist: click<8.3,>=8.1.4
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: packaging>=17.0
 Requires-Dist: typing_extensions>=4.0; python_version < "3.11"

{globus_cli-3.35.2 → globus_cli-3.37.0}/pyproject.toml

@@ -20,17 +20,16 @@ classifiers = [
     "Intended Audience :: Developers",
     "Operating System :: POSIX",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
     "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",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
-    "globus-sdk==3.56.1",
-    "click>=8.1.4,<9",
+    "globus-sdk==3.63.0",
+    "click>=8.1.4,<8.3",
     "jmespath==1.0.1",
     "packaging>=17.0",
     "typing_extensions>=4.0;python_version<'3.11'",
@@ -48,33 +47,39 @@ globus = "globus_cli:main"
 
 [dependency-groups]
 coverage = [
-    "coverage[toml]>=7"
+    "coverage[toml]>=7.10"
 ]
+yaml = ["ruamel.yaml==0.18.15"]
 test = [
     {include-group = "coverage"},
+    {include-group = "yaml"},  # loading test fixture data
     "pytest>=7",
     "pytest-xdist<4",
     "pytest-timeout<3",
     "click-type-test==1.1.0;python_version>='3.10'",
-    "responses==0.25.7",
-    # loading test fixture data
-    "ruamel.yaml==0.18.10",
+    "responses==0.25.8",
 ]
 test-mindeps = [
     {include-group = "test"},
-    "click==8.1.4",
-    "requests==2.32.3",
+    "click==8.1.8",
+    "requests==2.32.4",
     "pyjwt==2.0.0",
     "cryptography==3.3.1",
     "packaging==17.0",
     "typing_extensions==4.0",
 ]
 typing = [
-    "mypy==1.15.0",
+    "mypy==1.18.1",
     "types-jwt",
     "types-requests",
     "types-jmespath",
 ]
+check-project-metadata = [
+    "mddj==0.2.0",
+    {include-group = "yaml"},
+    "build",
+    "twine",
+]
 # `dev` is what's installed if you `make install`
 dev = [
     {include-group = "test"},
@@ -98,6 +103,7 @@ filterwarnings = [
 
 [tool.coverage.run]
 parallel = true
+patch = ["subprocess"]
 source = ["globus_cli"]
 [tool.coverage.paths]
 source = [
@@ -145,5 +151,4 @@ disallow_untyped_defs = false
 disallow_incomplete_defs = false
 module = [
     "globus_cli.services.transfer.recursive_ls",
-    "globus_cli.termio.printers.unix_printer.awscli_text",
 ]

globus_cli-3.37.0/src/globus_cli/commands/_removal_stub.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+import click
+
+from globus_cli.parsing import command
+
+
+@command(
+    hidden=True,
+    context_settings={"ignore_unknown_options": True},
+    disable_options=(
+        "format",
+        "map_http_status",
+    ),
+)
+@click.argument("UNKNOWN_ARG", nargs=-1)
+def removal_stub_command(unknown_arg: tuple[str, ...]) -> None:
+    """This command has been removed from the Globus CLI."""
+    command_string = click.get_current_context().command_path
+    click.echo(
+        click.style(
+            f"`{command_string}` has been removed from the Globus CLI.", fg="red"
+        ),
+        err=True,
+    )
+    click.get_current_context().exit(1)

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/collection/__init__.py

@@ -9,6 +9,7 @@ from globus_cli.parsing import group
         "list": (".list", "collection_list"),
         "show": (".show", "collection_show"),
         "update": (".update", "collection_update"),
+        "role": (".role", "role_command"),
     },
 )
 def collection_command() -> None:

globus_cli-3.37.0/src/globus_cli/commands/collection/role/__init__.py

@@ -0,0 +1,13 @@
+from globus_cli.parsing import group
+
+
+@group(
+    "role",
+    lazy_subcommands={
+        "list": (".list", "list_command"),
+        "show": (".show", "show_command"),
+        "delete": (".delete", "delete_command"),
+    },
+)
+def role_command() -> None:
+    """Manage Roles on Collections."""

globus_cli-3.37.0/src/globus_cli/commands/collection/role/delete.py

@@ -0,0 +1,23 @@
+import uuid
+
+import click
+
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import collection_id_arg, command
+from globus_cli.termio import display
+
+
+@command("delete")
+@collection_id_arg
+@click.argument("ROLE_ID", type=click.UUID)
+@LoginManager.requires_login("transfer")
+def delete_command(
+    login_manager: LoginManager,
+    *,
+    collection_id: uuid.UUID,
+    role_id: uuid.UUID,
+) -> None:
+    """Delete a particular role on a Collection."""
+    gcs_client = login_manager.get_gcs_client(collection_id=collection_id)
+    res = gcs_client.delete_role(role_id)
+    display(res, text_mode=display.RAW, response_key="code")

globus_cli-3.37.0/src/globus_cli/commands/collection/role/list.py

@@ -0,0 +1,40 @@
+import uuid
+
+import click
+
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import collection_id_arg, command
+from globus_cli.termio import Field, display
+from globus_cli.termio.formatters.auth import PrincipalURNFormatter
+
+
+@command("list")
+@collection_id_arg
+@click.option("--all-roles", is_flag=True, help="Include all collection roles.")
+@LoginManager.requires_login("transfer")
+def list_command(
+    login_manager: LoginManager,
+    *,
+    collection_id: uuid.UUID,
+    all_roles: bool,
+) -> None:
+    """List roles on a particular Collection."""
+    gcs_client = login_manager.get_gcs_client(collection_id=collection_id)
+    auth_client = login_manager.get_auth_client()
+
+    if all_roles:
+        res = gcs_client.get_role_list(collection_id, include="all_roles")
+    else:
+        res = gcs_client.get_role_list(collection_id)
+
+    display(
+        res,
+        text_mode=display.RECORD_LIST,
+        fields=[
+            Field("ID", "id"),
+            Field("Role", "role"),
+            Field(
+                "Principal", "principal", formatter=PrincipalURNFormatter(auth_client)
+            ),
+        ],
+    )

globus_cli-3.37.0/src/globus_cli/commands/collection/role/show.py

@@ -0,0 +1,37 @@
+import uuid
+
+import click
+
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import collection_id_arg, command
+from globus_cli.termio import Field, display
+from globus_cli.termio.formatters.auth import PrincipalURNFormatter
+
+
+@command("show")
+@collection_id_arg
+@click.argument("ROLE_ID", type=click.UUID)
+@LoginManager.requires_login("transfer")
+def show_command(
+    login_manager: LoginManager,
+    *,
+    collection_id: uuid.UUID,
+    role_id: uuid.UUID,
+) -> None:
+    """Describe a particular role on a Collection."""
+    gcs_client = login_manager.get_gcs_client(collection_id=collection_id)
+    auth_client = login_manager.get_auth_client()
+
+    res = gcs_client.get_role(role_id)
+
+    display(
+        res,
+        text_mode=display.RECORD,
+        fields=[
+            Field("ID", "id"),
+            Field("Role", "role"),
+            Field(
+                "Principal", "principal", formatter=PrincipalURNFormatter(auth_client)
+            ),
+        ],
+    )

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/delete.py

@@ -131,7 +131,6 @@ def delete_command(
         local_user=local_user,
         additional_fields={
             "ignore_missing": ignore_missing,
-            "skip_activation_check": skip_activation_check,
             "interpret_globs": enable_globs,
             **notify,
         },

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/endpoint/__init__.py

@@ -4,11 +4,11 @@ from globus_cli.parsing import group
 @group(
     "endpoint",
     lazy_subcommands={
-        "activate": (".activate", "endpoint_activate"),
-        "create": (".create", "endpoint_create"),
-        "deactivate": (".deactivate", "endpoint_deactivate"),
+        "activate": ("_removal_stub", "removal_stub_command"),
+        "create": ("_removal_stub", "removal_stub_command"),
+        "deactivate": ("_removal_stub", "removal_stub_command"),
         "delete": (".delete", "endpoint_delete"),
-        "is-activated": (".is_activated", "endpoint_is_activated"),
+        "is-activated": ("_removal_stub", "removal_stub_command"),
         "local-id": (".local_id", "local_id"),
         "my-shared-endpoint-list": (
             ".my_shared_endpoint_list",
@@ -17,7 +17,7 @@ from globus_cli.parsing import group
         "permission": (".permission", "permission_command"),
         "role": (".role", "role_command"),
         "search": (".search", "endpoint_search"),
-        "server": (".server", "server_command"),
+        "server": ("_removal_stub", "removal_stub_command"),
         "set-subscription-id": (".set_subscription_id", "set_endpoint_subscription_id"),
         "show": (".show", "endpoint_show"),
         "storage-gateway": (".storage_gateway", "storage_gateway_command"),

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/gcp/__init__.py

@@ -7,6 +7,10 @@ from globus_cli.parsing import group
         "create": (".create", "create_command"),
         "update": (".update", "update_command"),
         "set-subscription-id": (".set_subscription_id", "set_endpoint_subscription_id"),
+        "set-subscription-admin-verified": (
+            ".set_subscription_admin_verified",
+            "set_collection_subscription_admin_verified",
+        ),
     },
 )
 def gcp_command() -> None:

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/gcp/create/mapped.py

@@ -76,7 +76,8 @@ def mapped_command(
         **verify,
     )
 
-    res = transfer_client.create_endpoint(ep_doc)
+    # NOTE: this uses the legacy "create endpoint" route
+    res = transfer_client.post("/v0.10/endpoint", data=ep_doc)
 
     # output
     display(

globus_cli-3.37.0/src/globus_cli/commands/gcp/set_subscription_admin_verified.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import uuid
+
+import click
+
+from globus_cli.endpointish import Endpointish, EntityType
+from globus_cli.login_manager import LoginManager
+from globus_cli.parsing import command, endpoint_id_arg
+from globus_cli.termio import display
+
+
+@command(
+    "set-subscription-admin-verified",
+    short_help="Update a GCP collection's subscription verification status.",
+)
+@endpoint_id_arg
+@click.argument("STATUS", type=bool)
+@LoginManager.requires_login("transfer")
+def set_collection_subscription_admin_verified(
+    login_manager: LoginManager,
+    *,
+    endpoint_id: uuid.UUID,
+    status: bool,
+) -> None:
+    """
+    Update a GCP collection's subscription verification status.
+
+    This operation requires membership in a Globus subscription group and has
+    authorization requirements which depend upon the caller's roles on the
+    subscription group and the collection.
+
+    Subscription administrators can grant or revoke verification on a
+    collection that is associated with their subscription without needing an
+    administrator role on the collection itself.
+
+    Users with the administrator effective role on the collection can revoke
+    verification on a collection, but must still be a subscription administrator
+    to grant verification.
+
+    STATUS must be a boolean expressing the subscription admin verified status.
+    A value of 'true' grants the status, and a value of 'false' revokes status.
+    """
+    transfer_client = login_manager.get_transfer_client()
+    epish = Endpointish(endpoint_id, transfer_client=transfer_client)
+    epish.assert_entity_type(expect_types=(EntityType.GCP_MAPPED, EntityType.GCP_GUEST))
+
+    res = transfer_client.set_subscription_admin_verified(
+        endpoint_id,
+        status,
+    )
+
+    display(res, text_mode=display.RAW, response_key="message")

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/gcp/update/guest.py

@@ -4,8 +4,13 @@ import uuid
 
 from globus_cli.constants import ExplicitNullType
 from globus_cli.login_manager import LoginManager
-from globus_cli.parsing import collection_id_arg, command, endpointish_params
-from globus_cli.parsing.shared_options import activity_notifications_option
+from globus_cli.parsing import (
+    activity_notifications_option,
+    collection_id_arg,
+    command,
+    endpointish_params,
+    subscription_admin_verified_option,
+)
 from globus_cli.termio import display
 
 
@@ -16,6 +21,7 @@ from globus_cli.termio import display
     keyword_style="string",
     skip=("user_message", "user_message_link", "public"),
 )
+@subscription_admin_verified_option
 @activity_notifications_option("GCP")
 @LoginManager.requires_login("transfer")
 def guest_command(
@@ -33,6 +39,7 @@ def guest_command(
     info_link: str | None | ExplicitNullType,
     keywords: str | None,
     organization: str | None | ExplicitNullType,
+    subscription_admin_verified: bool | None,
     verify: dict[str, bool],
 ) -> None:
     """
@@ -56,6 +63,7 @@ def guest_command(
         default_directory=default_directory,
         force_encryption=force_encryption,
         guest_collection_activity_notification_policy=activity_notifications,
+        subscription_admin_verified=subscription_admin_verified,
         **verify,
     )
 

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/gcp/update/mapped.py

@@ -6,13 +6,19 @@ import click
 
 from globus_cli.constants import ExplicitNullType
 from globus_cli.login_manager import LoginManager
-from globus_cli.parsing import collection_id_arg, command, endpointish_params
+from globus_cli.parsing import (
+    collection_id_arg,
+    command,
+    endpointish_params,
+    subscription_admin_verified_option,
+)
 from globus_cli.termio import display
 
 
 @command("mapped", short_help="Update a GCP Mapped Collection.")
 @collection_id_arg
 @endpointish_params.update(name="collection", keyword_style="string")
+@subscription_admin_verified_option
 @click.option(
     "--subscription-id",
     help="Set the collection as managed with the given subscription ID",
@@ -34,6 +40,7 @@ def mapped_command(
     force_encryption: bool | None,
     verify: dict[str, bool],
     subscription_id: str | None,
+    subscription_admin_verified: bool | None,
     user_message: str | None | ExplicitNullType,
     user_message_link: str | None | ExplicitNullType,
     public: bool | None,
@@ -65,6 +72,7 @@ def mapped_command(
         public=public,
         user_message=user_message,
         user_message_link=user_message_link,
+        subscription_admin_verified=subscription_admin_verified,
         **verify,
     )
 

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/gcs/endpoint/set_subscription_id.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 import typing as t
 import uuid
 
@@ -11,16 +10,11 @@ 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 convert(
         self, value: str, param: click.Parameter | None, ctx: click.Context | None
-    ) -> uuid.UUID | Literal["DEFAULT"] | ExplicitNullType:
+    ) -> uuid.UUID | t.Literal["DEFAULT"] | ExplicitNullType:
         if value.lower() == "null":
             return EXPLICIT_NULL
         elif value.lower() == "default":

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/rm.py

@@ -88,7 +88,6 @@ def rm_command(
         local_user=local_user,
         additional_fields={
             "ignore_missing": ignore_missing,
-            "skip_activation_check": skip_activation_check,
             "interpret_globs": enable_globs,
             **notify,
         },

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/commands/transfer.py

@@ -392,7 +392,6 @@ def transfer_command(
         deadline=deadline,
         skip_source_errors=skip_source_errors,
         fail_on_quota_errors=fail_on_quota_errors,
-        skip_activation_check=skip_activation_check,
         delete_destination_extra=(delete or delete_destination_extra),
         source_local_user=source_local_user,
         destination_local_user=destination_local_user,

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/parsing/__init__.py

@@ -18,10 +18,12 @@ from .param_types import (
 )
 from .shared_callbacks import emptyable_opt_list_callback
 from .shared_options import (
+    activity_notifications_option,
     delete_and_rm_options,
     local_user_option,
     no_local_server_option,
     security_principal_opts,
+    subscription_admin_verified_option,
     synchronous_task_wait_options,
     task_notify_option,
     task_submission_options,
@@ -88,6 +90,8 @@ __all__ = [
     "verify_checksum_option",
     "endpointish_params",
     "local_user_option",
+    "activity_notifications_option",
+    "subscription_admin_verified_option",
     # shared callbacks
     "emptyable_opt_list_callback",
 ]

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/parsing/shared_options/__init__.py

@@ -382,6 +382,22 @@ def local_user_option(f: C) -> C:
     )(f)
 
 
+def subscription_admin_verified_option(f: C) -> C:
+    """
+    Option for setting the subscription verification status on a GCP collections.
+    """
+    return click.option(
+        "--subscription-admin-verified",
+        help=(
+            "Grant or revoke subscription verification status. "
+            "Specifying 'true' requires administrator roles on both the "
+            "collection and the subscription group. Specifying 'false' "
+            "requires only an administrator role on the collection."
+        ),
+        type=bool,
+    )(f)
+
+
 def activity_notifications_option(
     gc_type: t.Literal["GCP", "GCS"],
 ) -> t.Callable[[C], C]:

{globus_cli-3.35.2 → globus_cli-3.37.0}/src/globus_cli/termio/printers/table_printer.py

@@ -81,7 +81,7 @@ class TablePrinter(Printer[t.Iterable[t.Any]]):
             cells.append(value.ljust(width, fillchar))
         return " | ".join(cells)
 
-    @functools.lru_cache(maxsize=None)  # noqa: B019
+    @functools.cache  # noqa: B019
     def _column_width(self, table: DataTable, x: int) -> int:
         """The width of a column in the table."""
         values = [table[x, y] for y in range(table.num_rows)]