linode-cli 5.68.0__tar.gz → 5.69.0__tar.gz

{linode_cli-5.68.0/linode_cli.egg-info → linode_cli-5.69.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linode-cli
-Version: 5.68.0
+Version: 5.69.0
 Summary: The official command-line interface for interacting with the Linode API.
 Author-email: "Akamai Technologies Inc." <developers@linode.com>
 License-Expression: BSD-3-Clause
@@ -45,12 +45,21 @@ Visit the [Wiki](../../wiki) for more information.
 
 ## Install
 
-Install via PyPI:
+We recommend installing `linode-cli` with `pipx`, which installs each Python CLI tool into its own isolated environment and works on distributions where `pip install` fails because the system Python is marked as externally managed ([PEP 668](https://peps.python.org/pep-0668/)). If pipx isn't installed yet, follow the [pipx installation guide](https://pipx.pypa.io/latest/how-to/install-pipx.html).
+
+To install:
+
+```bash
+pipx install linode-cli
+```
+
+To upgrade:
+
 ```bash
-pip3 install linode-cli
+pipx upgrade linode-cli
 ```
 
-Visit the [Wiki](../../wiki/Installation) for more information.
+The [Wiki](https://github.com/linode/linode-cli/wiki/Installation) covers other installation methods, including the Docker image, the GitHub Action, and building from source.
 
 ## Contributing
 

{linode_cli-5.68.0 → linode_cli-5.69.0}/README.md

@@ -12,12 +12,21 @@ Visit the [Wiki](../../wiki) for more information.
 
 ## Install
 
-Install via PyPI:
+We recommend installing `linode-cli` with `pipx`, which installs each Python CLI tool into its own isolated environment and works on distributions where `pip install` fails because the system Python is marked as externally managed ([PEP 668](https://peps.python.org/pep-0668/)). If pipx isn't installed yet, follow the [pipx installation guide](https://pipx.pypa.io/latest/how-to/install-pipx.html).
+
+To install:
+
+```bash
+pipx install linode-cli
+```
+
+To upgrade:
+
 ```bash
-pip3 install linode-cli
+pipx upgrade linode-cli
 ```
 
-Visit the [Wiki](../../wiki/Installation) for more information.
+The [Wiki](https://github.com/linode/linode-cli/wiki/Installation) covers other installation methods, including the Docker image, the GitHub Action, and building from source.
 
 ## Contributing
 

{linode_cli-5.68.0 → linode_cli-5.69.0/linode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linode-cli
-Version: 5.68.0
+Version: 5.69.0
 Summary: The official command-line interface for interacting with the Linode API.
 Author-email: "Akamai Technologies Inc." <developers@linode.com>
 License-Expression: BSD-3-Clause
@@ -45,12 +45,21 @@ Visit the [Wiki](../../wiki) for more information.
 
 ## Install
 
-Install via PyPI:
+We recommend installing `linode-cli` with `pipx`, which installs each Python CLI tool into its own isolated environment and works on distributions where `pip install` fails because the system Python is marked as externally managed ([PEP 668](https://peps.python.org/pep-0668/)). If pipx isn't installed yet, follow the [pipx installation guide](https://pipx.pypa.io/latest/how-to/install-pipx.html).
+
+To install:
+
+```bash
+pipx install linode-cli
+```
+
+To upgrade:
+
 ```bash
-pip3 install linode-cli
+pipx upgrade linode-cli
 ```
 
-Visit the [Wiki](../../wiki/Installation) for more information.
+The [Wiki](https://github.com/linode/linode-cli/wiki/Installation) covers other installation methods, including the Docker image, the GitHub Action, and building from source.
 
 ## Contributing
 

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/baked/request.py

@@ -182,12 +182,20 @@ def _parse_request_model(
                 depth=depth,
             )
 
-        # Handle arrays of objects that not marked as JSON
+        # Handle arrays of objects that are not marked as JSON.
+        # NOTE: We only expand an array of objects into individual child
+        # arguments when it is not already nested under another list
+        # (i.e. parent is None). The CLI can only associate one level of
+        # nested list objects, so a list of objects nested within another
+        # list must be treated as JSON instead.
+        # Otherwise, we would generate child arguments that can never
+        # be used because they always conflict with their implicit JSON parent.
         elif (
             v.type == "array"
             and v.items
             and v.items.type == "object"
             and v.extensions.get("linode-cli-format") != "json"
+            and parent is None
         ):
             # handle lists of objects as a special case, where each property
             # of the object in the list is its own argument

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/baked/response.py

@@ -210,8 +210,10 @@ def _parse_response_model(schema, prefix=None, nested_list_depth=0):
             )
         elif v.type == "object":
             attrs += _parse_response_model(v, prefix=pref)
-        elif v.type == "array" and v.items.type == "object":
-            # Parse arrays for objects recursively and increase the nesting depth
+        elif v.type == "array" and (
+            v.items.type == "object"
+            or bool(_aggregate_schema_properties(v.items)[0])
+        ):
             attrs += _parse_response_model(
                 v.items,
                 prefix=pref,
@@ -316,8 +318,15 @@ class OpenAPIResponse:
             for cur in json:
                 # Get the nested list using the path
                 nlist_path = cur
+
                 for p in path_parts:
                     nlist_path = nlist_path.get(p)
+
+                # To avoid errors when nested list is not documented in
+                # the OpenAPI spec, but it is present in the API response
+                if nlist_path is None:
+                    continue
+
                 nlist = nlist_path
 
                 # For each item in the nested list,

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/baked/util.py

@@ -8,6 +8,67 @@ from typing import Any, Dict, List, Set, Tuple
 
 from openapi3.schemas import Schema
 
+# The maximum schema nesting depth `_schema_richness` will traverse before
+# bailing out. This is purely a safety valve to guarantee termination on
+# self-referential or pathologically deep schemas (which the recursion would
+# otherwise follow forever); it is far deeper than any real Linode API response
+# model, so it never affects scoring in practice.
+_MAX_RICHNESS_DEPTH = 32
+
+
+def _schema_richness(schema: Any, _depth: int = 0) -> int:
+    """
+    Estimates how complete a schema definition is, used to decide which
+    definition to keep when the same property appears in multiple composition
+    (oneOf/allOf/anyOf) branches.
+
+    A branch that nulls a property out (e.g. ``{"type": "object", "nullable":
+    true}`` with no properties) should never overwrite a branch that fully
+    defines that property's nested structure. The score is a recursive measure
+    of how much structure a schema actually contains, so a fuller definition always outscores a
+    sparser one regardless of the
+    order the branches appear in.
+
+    :param schema: The schema (or raw schema dict) to score.
+    :return: A non-negative integer; higher means more complete.
+    """
+
+    # Guard against pathologically deep or self-referential schemas.
+    if _depth > _MAX_RICHNESS_DEPTH:
+        return 0
+
+    def get(source: Any, attr: str) -> Any:
+        if isinstance(source, dict):
+            return source.get(attr)
+        return getattr(source, attr, None)
+
+    score = 0
+
+    # Count each defined property, plus the richness of its own definition so
+    # that deeply-nested structure contributes to the total.
+    properties = get(schema, "properties")
+    if properties:
+        for _, prop in properties.items():
+            score += 1 + _schema_richness(prop, _depth + 1)
+
+    # Account for composite (oneOf/allOf/anyOf) definitions by summing the
+    # richness of each branch.
+    for composition_field in ("oneOf", "allOf", "anyOf"):
+        for branch in get(schema, composition_field) or []:
+            score += 1 + _schema_richness(branch, _depth + 1)
+
+    # Account for array item schemas so arrays of objects are scored by their
+    # element structure.
+    array_items = get(schema, "items")
+    if array_items is not None:
+        score += _schema_richness(array_items, _depth + 1)
+
+    additional_properties = get(schema, "additionalProperties")
+    if additional_properties is not None:
+        score += 1 + _schema_richness(additional_properties, _depth + 1)
+
+    return score
+
 
 def _aggregate_schema_properties(
     schema: Schema,
@@ -48,7 +109,20 @@ def _aggregate_schema_properties(
             return
 
         # This is a valid option
-        properties.update(entry.properties)
+        for key, value in entry.properties.items():
+            # When the same property is defined in multiple composition
+            # branches (e.g. a oneOf of interface variants that each define
+            # `public`, `vpc`, `vlan`, etc.), keep the most complete
+            # definition instead of letting a later, emptier branch overwrite
+            # it. Otherwise nested fields like `public.ipv6.ranges.range`
+            # would be silently dropped when a subsequent branch nulls the
+            # property out.
+            if key in properties and _schema_richness(
+                value
+            ) <= _schema_richness(properties[key]):
+                continue
+
+            properties[key] = value
 
         nonlocal schema_count
         schema_count += 1

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/configuration/auth.py

@@ -214,11 +214,12 @@ def _get_token_terminal(base_url: str) -> Tuple[str, str]:
     :returns: A tuple containing the user's username and token.
     :rtype: Tuple[str, str]
     """
-    print(f"""
-First, we need a Personal Access Token.  To get one, please visit
-{TOKEN_GENERATION_URL} and click
-"Create a Personal Access Token".  The CLI needs access to everything
-on your account to work correctly.""")
+    print(
+        "First, we need a Personal Access Token.  To get one, please visit\n"
+        f"{TOKEN_GENERATION_URL} and click\n"
+        '"Create a Personal Access Token".  The CLI needs access to everything\n'
+        "on your account to work correctly."
+    )
 
     while True:
         token = input("Personal Access Token: ")

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/configuration/helpers.py

@@ -97,9 +97,10 @@ def _check_browsers() -> bool:
 
     # pylint: disable-next=protected-access
     if not KNOWN_GOOD_BROWSERS.intersection(webbrowser._tryorder):
-        print("""
-This tool defaults to web-based authentication,
-however no known-working browsers were found.""")
+        print(
+            "This tool defaults to web-based authentication,\n"
+            "however no known-working browsers were found."
+        )
         while True:
             r = input("Try it anyway? [y/N]: ")
             if r.lower() in "yn ":

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/plugins/get-kubeconfig.py

@@ -8,6 +8,7 @@ Usage:
 
 import argparse
 import base64
+import os
 import sys
 from pathlib import Path
 
@@ -19,6 +20,11 @@ from linodecli.plugins import inherit_plugin_args
 
 PLUGIN_BASE = "linode-cli get-kubeconfig"
 
+# Kubeconfigs contain credentials, so they should only be
+# accessible by the user that created them.
+KUBECONFIG_FILE_MODE = 0o600
+KUBECONFIG_DIR_MODE = 0o700
+
 
 def call(args, context):
     """
@@ -147,8 +153,27 @@ def _load_config(filepath):
 
 # Dumps data to a yaml file
 def _dump_config(filepath, data):
-    Path.mkdir(filepath.parent, exist_ok=True)
-    with open(filepath, "w", encoding="utf-8") as file_descriptor:
+    filepath.parent.mkdir(mode=KUBECONFIG_DIR_MODE, parents=True, exist_ok=True)
+
+    # Create the file with restrictive permissions rather than chmod-ing it
+    # afterwards, so its contents are never briefly readable by other users.
+    # NOTE: The mode is only applied when the file is created.
+    def opener(path, flags):
+        return os.open(path, flags, mode=KUBECONFIG_FILE_MODE)
+
+    with open(
+        filepath, "w", encoding="utf-8", opener=opener
+    ) as file_descriptor:
+        # Tighten the permissions of pre-existing files that are readable or
+        # writable by users other than the owner.
+        # NOTE: os.fchmod is not available on Windows, where POSIX file modes
+        # are not meaningful anyway.
+        if (
+            hasattr(os, "fchmod")
+            and os.fstat(file_descriptor.fileno()).st_mode & 0o077
+        ):
+            os.fchmod(file_descriptor.fileno(), KUBECONFIG_FILE_MODE)
+
         yaml.dump(data, file_descriptor)
 
 

{linode_cli-5.68.0 → linode_cli-5.69.0}/linodecli/version.py

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