twc-cli 2.6.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 В этом файле описаны все значимые изменения в Timeweb Cloud CLI. В выпусках мы придерживается правил [семантического версионирования](https://semver.org/lang/ru/).
 
+# Версия 2.7.0 (2024.11.02)
+
+## Добавлено
+
+- Добавлена новая команда `twc whoami`, которая показывает логин аккаунта, в котором в текущий момент авторизован CLI.
+
+## Изменено
+
+- Команда `twc account status` теперь также отображает логин аккаунта.
+
+## Исправлено
+
+- Устранено падение программы при листинге образов (`twc image list`) и при создании сервера из образа.
+- Исправлена ошибка при создании сервера с приватной сетью в зоне доступности SPB-3.
+- Исправлены ошибки в командах `twc storage subdomain gencert` и `twc storage subdomain remove`, возникшие из-за нарушения обратной совместимости эндпоинтов API.
+- Исправлена ошибка валидации приватного адреса при созаднии сервера — ошибочно запрещалось использовать 4-й по порядку адрес в подсети.
+- Исправлена ошибка разбора JSON при выводе списка ресурсов в проекте.
+- Исправлены ошибки добавления TXT записи для домена в команде `twc domain record add`.
+- Исправлена ошибка парсинка субдомена в команде `twc domain record add`.
+- Исправлены ошибки обновления DNS-записей на поддоменах.
+
 # Версия 2.6.0 (2024.08.14)
 
 ## Добавлено

twc/__main__.py

@@ -21,6 +21,7 @@ from .commands import (
     vpc,
     firewall,
     floating_ip,
+    whoami,
 )
 from .commands.common import version_callback, version_option, verbose_option
 
@@ -46,6 +47,7 @@ cli.add_typer(domain, name="domain", aliases=["domains", "d"])
 cli.add_typer(vpc, name="vpc", aliases=["vpcs", "network", "networks"])
 cli.add_typer(firewall, name="firewall", aliases=["fw"])
 cli.add_typer(floating_ip, name="ip", aliases=["ips"])
+cli.add_typer(whoami, name="whoami", aliases=[])
 
 
 @cli.command("version")

twc/__version__.py

@@ -12,5 +12,5 @@
 import sys
 
 
-__version__ = "2.6.0"
+__version__ = "2.7.0"
 __pyversion__ = sys.version.replace("\n", "")

twc/api/client.py

@@ -469,14 +469,11 @@ class TimewebCloud(TimewebCloudBase):
     # -----------------------------------------------------------------------
     # Images
 
-    def get_images(
-        self, limit: int = 100, offset: int = 0, with_deleted: bool = False
-    ):
+    def get_images(self, limit: int = 100, offset: int = 0):
         """Get list of images."""
         params = {
             "limit": limit,
             "offset": offset,
-            "with_deleted": with_deleted,
         }
         return self._request("GET", f"{self.api_url}/images", params=params)
 
@@ -1416,6 +1413,8 @@ class TimewebCloud(TimewebCloudBase):
         value: str,
         subdomain: Optional[str] = None,
         priority: Optional[int] = None,
+        *,
+        null_subdomain: bool = False,
     ):
         """Add DNS record to domain."""
         payload = {
@@ -1424,6 +1423,8 @@ class TimewebCloud(TimewebCloudBase):
             **({"subdomain": subdomain} if subdomain else {}),
             **({"priority": priority} if priority else {}),
         }
+        if null_subdomain:
+            payload["subdomain"] = None
         return self._request(
             "POST",
             f"{self.api_url}/domains/{fqdn}/dns-records",

twc/apiwrap.py

@@ -4,7 +4,7 @@ import os
 import sys
 import textwrap
 from pathlib import Path
-from logging import debug
+from logging import debug, warning
 
 from .api import TimewebCloud
 from .api import exceptions as exc
@@ -70,6 +70,11 @@ def create_client(config: Path, profile: str, **kwargs) -> TimewebCloud:
     """
     token = os.getenv("TWC_TOKEN")
     log_settings = os.getenv("TWC_LOG")
+    api_endpoint = os.getenv("TWC_ENDPOINT")
+
+    if api_endpoint:
+        warning("Using API URL from environment: %s", api_endpoint)
+        kwargs["api_base_url"] = api_endpoint
 
     if log_settings:
         for param in log_settings.split(","):

twc/commands/__init__.py

@@ -1,6 +1,6 @@
 """Commands."""
 
-from .account import account
+from .account import account, whoami
 from .config import config
 from .server import server
 from .ssh_key import ssh_key

twc/commands/account.py

@@ -18,6 +18,35 @@ from .common import (
 )
 
 
+whoami = TyperAlias(help="Display current login.", no_args_is_help=False)
+
+
+# ------------------------------------------------------------- #
+# $ twc whoami                                                  #
+# ------------------------------------------------------------- #
+
+
+@whoami.callback(invoke_without_command=True)
+def whoami_callback(
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Display current login."""
+    client = create_client(config, profile)
+    response = client.get_account_status()
+    login = response.json()["status"]["login"]
+    fmt.printer(
+        {"login": login, "profile": profile},
+        output_format=output_format,
+        func=lambda data: print(data["login"]),
+    )
+
+
+# ------------------------------------------------------------- #
+
+
 account = TyperAlias(help=__doc__)
 account_access = TyperAlias(help="Manage account access restrictions.")
 account.add_typer(account_access, name="access")
@@ -33,6 +62,7 @@ def print_account_status(response: Response):
     status = response.json()["status"]
     output = dedent(
         f"""
+        Login: {status["login"]}
         Provider: {status["company_info"]["name"]}
         Yandex.Metrika ID: {status["ym_client_id"]}
         Blocked: {status["is_blocked"]}

twc/commands/domain.py

@@ -195,7 +195,7 @@ def domain_delete(
 # ------------------------------------------------------------- #
 
 
-@domain.command("add")
+@domain.command("add", "create")
 def domain_add(
     domain_name: str,
     verbose: Optional[bool] = verbose_option,
@@ -316,7 +316,7 @@ def domain_remove_dns_record(
 # ------------------------------------------------------------- #
 
 
-@domain_record.command("add")
+@domain_record.command("add", "create")
 def domain_add_dns_record(
     domain_name: str,
     verbose: Optional[bool] = verbose_option,
@@ -346,29 +346,39 @@ def domain_add_dns_record(
     """Add dns record for domain or subdomain."""
     client = create_client(config, profile)
 
+    null_subdomain = False
+
     if second_ld:
         offset = 3
     else:
         offset = 2
 
     subdomain = domain_name
+    original_domain_name = domain_name
     domain_name = ".".join(domain_name.split(".")[-offset:])
 
     if subdomain == domain_name:
         subdomain = None
 
-    # API issue: see text below
-    # API can add TXT record (only TXT, why?) with non-existent subdomain,
-    # but 'subdomain' option must not be passed as FQDN!
-    # API issue: You cannot create subdomains with underscore. Why?
-    # Use previous described bug for this! Pass your subdomain with
-    # underscores to this function.
     if record_type.lower() == "txt":
-        # 'ftp.example.org' --> 'ftp'
-        subdomain = ".".join(subdomain.split(".")[:-offset])
+        if subdomain is None:
+            null_subdomain = True
+        else:
+            # 'ftp.example.org' --> 'ftp'
+            subdomain = ".".join(subdomain.split(".")[:-offset])
+    else:
+        subdomain = ".".join(original_domain_name.split(".")[:-offset])
+        if subdomain != "":
+            domain_name = original_domain_name
+            subdomain = None
 
     response = client.add_domain_dns_record(
-        domain_name, record_type, value, subdomain, priority
+        domain_name,
+        record_type,
+        value,
+        subdomain,
+        priority,
+        null_subdomain=null_subdomain,
     )
     fmt.printer(
         response,
@@ -424,6 +434,12 @@ def domain_update_dns_records(
     if subdomain == domain_name:
         subdomain = None
 
+    if record_type.lower() == "txt" and subdomain is not None:
+        subdomain = ".".join(subdomain.split(".")[:-offset])
+    elif subdomain is not None:
+        domain_name = subdomain
+        subdomain = None
+
     response = client.update_domain_dns_record(
         domain_name, record_id, record_type, value, subdomain, priority
     )
@@ -439,7 +455,7 @@ def domain_update_dns_records(
 # ------------------------------------------------------------- #
 
 
-@domain_subdomain.command("add")
+@domain_subdomain.command("add", "create")
 def domain_add_subdomain(
     subdomain: str = typer.Argument(..., metavar="FQDN"),
     verbose: Optional[bool] = verbose_option,

twc/commands/project.py

@@ -188,17 +188,11 @@ def print_resources(response: Response):
     for key in resource_keys:
         if resources[key]:
             for resource in resources[key]:
-                try:
-                    location = resource["location"]
-                except KeyError:
-                    # Balancers, clusters, and databases has no 'location' field.
-                    # These services is available only in 'ru-1' location.
-                    location = "ru-1"
                 table.row(
                     [
                         resource["id"],
-                        resource["name"],
-                        location,
+                        resource.get("name", resource.get("fqdn")),
+                        resource.get("location", "ru-1"),
                         key[:-1],  # this is resource name e.g. 'server'
                     ]
                 )

twc/commands/server.py

@@ -584,9 +584,7 @@ def server_create(
             net = IPv4Network(
                 client.get_vpc(network).json()["vpc"]["subnet_v4"]
             )
-            if IPv4Address(private_ip) > IPv4Address(
-                int(net.network_address) + 4
-            ):
+            if IPv4Address(private_ip) >= net.network_address + 4:
                 payload["network"]["ip"] = private_ip
             else:
                 # First 3 addresses is reserved for networks OVN based networks

twc/commands/storage.py

@@ -500,7 +500,6 @@ def storage_subdomain_remove(
     verbose: Optional[bool] = verbose_option,
     config: Optional[Path] = config_option,
     profile: Optional[str] = profile_option,
-    output_format: Optional[str] = output_format_option,
     yes: Optional[bool] = yes_option,
 ):
     """Remove subdomains."""
@@ -509,11 +508,11 @@ def storage_subdomain_remove(
     client = create_client(config, profile)
     bucket_id = resolve_bucket_id(client, bucket)
     response = client.delete_bucket_subdomains(bucket_id, subdomains)
-    fmt.printer(
-        response,
-        output_format=output_format,
-        func=print_subdomains_state,
-    )
+    if response.status_code == 204:
+        for subdomain in subdomains:
+            print(subdomain)
+    else:
+        sys.exit(fmt.printer(response))
 
 
 # ------------------------------------------------------------- #
@@ -532,7 +531,7 @@ def storage_subdomain_gencert(
     client = create_client(config, profile)
     for subdomain in subdomains:
         response = client.gen_cert_for_bucket_subdomain(subdomain)
-        if response.status_code == 201:
+        if response.status_code == 204:
             print(subdomain)
         else:
             sys.exit(fmt.printer(response))

twc/fmt.py

@@ -67,6 +67,9 @@ class Printer:
 
     def raw(self):
         """Print raw API response text (mostly raw JSON)."""
+        if isinstance(self._data, dict):
+            typer.echo(json.dumps(self._data))
+            return
         typer.echo(self._data.text)
 
     def colorize(self, data: str, lexer: object = JsonLexer()):
@@ -77,9 +80,12 @@ class Printer:
         """Print colorized JSON output. Fallback to non-color output if
         Pygments not installed and fallback to raw output on JSONDecodeError.
         """
+        data = self._data
+        if not isinstance(self._data, dict):
+            data = self._data.json()
         try:
             json_data = json.dumps(
-                self._data.json(), indent=4, sort_keys=True, ensure_ascii=False
+                data, indent=4, sort_keys=True, ensure_ascii=False
             )
             self.colorize(json_data, lexer=JsonLexer())
         except json.JSONDecodeError:
@@ -89,10 +95,11 @@ class Printer:
         """Print colorized YAML output. Fallback to non-color output if
         Pygments not installed and fallback to raw output on YAMLError.
         """
+        data = self._data
+        if not isinstance(self._data, dict):
+            data = self._data.json()
         try:
-            yaml_data = yaml.dump(
-                self._data.json(), sort_keys=True, allow_unicode=True
-            )
+            yaml_data = yaml.dump(data, sort_keys=True, allow_unicode=True)
             self.colorize(yaml_data, lexer=YamlLexer())
         except yaml.YAMLError:
             self.raw()

twc/vars.py

@@ -11,4 +11,4 @@ CONTROL_PANEL_URL = "https://timeweb.cloud/my"
 REGIONS_WITH_IPV6 = ["ru-1", "pl-1"]
 REGIONS_WITH_IMAGES = ["ru-1", "ru-3", "kz-1", "pl-1", "nl-1"]
 REGIONS_WITH_LAN = ["ru-1", "ru-3", "nl-1", "pl-1"]
-ZONES_WITH_LAN = ["spb-1", "spb-4", "msk-1", "ams-1", "gdn-1"]
+ZONES_WITH_LAN = ["spb-1", "spb-3", "spb-4", "msk-1", "ams-1", "gdn-1"]

{twc_cli-2.6.0.dist-info → twc_cli-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twc-cli
-Version: 2.6.0
+Version: 2.7.0
 Summary: Timeweb Cloud Command Line Interface.
 Home-page: https://github.com/timeweb-cloud/twc
 License: MIT

{twc_cli-2.6.0.dist-info → twc_cli-2.7.0.dist-info}/RECORD

@@ -1,36 +1,36 @@
-CHANGELOG.md,sha256=4VPeBGreHTzwFwgjCyNh1132Sx3glB2yBHBypJnl_fU,24717
+CHANGELOG.md,sha256=AnIkFEP7S8yrjLrgp1Vbsp47c79n6RQxz6-6OEwwEmk,26436
 COPYING,sha256=fpJLxZS_kHr_659xkpmqEtqHeZp6lQR9CmKCwnYbsmE,1089
 twc/__init__.py,sha256=NwPAMNw3NuHdWGQvWS9_lromVF6VM194oVOipojfJns,113
-twc/__main__.py,sha256=YBqi1OMSDaZnu2q8OyNa6N-dkVI90n6DZrJbUvYbHJA,2407
-twc/__version__.py,sha256=Pqtq12hKiQFbdtW9mzEN58Z8FqFqqIp-iWJljwSSYUU,442
+twc/__main__.py,sha256=ADHceaQUzgLmvhYHvb5O8urdJWj5IcEHLpTQkSExiD8,2468
+twc/__version__.py,sha256=cJqV4mvQsKCOeicZYGqEH-nKLLWLVP_E-ByegiDQ9js,442
 twc/api/__init__.py,sha256=SXew0Fe51M7nRBNQaaLRH4NjnRHkQUn7J26OCkQsftA,128
 twc/api/base.py,sha256=QRefnIgmlbz8n37GLBKeAK1AtzkcNo1IFjZgHDDECJ4,7912
-twc/api/client.py,sha256=LSe8pH684fh1u2jxj-IY8O40NvFsqwVctHrshfctRIE,58482
+twc/api/client.py,sha256=8y3Q8zoZeNoKm8ywOXXbSXvMIvCXyAsU43HLy_nb4hQ,58514
 twc/api/exceptions.py,sha256=UzK3pKRffcXlhnkPy6MDjP_DygVoV17DuZ_mdNbOzts,2369
 twc/api/types.py,sha256=HCxdTi-o8nVq4ShPthd2fUvlYufEoXafx_6qrNHFH04,5406
-twc/apiwrap.py,sha256=0SmFZUH013jKHlpAQmsIySMtFuNtGvkMLQv0zTVJijg,2780
-twc/commands/__init__.py,sha256=hvTpQByt7wfl9hVo7xRPCdwAQpctoFiBVdaMLHDqKbs,422
-twc/commands/account.py,sha256=6T7J3McTXJKzT7Gi_AgRcKpWdeXcmBTcpwFF0GjzADo,4998
+twc/apiwrap.py,sha256=hKrg_o6rLfY32SEnWMc1BSXHnSAh7TGar1JQ90YnG5M,2970
+twc/commands/__init__.py,sha256=a-6fHQQwOj--Z7uBZGZL3z1rvJiOGUMQMRET1UknIYo,430
+twc/commands/account.py,sha256=6q9ri02oFbUUZuqNVXO-uHOX45B4ELJlPjyfVaEL5Qw,5960
 twc/commands/balancer.py,sha256=QAouc74ZT5go11gB1vjjfYtd1luTmWrfpACPwokZ5sU,20278
 twc/commands/common.py,sha256=Wph8cVogUNNvc456SQrASb7mv7G88I8ETwHgISVjLQQ,8282
 twc/commands/config.py,sha256=hoRtxn2VRxIsuy9vgO6yd0Cu15Rbl-uYMZeU0Ix7dG0,8797
 twc/commands/database.py,sha256=2NZ-TyRBkFgfYJyUdZUcfdqSaX7QVdWDU4k_yQNtUvo,16052
-twc/commands/domain.py,sha256=SHOERsEvmlkdKQV5kaiEgMOLZme5ykW8LCUd1IF1Zzo,15624
+twc/commands/domain.py,sha256=uKr2rP9ajLiZrxA_Xl47Jn7Fh9IRODCtjwXwTfbo-EU,15943
 twc/commands/firewall.py,sha256=KNolqbi2rsppOZwbs_j3yoZQt-0wKbj1JPGiZdfGxDE,27439
 twc/commands/floating_ip.py,sha256=G9nD5BbHCZcuytbzeneDJWQDhd8c8WRtq9pAfwI9m7E,8747
 twc/commands/image.py,sha256=OviQwegXK55H3TBlroCASVcgj2QUVCTo0ZhF5ug9eT8,8165
 twc/commands/kubernetes.py,sha256=-Cgas1vFVMcrWGinjstuUz3sqX0ZNXv_4mwPwuwKeLE,20870
-twc/commands/project.py,sha256=0z0MmkW8CVFb8emftE5OshoAwdLBZq_otQjNpeuuklU,10750
-twc/commands/server.py,sha256=nySxygbA1ZwLCE53JjhabLAI7uZjnFE_RdJ_8JzZvOU,70341
+twc/commands/project.py,sha256=xnL3kLIumKzrI9EZ6r6m-PGOl3mZ9IhLQua7WZ3Rghg,10499
+twc/commands/server.py,sha256=Cw8VxOcWEVPtcKZ53h9erhV3VOj7io9E8xQwVN0S53Y,70294
 twc/commands/ssh_key.py,sha256=NHgTPhAQpDzt-iPHHVo4XqUJvujNqf019N6N9qYZ9Us,7941
-twc/commands/storage.py,sha256=qt7_4rvnM2gnN4a0K4KEDoNZ_-2buvMNnCSJIXxQszs,19424
+twc/commands/storage.py,sha256=Pztk5iUBp9RtkdOwsfHaZFCnD8GuH6zOPtluawkRmiI,19404
 twc/commands/vpc.py,sha256=SAht6UD17mU0d_AZY6W34VEYs7CqUsS2iDakPFxAFQU,8876
-twc/fmt.py,sha256=f8submLhHnm8OXBl_4Oe4tuhhMKvgTK1PP1y_25TmyU,6904
+twc/fmt.py,sha256=nbuYZ8nVabYDwCmZqnL3-c6Tmri4B-R_sTCkG6sdfeI,7171
 twc/typerx.py,sha256=AZ6BgTQvlrZYfKVYd9YqRNQnAR2XuyqImz4rf6di6f4,6737
 twc/utils.py,sha256=uWizyUC4dHLwtk50q4Sub3zOvnVESfHKBbXYwk5t71w,651
-twc/vars.py,sha256=n6RzpTJAu44pp4f8KgXcLnorsQBhIcVIMs6DA8-4MCM,534
-twc_cli-2.6.0.dist-info/COPYING,sha256=fpJLxZS_kHr_659xkpmqEtqHeZp6lQR9CmKCwnYbsmE,1089
-twc_cli-2.6.0.dist-info/METADATA,sha256=gkmWcgAscC5aSj83A1_RgHYfH9MW_5sd_0_7vK-cxkw,2601
-twc_cli-2.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-twc_cli-2.6.0.dist-info/entry_points.txt,sha256=tmTaVRhm8BkNrXC_9XJMum7O9wFVOvkXcBetxmahWvE,40
-twc_cli-2.6.0.dist-info/RECORD,,
+twc/vars.py,sha256=fva3O2leMGtExb1aWiAk6sOV0O8et9_kEyRpYYIZ7CM,543
+twc_cli-2.7.0.dist-info/COPYING,sha256=fpJLxZS_kHr_659xkpmqEtqHeZp6lQR9CmKCwnYbsmE,1089
+twc_cli-2.7.0.dist-info/METADATA,sha256=w4WaXHt_EXUtrWRlRhntcYi0p5poZ7PM-ZfJGK4BZTY,2601
+twc_cli-2.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+twc_cli-2.7.0.dist-info/entry_points.txt,sha256=tmTaVRhm8BkNrXC_9XJMum7O9wFVOvkXcBetxmahWvE,40
+twc_cli-2.7.0.dist-info/RECORD,,