linode-cli 5.56.0__tar.gz → 5.56.2__tar.gz

{linode_cli-5.56.0/linode_cli.egg-info → linode_cli-5.56.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: linode-cli
-Version: 5.56.0
+Version: 5.56.2
 Summary: The official command-line interface for interacting with the Linode API.
 Author-email: "Akamai Technologies Inc." <developers@linode.com>
 License: BSD-3-Clause
@@ -15,7 +15,7 @@ Requires-Dist: rich
 Requires-Dist: urllib3<3
 Requires-Dist: linode-metadata>=0.3.0
 Provides-Extra: obj
-Requires-Dist: boto3; extra == "obj"
+Requires-Dist: boto3>=1.36.0; extra == "obj"
 Provides-Extra: dev
 Requires-Dist: pylint>=2.17.4; extra == "dev"
 Requires-Dist: pytest>=7.3.1; extra == "dev"

{linode_cli-5.56.0 → linode_cli-5.56.2/linode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: linode-cli
-Version: 5.56.0
+Version: 5.56.2
 Summary: The official command-line interface for interacting with the Linode API.
 Author-email: "Akamai Technologies Inc." <developers@linode.com>
 License: BSD-3-Clause
@@ -15,7 +15,7 @@ Requires-Dist: rich
 Requires-Dist: urllib3<3
 Requires-Dist: linode-metadata>=0.3.0
 Provides-Extra: obj
-Requires-Dist: boto3; extra == "obj"
+Requires-Dist: boto3>=1.36.0; extra == "obj"
 Provides-Extra: dev
 Requires-Dist: pylint>=2.17.4; extra == "dev"
 Requires-Dist: pytest>=7.3.1; extra == "dev"

{linode_cli-5.56.0 → linode_cli-5.56.2}/linode_cli.egg-info/requires.txt

@@ -20,4 +20,4 @@ twine>=4.0.2
 pytest-rerunfailures
 
 [obj]
-boto3
+boto3>=1.36.0

{linode_cli-5.56.0 → linode_cli-5.56.2}/linodecli/configuration/config.py

@@ -397,16 +397,21 @@ class CLIConfig:
         print(f"\nConfiguring {username}\n")
 
         # Configuring Defaults
-        regions = [
-            r["id"] for r in _do_get_request(self.base_url, "/regions")["data"]
-        ]
-        types = [
-            t["id"]
-            for t in _do_get_request(self.base_url, "/linode/types")["data"]
-        ]
-        images = [
-            i["id"] for i in _do_get_request(self.base_url, "/images")["data"]
-        ]
+        regions = sorted(
+            [
+                r["id"]
+                for r in _do_get_request(self.base_url, "/regions")["data"]
+            ]
+        )
+        types = sorted(
+            [
+                t["id"]
+                for t in _do_get_request(self.base_url, "/linode/types")["data"]
+            ]
+        )
+        images = sorted(
+            [i["id"] for i in _do_get_request(self.base_url, "/images")["data"]]
+        )
 
         is_full_access = _check_full_access(self.base_url, token)
 
@@ -423,9 +428,9 @@ class CLIConfig:
             )
 
             if "data" in users:
-                auth_users = [
-                    u["username"] for u in users["data"] if "ssh_keys" in u
-                ]
+                auth_users = sorted(
+                    [u["username"] for u in users["data"] if "ssh_keys" in u]
+                )
 
         # get the preferred things
         config["region"] = _default_thing_input(

{linode_cli-5.56.0 → linode_cli-5.56.2}/linodecli/configuration/helpers.py

@@ -3,8 +3,10 @@ General helper functions for configuraiton
 """
 
 import configparser
+import math
 import os
 import webbrowser
+from functools import partial
 from typing import Any, Callable, List, Optional
 
 LEGACY_CONFIG_NAME = ".linode-cli"
@@ -142,13 +144,14 @@ def _default_thing_input(
     exists = current_value is not None
 
     idx_offset = int(exists) + 1
+    pad = partial(_pad_index, total=len(things) + idx_offset)
 
     # If there is a current value, users should have the option to clear it
     if exists:
-        print(" 1 - No Default")
+        print(f"{pad(1)} - No Default")
 
     for ind, thing in enumerate(things):
-        print(f" {ind + idx_offset} - {thing}")
+        print(f"{pad(ind + idx_offset)} - {thing}")
     print()
 
     while True:
@@ -184,6 +187,16 @@ def _default_thing_input(
         return things[choice_idx]
 
 
+def _pad_index(idx: int, total: int) -> str:
+    # NOTE: The implementation of this function could be less opaque if we're
+    # willing to say, "There will never be a case where total > X, because no
+    # one could examine and choose from that many options."
+    max_padding = math.floor(math.log10(total)) + 1
+    num_spaces = max_padding - math.floor(math.log10(idx))
+
+    return " " * num_spaces + str(idx)
+
+
 def _default_text_input(
     ask: str,
     default: Optional[str] = None,

{linode_cli-5.56.0 → linode_cli-5.56.2}/linodecli/plugins/obj/__init__.py

@@ -56,6 +56,7 @@ from linodecli.plugins.obj.website import (
 
 try:
     import boto3
+    from botocore.config import Config
     from botocore.exceptions import ClientError
 
     HAS_BOTO = True
@@ -443,6 +444,16 @@ def _get_boto_client(cluster, access_key, secret_key):
         aws_secret_access_key=secret_key,
         region_name=cluster,
         endpoint_url=BASE_URL_TEMPLATE.format(cluster),
+        config=Config(
+            # This addresses an incompatibility between boto3 1.36.x and
+            # some third-party S3-compatible storage platforms.
+            # In the future we may want to consider manually computing the
+            # CRC32 hash of a file before uploading it.
+            #
+            # See: https://github.com/boto/boto3/issues/4398#issuecomment-2619946229
+            request_checksum_calculation="when_required",
+            response_checksum_validation="when_required",
+        ),
     )
 
     # set this for later use

{linode_cli-5.56.0 → linode_cli-5.56.2}/linodecli/version.py

@@ -2,4 +2,4 @@
 The version of the Linode CLI.
 """
 
-__version__ = "v5.56.0"
+__version__ = "v5.56.2"

{linode_cli-5.56.0 → linode_cli-5.56.2}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
-obj = ["boto3"]
+obj = ["boto3>=1.36.0"]
 dev = [
     "pylint>=2.17.4",
     "pytest>=7.3.1",