v5.62.0

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
   docker-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag linode/cli:$(date +%s) --build-arg="github_token=$GITHUB_TOKEN"
       env:
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: setup python 3
         uses: actions/setup-python@v5
@@ -37,7 +37,7 @@ jobs:
         python-version: [ "3.9","3.10","3.11", "3.12", "3.13" ]
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -59,7 +59,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5

.github/workflows/codeql.yml

@@ -23,7 +23,7 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/dependency-review.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4
         with:

.github/workflows/e2e-suite-windows.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
       # Check out merge commit
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.sha }}
 
@@ -109,7 +109,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'

.github/workflows/e2e-suite.yml

@@ -59,15 +59,15 @@ jobs:
     steps:
       - name: Checkout Repository with SHA
         if: ${{ inputs.sha != '' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'
           ref: ${{ inputs.sha }}
 
       - name: Checkout Repository without SHA
         if: ${{ inputs.sha == '' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'
@@ -170,7 +170,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'
@@ -237,13 +237,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'
 
       - name: Download test report
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: test-report-file
 

.github/workflows/labeler.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       -
         name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916

.github/workflows/nightly-smoke-tests.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: 'recursive'

.github/workflows/publish-wiki.yml

@@ -14,5 +14,5 @@ jobs:
   publish-wiki:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: Andrew-Chen-Wang/github-wiki-action@50650fccf3a10f741995523cf9708c53cec8912a # pin@v4.4.0
+      - uses: actions/checkout@v5
+      - uses: Andrew-Chen-Wang/github-wiki-action@2c80c13ee98aa43683bd77973ef4916e2eedf817 # pin@v5.0.1

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: setup python 3
         uses: actions/setup-python@v5
@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # pin@v3.11.1
 
       - name: Login to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # pin@v3.4.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # pin@v3.5.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -86,7 +86,7 @@ jobs:
     environment: pypi-release
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5

.github/workflows/remote-release-trigger.yml

@@ -15,7 +15,7 @@ jobs:
           private_key: ${{ secrets.CLI_RELEASE_PRIVATE_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # We want to checkout the main branch
           ref: 'main'

linodecli/api_request.py

@@ -18,8 +18,8 @@
 from linodecli.helpers import API_CA_PATH, API_VERSION_OVERRIDE
 
 from .baked.operation import (
-    ExplicitEmptyDictValue,
     ExplicitEmptyListValue,
+    ExplicitJsonValue,
     ExplicitNullValue,
     OpenAPIOperation,
 )
@@ -314,14 +314,14 @@ def _traverse_request_body(o: Any) -> Any:
                 result[k] = []
                 continue
 
-            if isinstance(v, ExplicitEmptyDictValue):
-                result[k] = {}
-                continue
-
             if isinstance(v, ExplicitNullValue):
                 result[k] = None
                 continue
 
+            if isinstance(v, ExplicitJsonValue):
+                result[k] = v.json_value
+                continue
+
             value = _traverse_request_body(v)
 
             # We should exclude implicit empty lists

linodecli/baked/operation.py

@@ -10,9 +10,11 @@
 import re
 import sys
 from collections import defaultdict
+from collections.abc import Callable
+from dataclasses import dataclass
 from getpass import getpass
 from os import environ, path
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import openapi3.paths
@@ -49,46 +51,12 @@ def parse_boolean(value: str) -> bool:
     raise argparse.ArgumentTypeError("Expected a boolean value")
 
 
-def parse_dict(
-    value: str,
-) -> Union[Dict[str, Any], "ExplicitEmptyDictValue", "ExplicitEmptyListValue"]:
-    """
-    A helper function to decode incoming JSON data as python dicts.  This is
-    intended to be passed to the `type=` kwarg for ArgumentParaser.add_argument.
-
-    :param value: The json string to be parsed into dict.
-    :type value: str
-
-    :returns: The dict value of the input.
-    :rtype: dict, ExplicitEmptyDictValue, or ExplicitEmptyListValue
-    """
-    if not isinstance(value, str):
-        raise argparse.ArgumentTypeError("Expected a JSON string")
-
-    try:
-        result = json.loads(value)
-    except Exception as e:
-        raise argparse.ArgumentTypeError("Expected a JSON string") from e
-
-    # This is necessary because empty dicts and lists are excluded from requests
-    # by default, but we still want to support user-defined empty dict
-    # strings. This is particularly helpful when updating LKE node pool
-    # labels and taints.
-    if isinstance(result, dict) and result == {}:
-        return ExplicitEmptyDictValue()
-
-    if isinstance(result, list) and result == []:
-        return ExplicitEmptyListValue()
-
-    return result
-
-
 TYPES = {
     "string": str,
     "integer": int,
     "boolean": parse_boolean,
     "array": list,
-    "object": parse_dict,
+    "object": lambda value: ExplicitJsonValue(json_value=json.loads(value)),
     "number": float,
 }
 
@@ -106,13 +74,16 @@ class ExplicitEmptyListValue:
     """
 
 
-class ExplicitEmptyDictValue:
+@dataclass
+class ExplicitJsonValue:
     """
-    A special type used to explicitly pass empty dictionaries to the API.
+    A special type used to explicitly pass raw JSON from user input as is.
     """
 
+    json_value: Any
+
 
-def wrap_parse_nullable_value(arg_type: str) -> TYPES:
+def wrap_parse_nullable_value(arg_type: str) -> Callable[[Any], Any]:
     """
     A helper function to parse `null` as None for nullable CLI args.
     This is intended to be called and passed to the `type=` kwarg for ArgumentParser.add_argument.

linodecli/configuration/config.py

@@ -126,7 +126,7 @@ def print_users(self):
         default_user = self.default_username()
 
         for sec in self.config.sections():
-            if sec != "DEFAULT":
+            if sec not in ("DEFAULT", "custom_aliases"):
                 print(f'{"*" if sec == default_user else " "}  {sec}')
 
         sys.exit(ExitCodes.SUCCESS)

tests/integration/account/test_account.py

@@ -196,6 +196,7 @@ def test_account_setting_view():
         "longview_subscription",
         "network_helper",
         "interfaces_for_new_linodes",
+        "maintenance_policy",
     ]
 
     settings_text = exec_test_command(
@@ -343,7 +344,15 @@ def test_maintenance_list():
     )
     lines = res.splitlines()
 
-    headers = ["entity.type", "entity.label"]
+    headers = [
+        "complete_time",
+        "entity.type",
+        "entity.label",
+        "maintenance_policy_set",
+        "not_before",
+        "source",
+        "start_time",
+    ]
     assert_headers_in_lines(headers, lines)
 
 

tests/integration/database/test_database_engine_config.py

@@ -497,7 +497,7 @@ def test_mysql_engine_config_view():
     binlog_retention = mysql_config[0]["binlog_retention_period"]
     assert binlog_retention["type"] == "integer"
     assert binlog_retention["minimum"] == 600
-    assert binlog_retention["maximum"] == 86400
+    assert binlog_retention["maximum"] == 604800
     assert binlog_retention["requires_restart"] is False
 
     mysql_settings = mysql_config[0]["mysql"]

tests/integration/helpers.py

@@ -16,9 +16,9 @@
 # TypeVars for generic type hints below
 T = TypeVar("T")
 
-
 MODULES = [
     "account",
+    "alerts",
     "domains",
     "linodes",
     "nodebalancers",
@@ -33,7 +33,9 @@
     "linodes",
     "lke",
     "longview",
+    "maintenance",
     "managed",
+    "monitor",
     "networking",
     "obj",
     "object-storage",
@@ -100,8 +102,41 @@ def exec_failing_test_command(
 
 
 # Delete/Remove helper functions (mainly used in clean-ups after tests)
-def delete_target_id(target: str, id: str, delete_command: str = "delete"):
-    command = ["linode-cli", target, delete_command, id]
+def delete_target_id(
+    target: str,
+    id: str,
+    delete_command: str = "delete",
+    service_type: str = None,
+    use_retry: bool = False,
+    retries: int = 3,
+    delay: int = 80,
+):
+    if service_type:
+        command = ["linode-cli", target, delete_command, service_type, id]
+    else:
+        command = ["linode-cli", target, delete_command, id]
+
+    if use_retry:
+        last_exc = None
+        for attempt in range(retries):
+            try:
+                subprocess.run(
+                    command,
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                )
+                return  # success
+            except Exception as e:
+                last_exc = e
+                if attempt < retries - 1:
+                    time.sleep(delay)
+        # If all retries fail, raise
+        raise RuntimeError(
+            f"Error executing command '{' '.join(command)}' after {retries} retries: {last_exc}"
+        )
+
     try:
         subprocess.run(
             command,