linode-cli 5.65.0__tar.gz → 5.66.0__tar.gz

{linode_cli-5.65.0/linode_cli.egg-info → linode_cli-5.66.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linode-cli
-Version: 5.65.0
+Version: 5.66.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
@@ -54,7 +54,7 @@ Visit the [Wiki](../../wiki/Installation) for more information.
 
 ## Contributing
 
-This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-docs).  As
+This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-openapi).  As
 such, many changes are made directly to the spec.
 
 Please follow the [Contributing Guidelines](https://github.com/linode/linode-cli/blob/main/CONTRIBUTING.md) when making a contribution.

{linode_cli-5.65.0 → linode_cli-5.66.0}/README.md

@@ -21,7 +21,7 @@ Visit the [Wiki](../../wiki/Installation) for more information.
 
 ## Contributing
 
-This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-docs).  As
+This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-openapi).  As
 such, many changes are made directly to the spec.
 
 Please follow the [Contributing Guidelines](https://github.com/linode/linode-cli/blob/main/CONTRIBUTING.md) when making a contribution.

{linode_cli-5.65.0 → linode_cli-5.66.0/linode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linode-cli
-Version: 5.65.0
+Version: 5.66.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
@@ -54,7 +54,7 @@ Visit the [Wiki](../../wiki/Installation) for more information.
 
 ## Contributing
 
-This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-docs).  As
+This CLI is generated from the [OpenAPI specification for Linode's API](https://github.com/linode/linode-api-openapi).  As
 such, many changes are made directly to the spec.
 
 Please follow the [Contributing Guidelines](https://github.com/linode/linode-cli/blob/main/CONTRIBUTING.md) when making a contribution.

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/arg_helpers.py

@@ -4,6 +4,7 @@ Argument parser for the linode CLI.
 This module defines argument parsing, plugin registration, and plugin removal
 functionalities for the Linode CLI.
 """
+
 import sys
 from argparse import ArgumentParser
 from configparser import ConfigParser

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/baked/request.py

@@ -160,6 +160,10 @@ def _parse_request_model(
     for k, v in properties.items():
         k = escape_arg_segment(k)
 
+        # Skip attributes with x-linode-cli-skip extension
+        if v.extensions.get("linode-cli-skip"):
+            continue
+
         # Handle nested objects which aren't read-only and have properties
         if (
             v.type == "object"

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/baked/response.py

@@ -193,6 +193,10 @@ def _parse_response_model(schema, prefix=None, nested_list_depth=0):
     for k, v in properties.items():
         pref = prefix + "." + k if prefix else k
 
+        # Skip attributes with x-linode-cli-skip extension
+        if v.extensions.get("linode-cli-skip"):
+            continue
+
         if (
             v.type == "object"
             and v.properties is None

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/cli.py

@@ -286,7 +286,7 @@ class CLI:  # pylint: disable=too-many-instance-attributes
         """
         return (
             f"linode-cli/{self.version} "
-            f"linode-api-docs/{self.spec_version} "
+            f"linode-api-openapi/{self.spec_version} "
             f"python/{version_info[0]}.{version_info[1]}.{version_info[2]}"
         )
 

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/completion.py

@@ -2,6 +2,7 @@
 """
 Contains any code relevant to generating/updating shell completions for linode-cli
 """
+
 from string import Template
 
 from openapi3 import OpenAPI
@@ -93,12 +94,10 @@ complete -F _linode_cli linode
 complete -F _linode_cli lin"""
     )
 
-    command_template = Template(
-        """$command)
+    command_template = Template("""$command)
         COMPREPLY=( $(compgen -W "$actions --help" -- ${cur}) )
         return 0
-        ;;"""
-    )
+        ;;""")
 
     command_blocks = [
         command_template.safe_substitute(

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/configuration/auth.py

@@ -214,13 +214,11 @@ 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"""
+    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."""
-    )
+on your account to work correctly.""")
 
     while True:
         token = input("Personal Access Token: ")
@@ -329,15 +327,13 @@ def _handle_oauth_callback() -> str:
     # figure out the URL to direct the user to and print out the prompt
     # pylint: disable-next=line-too-long
     url = f"https://login.linode.com/oauth/authorize?client_id={OAUTH_CLIENT_ID}&response_type=token&scopes=*&redirect_uri=http://localhost:{serv.server_address[1]}"
-    print(
-        f"""A browser should open directing you to this URL to authenticate:
+    print(f"""A browser should open directing you to this URL to authenticate:
 
 {url}
 
 If you are not automatically directed there, please copy/paste the link into your browser
 to continue..
-"""
-    )
+""")
 
     webbrowser.open(url)
 
@@ -348,7 +344,7 @@ to continue..
     except KeyboardInterrupt:
         print(
             "\nGiving up.  If you couldn't get web authentication to work, please "
-            "try token using a token by invoking with `linode-cli configure --token`, "
+            "try using a token by invoking with `linode-cli configure --token`, "
             "and open an issue at https://github.com/linode/linode-cli",
             file=sys.stderr,
         )

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/configuration/helpers.py

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

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/plugins/obj/__init__.py

@@ -2,6 +2,7 @@
 """
 CLI Plugin for handling OBJ
 """
+
 import getpass
 import os
 import re

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/plugins/obj/config.py

@@ -2,13 +2,24 @@
 The config of the object storage plugin.
 """
 
+import os
+import re
 import shutil
 
 ENV_ACCESS_KEY_NAME = "LINODE_CLI_OBJ_ACCESS_KEY"
 ENV_SECRET_KEY_NAME = "LINODE_CLI_OBJ_SECRET_KEY"
-# replace {} with the cluster name
-BASE_URL_TEMPLATE = "https://{}.linodeobjects.com"
-BASE_WEBSITE_TEMPLATE = "{bucket}.website-{cluster}.linodeobjects.com"
+
+API_HOST = os.getenv("LINODE_CLI_API_HOST", "")
+
+OBJ_DOMAIN = "linodeobjects.com"
+
+if API_HOST:
+    match = re.match(r"api\.([^.]+)\.linode\.com", API_HOST)
+    if match:
+        OBJ_DOMAIN = f"{match.group(1)}.linodeobjects.com"
+
+BASE_URL_TEMPLATE = f"https://{{}}.{OBJ_DOMAIN}"
+BASE_WEBSITE_TEMPLATE = f"{{bucket}}.website-{{cluster}}.{OBJ_DOMAIN}"
 
 # for all date output
 DATE_FORMAT = "%Y-%m-%d %H:%M"

{linode_cli-5.65.0 → linode_cli-5.66.0}/linodecli/version.py

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