Merge branch 'dev' into dependabot/github_actions/Andrew-Chen-Wang/github-wiki-action-5.0.1

Author: zliang-akamai

.github/workflows/e2e-suite.yml

@@ -294,7 +294,7 @@ jobs:
     steps:
       - name: Notify Slack
         id: main_message
-        uses: slackapi/slack-github-action@v2.1.0
+        uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}
@@ -326,7 +326,7 @@ jobs:
 
       - name: Test summary thread
         if: success()
-        uses: slackapi/slack-github-action@v2.1.0
+        uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}

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

@@ -46,7 +46,7 @@ jobs:
 
       - name: Notify Slack
         if: always() && github.repository == 'linode/linode-cli' # Run even if integration tests fail and only on main repository
-        uses: slackapi/slack-github-action@v2.1.0
+        uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Notify Slack - Main Message
         id: main_message
-        uses: slackapi/slack-github-action@v2.1.0
+        uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}
@@ -42,7 +42,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # [email protected]
 
       - 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 # [email protected]

.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 }}

Makefile

@@ -64,7 +64,7 @@ test-unit:
 	@mkdir -p /tmp/linode/.config
 	@orig_xdg_config_home=$${XDG_CONFIG_HOME:-}; \
 	export LINODE_CLI_TEST_MODE=1 XDG_CONFIG_HOME=/tmp/linode/.config; \
-	pytest -v tests/unit; \
+	pytest -vv tests/unit; \
 	exit_code=$$?; \
 	export XDG_CONFIG_HOME=$$orig_xdg_config_home; \
 	exit $$exit_code

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/baked/request.py

@@ -48,6 +48,8 @@ def __init__(  # pylint: disable=too-many-arguments
         :type parent: Optional[str]
         :param depth: The depth of this argument, or how many parent arguments this argument has.
         :type depth: int
+        :param option_variants: A mapping of options, defined using oneOf in the to spec,
+                                to a variant of this argument.
         """
         #: The name of this argument, mostly used for display and docs
         self.name = name
@@ -147,6 +149,7 @@ def _parse_request_model(
     :returns: The flattened request model, as a list
     :rtype: list[OpenAPIRequestArg]
     """
+
     args = []
 
     properties, required = _aggregate_schema_properties(schema)

linodecli/baked/util.py

@@ -24,28 +24,39 @@ def _aggregate_schema_properties(
     properties = {}
     required = defaultdict(lambda: 0)
 
-    def _handle_schema(_schema: Schema):
-        if _schema.properties is None:
+    def __inner(
+        path: List[str],
+        entry: Schema,
+    ):
+        if isinstance(entry, dict):
+            # TODO: Figure out why this happens (openapi3 package bug?)
+            # pylint: disable=protected-access
+            entry = Schema(path, entry, schema._root)
+
+        if entry.properties is None:
+            # If there aren't any properties, this might be a
+            # composite schema
+            for composition_field in ["oneOf", "allOf", "anyOf"]:
+                for i, nested_entry in enumerate(
+                    getattr(entry, composition_field) or []
+                ):
+                    __inner(
+                        schema.path + [composition_field, str(i)],
+                        nested_entry,
+                    )
+
             return
 
+        # This is a valid option
+        properties.update(entry.properties)
+
         nonlocal schema_count
         schema_count += 1
 
-        properties.update(dict(_schema.properties))
-
-        # Aggregate required keys and their number of usages.
-        if _schema.required is not None:
-            for key in _schema.required:
-                required[key] += 1
-
-    _handle_schema(schema)
-
-    one_of = schema.oneOf or []
-    any_of = schema.anyOf or []
+        for key in entry.required or []:
+            required[key] += 1
 
-    for entry in one_of + any_of:
-        # pylint: disable=protected-access
-        _handle_schema(Schema(schema.path, entry, schema._root))
+    __inner(schema.path, schema)
 
     return (
         properties,