Merge pull request #797 from linode/dev

Release v5.60.0

Author: ezilber-akamai

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # pin@v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # pin@v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # pin@v3.11.1
 
       - name: Login to Docker Hub
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # pin@v3.4.0

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

@@ -66,7 +66,7 @@ jobs:
           commit_sha: ${{ steps.calculate_head_sha.outputs.commit_sha }}
 
       - name: Release
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # pin@v2.2.2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # pin@v2.3.2
         with:
           target_commitish: 'main'
           token: ${{ steps.generate_token.outputs.token }}

linodecli/__init__.py

@@ -80,6 +80,7 @@ def main():  # pylint: disable=too-many-branches,too-many-statements
     cli.page = parsed.page
     cli.page_size = parsed.page_size
     cli.debug_request = parsed.debug
+    cli.raw_body = parsed.raw_body
 
     if parsed.as_user and not skip_config:
         cli.config.set_user(parsed.as_user)

linodecli/api_request.py

@@ -348,21 +348,49 @@ def _build_request_body(
 
     :return: A JSON string representing the request body, or None if not applicable.
     """
-    if operation.method == "get":
-        # Get operations don't have a body
+    if operation.method in ("get", "delete"):
+        # GET and DELETE operations don't have a body
+        if ctx.raw_body is not None:
+            print(
+                f"--raw-body cannot be specified for actions with method {operation.method}",
+                file=sys.stderr,
+            )
+            sys.exit(ExitCodes.ARGUMENT_ERROR)
+
         return None
 
+    param_names = {param.name for param in operation.params}
+
+    # Returns whether the given argument should be included in the request body
+    def __should_include(key: str, value: Any) -> bool:
+        return value is not None and key not in param_names
+
+    # If the user has specified the --raw-body argument,
+    # return it.
+    if ctx.raw_body is not None:
+        specified_keys = [
+            k for k, v in vars(parsed_args).items() if __should_include(k, v)
+        ]
+
+        if len(specified_keys) > 0:
+            print(
+                "--raw-body cannot be specified with action arguments: "
+                + ", ".join(sorted(f"--{key}" for key in specified_keys)),
+                file=sys.stderr,
+            )
+            sys.exit(ExitCodes.ARGUMENT_ERROR)
+
+        return ctx.raw_body
+
     # Merge defaults into body if applicable
     if ctx.defaults:
         parsed_args = ctx.config.update(parsed_args, operation.allowed_defaults)
 
-    param_names = {param.name for param in operation.params}
-
     expanded_json = {}
 
     # Expand dotted keys into nested dictionaries
     for k, v in vars(parsed_args).items():
-        if v is None or k in param_names:
+        if not __should_include(k, v):
             continue
 
         path_segments = get_path_segments(k)

linodecli/arg_helpers.py

@@ -81,6 +81,14 @@ def register_args(parser: ArgumentParser) -> ArgumentParser:
         help="The alias to set or remove.",
     )
 
+    parser.add_argument(
+        "--raw-body",
+        type=str,
+        help="The raw JSON to use as the request body of an action. "
+        + "This argument cannot be used if action-specific arguments are specified. "
+        + "Additionally, this argument can only be used with POST and PUT actions.",
+    )
+
     # Register shared argument groups
     register_output_args_shared(parser)
     register_pagination_args_shared(parser)

linodecli/cli.py

@@ -44,6 +44,7 @@ def __init__(self, version, base_url, skip_config=False):
         self.base_url = base_url
         self.spec_version = "None"
         self.suppress_warnings = False
+        self.raw_body = None
 
         self.output_handler = OutputHandler()
         self.config = CLIConfig(self.base_url, skip_config=skip_config)

linodecli/plugins/get-kubeconfig.py

@@ -130,7 +130,7 @@ def _get_kubeconfig_by_label(cluster_label, client):
 # Loads a yaml file
 def _load_config(filepath):
     with open(filepath, "r", encoding="utf-8") as file_descriptor:
-        data = yaml.load(file_descriptor, Loader=yaml.Loader)
+        data = yaml.safe_load(file_descriptor)
 
     if not data:
         print(f"Could not load file at {filepath}", file=sys.stderr)