linode-cli 5.52.0__tar.gz → 5.52.2__tar.gz

{linode_cli-5.52.0/linode_cli.egg-info → linode_cli-5.52.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linode-cli
-Version: 5.52.0
+Version: 5.52.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

{linode_cli-5.52.0 → linode_cli-5.52.2/linode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linode-cli
-Version: 5.52.0
+Version: 5.52.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

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/configuration/config.py

@@ -290,7 +290,10 @@ class CLIConfig:
         ):
             print(f"User {username} is not configured.")
             sys.exit(ExitCodes.USERNAME_ERROR)
-        if not self.config.has_section(username) or allowed_defaults is None:
+        if (
+            not self.config.has_section(username)
+            and self.config.default_section is None
+        ) or allowed_defaults is None:
             return namespace
 
         warn_dict = {}
@@ -335,12 +338,6 @@ class CLIConfig:
         to save values they've set, and is used internally to update the config
         on disk when a new user if configured.
         """
-
-        # Create the config path isf necessary
-        config_path = f"{os.path.expanduser('~')}/.config"
-        if not os.path.exists(config_path):
-            os.makedirs(config_path)
-
         with open(_get_config_path(), "w", encoding="utf-8") as f:
             self.config.write(f)
 

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/configuration/helpers.py

@@ -15,6 +15,8 @@ CONFIG_DIR = os.environ.get(
     "XDG_CONFIG_HOME", f"{os.path.expanduser('~')}/.config"
 )
 
+ENV_CONFIG_FILE_PATH = "LINODE_CLI_CONFIG"
+
 # this is a list of browser that _should_ work for web-based auth.  This is mostly
 # intended to exclude lynx and other terminal browsers which could be opened, but
 # won't work.
@@ -38,11 +40,23 @@ def _get_config_path() -> str:
     :returns: The path to the local config file.
     :rtype: str
     """
+    custom_path = os.getenv(ENV_CONFIG_FILE_PATH, None)
+
+    if custom_path is not None:
+        custom_path = os.path.expanduser(custom_path)
+        if not os.path.exists(custom_path):
+            os.makedirs(os.path.dirname(custom_path), exist_ok=True)
+        return custom_path
+
     path = f"{LEGACY_CONFIG_DIR}/{LEGACY_CONFIG_NAME}"
     if os.path.exists(path):
         return path
 
-    return f"{CONFIG_DIR}/{CONFIG_NAME}"
+    path = f"{CONFIG_DIR}/{CONFIG_NAME}"
+    if not os.path.exists(path):
+        os.makedirs(CONFIG_DIR, exist_ok=True)
+
+    return path
 
 
 def _get_config(load: bool = True):

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/help_pages.py

@@ -30,6 +30,8 @@ HELP_ENV_VARS = {
     "(e.g. 'v4beta')",
     "LINODE_CLI_API_SCHEME": "Overrides the target scheme used for API requests. "
     "(e.g. 'https')",
+    "LINODE_CLI_CONFIG": "Overrides the default configuration file path. "
+    "(e.g '~/.linode/my-cli-config')",
 }
 
 HELP_TOPICS = {

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/overrides.py

@@ -4,7 +4,7 @@ This allows us to easily alter per-command outputs, etc. without making
 large changes to the OpenAPI spec.
 """
 
-from typing import Dict
+from typing import Dict, List
 
 from rich import box
 from rich import print as rprint
@@ -57,6 +57,15 @@ def handle_types_region_prices_list(
     return linode_types_with_region_prices(operation, output_handler, json_data)
 
 
+@output_override("images", "replicate", OutputMode.table)
+def handle_image_replicate(operation, output_handler, json_data) -> bool:
+    # pylint: disable=unused-argument
+    """
+    Override the output of 'linode-cli images replicate'.
+    """
+    return image_replicate_output(json_data)
+
+
 def linode_types_with_region_prices(
     operation, output_handler, json_data
 ) -> bool:
@@ -137,3 +146,45 @@ def format_region_prices(data: Dict[str, any]) -> any:
         sub_table.add_row(*region_price_row)
 
     return sub_table
+
+
+def build_replicas_output(replicas: List) -> Table:
+    """
+    Format nested replicas list to a sub-table.
+    """
+    replicas_output = Table(show_header=False, box=None)
+    replicas_headers = replicas[0].keys()
+    for replica in replicas:
+        row = []
+        for h in replicas_headers:
+            row.append(Align(str(replica[h]), align="left"))
+        replicas_output.add_row(*row)
+
+    return replicas_output
+
+
+def image_replicate_output(json_data) -> bool:
+    """
+    Parse and format the image replicate output table.
+    """
+    output = Table(
+        header_style="bold",
+        show_lines=True,
+    )
+
+    row = []
+    for header in json_data.keys():
+        if header == "regions" and len(json_data[header]) > 0:
+            # leverage `replicas` in output for readability
+            output.add_column("replicas", justify="center")
+            row.append(build_replicas_output(json_data[header]))
+        elif json_data[header] is not None:
+            output.add_column(header, justify="center")
+            row.append(Align(str(json_data[header]), align="left"))
+
+    output.add_row(*row)
+
+    console = Console()
+    console.print(output)
+
+    return False

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/plugins/get-kubeconfig.py

@@ -90,7 +90,7 @@ def call(args, context):
         else cluster_config
     )
     if parsed.dry_run:
-        print(cluster_config)
+        print(yaml.dump(cluster_config))
     else:
         _dump_config(kubeconfig_path, cluster_config)
 
@@ -146,27 +146,35 @@ def _dump_config(filepath, data):
         yaml.dump(data, file_descriptor)
 
 
-# Merges the lists in the provided dicts. If non-list properties of the two
-# dicts differ, uses the value from the first dict.
 def _merge_dict(dict_1, dict_2):
+    """
+    Merges two dicts:
+    * Lists that are present in both dicts are merged together by their "name" key
+      (preferring duplicate values in the first dict)
+    * `None` or missing keys in the first dict are set to the second dict's value
+    * Other values are preferred from the first dict
+    """
     # Return a new dict to prevent any accidental mutations
     result = {}
 
-    for key in dict_1:
-        if not isinstance(dict_1[key], list):
-            result[key] = dict_1[key]
-            continue
-
-        merge_map = {sub["name"]: sub for sub in dict_1[key]}
-
-        for sub in dict_2[key]:
-            # If the name is already in the merge map, skip
-            if sub["name"] in merge_map:
-                continue
-
-            merge_map[sub["name"]] = sub
-
-        # Convert back to a list
-        result[key] = list(merge_map.values())
+    for key, dict_1_value in dict_1.items():
+        if dict_1_value is None and (dict_2_value := dict_2.get(key)):
+            # Replace null value in previous config
+            result[key] = dict_2_value
+        elif isinstance(dict_1_value, list) and (
+            dict_2_value := dict_2.get(key)
+        ):
+            merge_map = {sub["name"]: sub for sub in dict_1_value}
+            for list_2_item in dict_2_value:
+                if (list_2_name := list_2_item["name"]) not in merge_map:
+                    merge_map[list_2_name] = list_2_item
+            # Convert back to a list
+            result[key] = list(merge_map.values())
+        else:
+            result[key] = dict_1_value
+
+    # Process keys missing in dict_1
+    for key in set(dict_2.keys()).difference(dict_1.keys()):
+        result[key] = dict_2[key]
 
     return result

{linode_cli-5.52.0 → linode_cli-5.52.2}/linodecli/version.py

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