twc-cli 2.4.0__tar.gz → 2.5.0__tar.gz

{twc_cli-2.4.0 → twc_cli-2.5.0}/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 В этом файле описаны все значимые изменения в Timeweb Cloud CLI. В выпусках мы придерживается правил [семантического версионирования](https://semver.org/lang/ru/).
 
+# Версия 2.5.0 (2024.07.24)
+
+## Добавлено
+
+- Добавлена поддержка зон доступности. Добавлен параметр конифгурации `availability_zone` (`TWC_AVAILABILITY_ZONE`).
+- Добавлены новые опции для команды `twc server create`: `--availability-zone`, `--user-data`, `--public-ip`, `--no-public-ip`, `--private-ip`.
+- Добавлена новая команда `twc ip` вместо устаревшей `twc server ip`. Поскольку IP-адреса сейчас являются отдельными ресурсами, управление ими вынесено из `twc server`.
+
+## Изменено
+
+- Минимальная поддерживаемая версия интерпретатора Python повышена до 3.8.
+- Обновлены версии зависимостей.
+- Обновлены команды и методы API-клиента для работы VPC.
+- Удалён параметр `log_response` принимаемый как значение переменной окружения `TWC_LOG`, теперь тело ответа API логируется всегда.
+- Команда `twc server ip` объявлена устаревшей (deprecated) и будет уделена в следующем мажорном релизе. Вместо неё используйте команду `twc ip`.
+- Другие мелкие обновления CLI без нарушения обратной совместимости.
+
+## Исправлено
+
+- Исправлен метод удаления кластеров Kubernetes во встроенном API-клиенте.
+- Исправлена ошибка разбора JSON при получении объекта сервера без IP.
+
+# Версия 2.4.1 (2023.08.30)
+
+## Исправлено
+
+- Исправлена ошибка парсинга доменного имени в команде `twc domain record add`.
+
 # Версия 2.4.0 (2023.08.21)
 
 ## Добавлено

{twc_cli-2.4.0 → twc_cli-2.5.0}/PKG-INFO

@@ -1,29 +1,29 @@
 Metadata-Version: 2.1
 Name: twc-cli
-Version: 2.4.0
+Version: 2.5.0
 Summary: Timeweb Cloud Command Line Interface.
 Home-page: https://github.com/timeweb-cloud/twc
 License: MIT
 Author: ge
 Author-email: dev@timeweb.cloud
-Requires-Python: >=3.7.9,<4.0.0
+Requires-Python: >=3.8.19,<4.0.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: pygments (>=2.15.0,<3.0.0)
-Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: requests (>=2.31.0,<3.0.0)
-Requires-Dist: shellingham (>=1.5.0.post1,<2.0.0)
+Requires-Dist: pygments (>=2.18.0,<3.0.0)
+Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
+Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: shellingham (>=1.5.4,<2.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
-Requires-Dist: typer (>=0.7.0,<0.8.0)
+Requires-Dist: typer (>=0.12.3,<0.13.0)
 Project-URL: Repository, https://github.com/timeweb-cloud/twc
 Description-Content-Type: text/markdown
 
-![TWC CLI](https://github.com/timeweb-cloud/twc/blob/master/artwork/logo.svg)
+![TWC CLI](https://github.com/timeweb-cloud/twc/blob/master/artwork/light.svg)
 
 Timeweb Cloud Command Line Interface and simple SDK 💫
 

{twc_cli-2.4.0 → twc_cli-2.5.0}/README.md

@@ -1,4 +1,4 @@
-![TWC CLI](https://github.com/timeweb-cloud/twc/blob/master/artwork/logo.svg)
+![TWC CLI](https://github.com/timeweb-cloud/twc/blob/master/artwork/light.svg)
 
 Timeweb Cloud Command Line Interface and simple SDK 💫
 

{twc_cli-2.4.0 → twc_cli-2.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twc-cli"
-version = "2.4.0"
+version = "2.5.0"
 description = "Timeweb Cloud Command Line Interface."
 authors = ["ge <dev@timeweb.cloud>"]
 homepage = "https://github.com/timeweb-cloud/twc"
@@ -11,18 +11,18 @@ include = ["CHANGELOG.md", "COPYING"]
 packages = [{ include = "twc", from = "." }]
 
 [tool.poetry.dependencies]
-python = "^3.7.9"
-requests = "^2.31.0"
-typer = "^0.7.0"
-shellingham = "^1.5.0.post1"
+python = "^3.8.19"
+requests = "^2.32.3"
+typer = "^0.12.3"
+shellingham = "^1.5.4"
 colorama = "^0.4.6"
 toml = "^0.10.2"
-pyyaml = "^6.0"
-pygments = "^2.15.0"
+pyyaml = "^6.0.1"
+pygments = "^2.18.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.3.0"
-pylint = "^2.17.2"
+black = "^24.4.2"
+pylint = "^3.2.5"
 
 [tool.poetry.scripts]
 twc = "twc.__main__:cli"

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/__main__.py

@@ -20,6 +20,7 @@ from .commands import (
     domain,
     vpc,
     firewall,
+    floating_ip,
 )
 from .commands.common import version_callback, version_option, verbose_option
 
@@ -44,6 +45,7 @@ cli.add_typer(
 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.command("version")

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/__version__.py

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

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/api/base.py

@@ -29,7 +29,6 @@ class TimewebCloudBase:
         user_agent: Optional[str] = USER_AGENT,
         timeout: Optional[int] = TIMEOUT,
         hide_token: Optional[bool] = True,
-        log_response_body: Optional[bool] = False,
         request_decorator: Optional[Callable] = None,
     ):
         self.api_token = api_token
@@ -44,7 +43,6 @@ class TimewebCloudBase:
         self.headers["Authorization"] = f"Bearer {self.api_token}"
         self.log = logging.getLogger("api_client")
         self.hide_token = hide_token
-        self.log_response_body = log_response_body
 
         if headers:
             self.headers.update(headers)
@@ -66,10 +64,10 @@ class TimewebCloudBase:
 
     def _log_request(self, response: requests.Response) -> None:
         """Log HTTP requests."""
-        if self.log_response_body:
-            res_body = response.text or "<NO_BODY>"
-        else:
-            res_body = "<NOT_LOGGED>"
+        res_body = response.text or "<NO_BODY>"
+        req_body = response.request.body or "<NO_BODY>"
+        if isinstance(req_body, (bytes, bytearray)):
+            req_body = req_body.decode()
 
         self.log.debug(
             textwrap.dedent(
@@ -89,7 +87,7 @@ class TimewebCloudBase:
                 req_headers=self._format_headers(
                     self._secure_log(response.request.headers)
                 ),
-                req_body=response.request.body or "<NO_BODY>",
+                req_body=req_body,
                 res=response,
                 res_headers=self._format_headers(response.headers),
                 res_body=res_body,
@@ -136,7 +134,6 @@ class TimewebCloudBase:
             response.raise_for_status()
             self._log_request(response)
         except requests.HTTPError as e:
-            self.log_response_body = True  # Always log response body on errors
             self._log_request(response)
 
             # API issue: Bad response: 401 Unauthorized response haven't body

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/api/client.py

@@ -18,6 +18,7 @@ from .types import (
     BackupInterval,
     IPVersion,
     ServiceRegion,
+    ServiceAvailabilityZone,
     ResourceType,
     DBMS,
     MySQLAuthPlugin,
@@ -70,9 +71,10 @@ class TimewebCloud(TimewebCloudBase):
         avatar_id: Optional[str] = None,
         software_id: Optional[int] = None,
         ssh_keys_ids: Optional[List[int]] = None,
-        is_local_network: Optional[bool] = None,
+        is_local_network: Optional[bool] = None,  # deprecated
         is_ddos_guard: bool = False,
         network: Optional[dict] = None,
+        availability_zone: Optional[ServiceAvailabilityZone] = None,
     ):
         """Create new Cloud Server. Note:
 
@@ -105,6 +107,11 @@ class TimewebCloud(TimewebCloudBase):
             **({"preset_id": preset_id} if preset_id else {}),
             **({"os_id": os_id} if os_id else {}),
             **({"image_id": image_id} if image_id else {}),
+            **(
+                {"availability_zone": str(availability_zone)}
+                if availability_zone
+                else {}
+            ),
         }
 
         return self._request("POST", f"{self.api_url}/servers", json=payload)
@@ -697,7 +704,7 @@ class TimewebCloud(TimewebCloudBase):
         )
 
     # -----------------------------------------------------------------------
-    # Databases
+    # Managed databases
 
     def get_databases(self, limit: int = 100, offset: int = 0):
         """Get databases list."""
@@ -1343,7 +1350,7 @@ class TimewebCloud(TimewebCloudBase):
     def delete_k8s_node(self, cluster_id: int, node_id: int):
         """Delete node from cluster."""
         return self._request(
-            "GET",
+            "DELETE",
             f"{self.api_url}/k8s/clusters/{cluster_id}/nodes/{node_id}",
         )
 
@@ -1483,6 +1490,7 @@ class TimewebCloud(TimewebCloudBase):
         name: str,
         subnet: IPv4Network,
         location: ServiceRegion,
+        availability_zone: Optional[ServiceAvailabilityZone] = None,
         description: Optional[str] = None,
     ):
         """Create new virtual private network."""
@@ -1490,6 +1498,11 @@ class TimewebCloud(TimewebCloudBase):
             "name": name,
             "subnet_v4": subnet,
             "location": location,
+            **(
+                {"availability_zone": str(availability_zone)}
+                if availability_zone
+                else {}
+            ),
             **({"description": description} if description else {}),
         }
         return self._request("POST", f"{self.api_url_v2}/vpcs", json=payload)
@@ -1690,3 +1703,67 @@ class TimewebCloud(TimewebCloudBase):
             f"{self.api_url}/firewall/service/{resource_type}/{resource_id}",
             params=params,
         )
+
+    # -----------------------------------------------------------------------
+    # Floating IPs
+
+    def get_floating_ips(self):
+        return self._request("GET", f"{self.api_url_v1}/floating-ips")
+
+    def get_floating_ip(self, floating_ip_id: str):
+        return self._request(
+            "GET", f"{self.api_url_v1}/floating-ips/{floating_ip_id}"
+        )
+
+    def create_floating_ip(
+        self,
+        availability_zone: ServiceAvailabilityZone,
+        ddos_protection: bool = False,
+    ):
+        payload = {
+            "is_ddos_guard": ddos_protection,
+            "availability_zone": str(availability_zone),
+        }
+        return self._request(
+            "POST", f"{self.api_url_v1}/floating-ips", json=payload
+        )
+
+    def update_floating_ip(
+        self,
+        floating_ip_id: str,
+        comment: Optional[str] = None,
+        ptr: Optional[str] = None,
+    ):
+        payload = {}
+        if comment:
+            payload["comment"] = comment
+        if ptr:
+            payload["ptr"] = ptr
+        return self._request(
+            "PATCH",
+            f"{self.api_url_v1}/floating-ips/{floating_ip_id}",
+            json=payload,
+        )
+
+    def delete_floating_ip(self, floating_ip_id: str):
+        return self._request(
+            "DELETE", f"{self.api_url_v1}/floating-ips/{floating_ip_id}"
+        )
+
+    def attach_floating_ip(
+        self,
+        floating_ip_id: str,
+        resource_type: ResourceType,
+        resource_id: str,
+    ):
+        payload = {"resource_type": resource_type, "resource_id": resource_id}
+        return self._request(
+            "POST",
+            f"{self.api_url_v1}/floating-ips/{floating_ip_id}/bind",
+            json=payload,
+        )
+
+    def detach_floating_ip(self, floating_ip_id: str):
+        return self._request(
+            "POST", f"{self.api_url_v1}/floating-ips/{floating_ip_id}/unbind"
+        )

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/api/types.py

@@ -1,6 +1,6 @@
 """Custom data types for Timeweb Cloud API entities."""
 
-from typing import NamedTuple
+from typing import TypedDict, List, Optional
 from enum import Enum
 
 
@@ -9,10 +9,59 @@ class ServiceRegion(str, Enum):
 
     RU_1 = "ru-1"
     RU_2 = "ru-2"
-    PL_1 = "pl-1"
+    RU_3 = "ru-3"
     KZ_1 = "kz-1"
+    PL_1 = "pl-1"
     NL_1 = "nl-1"
 
+    @classmethod
+    def get_zones(cls, region: str) -> List[str]:
+        # pylint: disable=too-many-return-statements
+        if region == cls.RU_1:
+            return ["spb-1", "spb-2", "spb-3", "spb-4"]
+        if region == cls.RU_2:
+            return ["nsk-1"]
+        if region == cls.RU_3:
+            return ["msk-1"]
+        if region == cls.KZ_1:
+            return ["ala-1"]
+        if region == cls.PL_1:
+            return ["gdn-1"]
+        if region == cls.NL_1:
+            return ["ams-1"]
+        return []
+
+
+class ServiceAvailabilityZone(str, Enum):
+    """Availability zones."""
+
+    SPB_1 = "spb-1"
+    SPB_2 = "spb-2"
+    SPB_3 = "spb-3"
+    SPB_4 = "spb-4"
+    MSK_1 = "msk-1"
+    NSK_1 = "nsk-1"
+    ALA_1 = "ala-1"
+    GDN_1 = "gdn-1"
+    AMS_1 = "ams-1"
+
+    @classmethod
+    def get_region(cls, zone: str) -> Optional[str]:
+        # pylint: disable=too-many-return-statements
+        if zone in [cls.SPB_1, cls.SPB_2, cls.SPB_3, cls.SPB_4]:
+            return ServiceRegion.RU_1
+        if zone == cls.NSK_1:
+            return ServiceRegion.RU_2
+        if zone == cls.MSK_1:
+            return ServiceRegion.RU_3
+        if zone == cls.ALA_1:
+            return ServiceRegion.KZ_1
+        if zone == cls.GDN_1:
+            return ServiceRegion.PL_1
+        if zone == cls.AMS_1:
+            return ServiceRegion.NL_1
+        return None
+
 
 class ServerAction(str, Enum):
     """Available actions on Cloud Server."""
@@ -64,13 +113,11 @@ class IPVersion(str, Enum):
     IPV6 = "ipv6"
 
 
-class ServerConfiguration(NamedTuple):
+class ServerConfiguration(TypedDict):
     """
     For `confugurator_id` see `get_server_configurators()`. `disk` and
-    `ram` must be in megabytes. Values must values must comply with the
-    configurator constraints.
-
-    TODO: Replace NamedTuple with TypedDict when drop Python 3.7
+    `ram` must be in megabytes. Values must comply with the configurator
+    constraints.
     """
 
     configurator_id: int

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/apiwrap.py

@@ -73,8 +73,8 @@ def create_client(config: Path, profile: str, **kwargs) -> TimewebCloud:
 
     if log_settings:
         for param in log_settings.split(","):
-            if param == "log_response":
-                kwargs["log_response_body"] = True
+            if param.lower() == "debug":
+                pass  # FUTURE: set logging.DEBUG
 
     if token:
         debug("Config: use API token from environment")

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/__init__.py

@@ -13,3 +13,4 @@ from .kubernetes import cluster
 from .domain import domain
 from .vpc import vpc
 from .firewall import firewall
+from .floating_ip import floating_ip

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/common.py

@@ -13,7 +13,7 @@ from typer.core import TyperOption
 from click import UsageError
 
 from twc.__version__ import __version__
-from twc.api.types import ServiceRegion
+from twc.api.types import ServiceRegion, ServiceAvailabilityZone
 
 
 class OutputFormat(str, Enum):
@@ -109,6 +109,11 @@ def load_from_config_callback(
         regions = [v.value for v in ServiceRegion]
         if value not in regions:
             sys.exit(f"Error: Location not in {regions}")
+    if param.name == "zone":
+        value = value.lower()
+        zones = [z.value for z in ServiceAvailabilityZone]
+        if value not in zones:
+            sys.exit(f"Error: Availability zone not in {zones}")
     return value
 
 
@@ -275,5 +280,16 @@ region_option = typer.Option(
     envvar="TWC_REGION",
     show_envvar=False,
     callback=load_from_config_callback,
-    help="Use region (location).",
+    help="Region (location).",
+)
+
+# availability_zone: Optional[str] = zone_option,
+
+zone_option = typer.Option(
+    None,
+    metavar="ZONE",
+    envvar="TWC_AVAILABILITY_ZONE",
+    show_envvar=False,
+    callback=load_from_config_callback,
+    help="Availability zone.",
 )

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/domain.py

@@ -365,7 +365,7 @@ def domain_add_dns_record(
     # underscores to this function.
     if record_type.lower() == "txt":
         # 'ftp.example.org' --> 'ftp'
-        subdomain = subdomain.split(".")[: offset - 1][0]
+        subdomain = ".".join(subdomain.split(".")[:-offset])
 
     response = client.add_domain_dns_record(
         domain_name, record_type, value, subdomain, priority

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/firewall.py

@@ -453,7 +453,7 @@ def filrewall_rule_list(
 
 
 # ------------------------------------------------------------- #
-# $ twc firewall rule add                                       #
+# $ twc firewall rule create                                    #
 # ------------------------------------------------------------- #
 
 
@@ -482,8 +482,8 @@ def validate_cidr_callback(value):
     return value
 
 
-@firewall_rule.command("add")
-def firewall_allow(
+@firewall_rule.command("create", "add")
+def firewall_rule_create(
     ports: List[str] = typer.Argument(
         ...,
         metavar="[PORT[-PORT]/]PROTO...",
@@ -520,7 +520,7 @@ def firewall_allow(
         help="IPv4 or IPv6 CIDR.",
     ),
 ):
-    """Add new firewall rule."""
+    """Create new firewall rule."""
     client = create_client(config, profile)
     if make_group is not None and group is not None:
         raise UsageError(

twc_cli-2.5.0/twc/commands/floating_ip.py

@@ -0,0 +1,296 @@
+"""Manage floating IPs."""
+
+import sys
+from typing import Optional, List
+from pathlib import Path
+from uuid import UUID
+
+import typer
+from requests import Response
+
+from twc import fmt
+from twc.api import TimewebCloud, ResourceType
+from twc.apiwrap import create_client
+from twc.typerx import TyperAlias
+from .common import (
+    verbose_option,
+    config_option,
+    profile_option,
+    yes_option,
+    output_format_option,
+    load_from_config_callback,
+)
+
+
+floating_ip = TyperAlias(help=__doc__)
+
+
+def get_floating_ip_id(client: TimewebCloud, ip_addr: str) -> Optional[str]:
+    ips = client.get_floating_ips().json()["ips"]
+    for ip in ips:
+        if ip["ip"] == ip_addr:
+            return ip["id"]
+    return None
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip list                                        #
+# ------------------------------------------------------------- #
+
+
+def _print_floating_ips(response: Response):
+    table = fmt.Table()
+    table.header(["IP", "PTR", "ZONE", "ANTI_DDOS", "USED_ON"])
+    ips = response.json()["ips"]
+    for ip in ips:
+        used = None
+        if ip["resource_type"]:
+            used = f"{ip['resource_type']}:{ip['resource_id']}"
+        table.row(
+            [
+                ip["ip"],
+                ip["ptr"],
+                ip["availability_zone"],
+                ip["is_ddos_guard"],
+                used,
+            ]
+        )
+    table.print()
+
+
+@floating_ip.command("list", "ls")
+def floating_ip_list(
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """List floating IPs."""
+    client = create_client(config, profile)
+    response = client.get_floating_ips()
+    fmt.printer(
+        response,
+        output_format=output_format,
+        func=_print_floating_ips,
+    )
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip get                                         #
+# ------------------------------------------------------------- #
+
+
+def _print_floating_ip(response: Response):
+    table = fmt.Table()
+    table.header(["IP", "PTR", "ZONE", "ANTI_DDOS", "USED_ON"])
+    ip = response.json()["ip"]
+    used = None
+    if ip["resource_type"]:
+        used = f"{ip['resource_type']}:{ip['resource_id']}"
+    table.row(
+        [
+            ip["ip"],
+            ip["ptr"],
+            ip["availability_zone"],
+            ip["is_ddos_guard"],
+            used,
+        ]
+    )
+    table.print()
+
+
+@floating_ip.command("get")
+def floating_ip_get(
+    ip: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Get floating IP."""
+    client = create_client(config, profile)
+    try:
+        _ = UUID(ip)
+    except ValueError:
+        ip = get_floating_ip_id(client, ip)
+    response = client.get_floating_ip(ip)
+    fmt.printer(
+        response,
+        output_format=output_format,
+        func=_print_floating_ip,
+    )
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip create                                      #
+# ------------------------------------------------------------- #
+
+
+@floating_ip.command("create")
+def floating_ip_create(
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+    availability_zone: str = typer.Option(
+        ...,
+        metavar="ZONE",
+        envvar="TWC_AVAILABILITY_ZONE",
+        show_envvar=False,
+        callback=load_from_config_callback,
+        help="Availability zone.",
+    ),
+    ddos_protection: bool = typer.Option(
+        False,
+        "--ddos-protection",
+        show_default=True,
+        help="Request IP-address with L3/L4 DDoS protection.",
+    ),
+):
+    """Create new floating IP."""
+    client = create_client(config, profile)
+    response = client.create_floating_ip(
+        availability_zone=availability_zone,
+        ddos_protection=ddos_protection,
+    )
+    fmt.printer(
+        response,
+        output_format=output_format,
+        func=lambda response: print(response.json()["ip"]["ip"]),
+    )
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip remove                                      #
+# ------------------------------------------------------------- #
+
+
+@floating_ip.command("remove", "rm")
+def floating_ip_remove(
+    floating_ips: List[str] = typer.Argument(..., metavar="IP..."),
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    yes: Optional[bool] = yes_option,
+):
+    """Remove floating IPs."""
+    if not yes:
+        typer.confirm("This action cannot be undone, continue?", abort=True)
+
+    client = create_client(config, profile)
+    for ip in floating_ips:
+        try:
+            _ = UUID(ip)
+        except ValueError:
+            ip = get_floating_ip_id(client, ip)
+        response = client.delete_floating_ip(ip)
+        if response.status_code == 204:
+            print(ip)
+        else:
+            sys.exit(fmt.printer(response))
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip attach                                      #
+# ------------------------------------------------------------- #
+
+
+@floating_ip.command("attach")
+def floating_ip_attach(
+    ip: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    server: Optional[int] = typer.Option(
+        None, help="Attach IP to Cloud Server."
+    ),
+    balancer: Optional[int] = typer.Option(
+        None, help="Attach IP to Load Balancer."
+    ),
+    database: Optional[int] = typer.Option(
+        None, help="Attach IP to managed database cluster."
+    ),
+):
+    """Attach floating IP to service."""
+    client = create_client(config, profile)
+    try:
+        _ = UUID(ip)
+    except ValueError:
+        ip = get_floating_ip_id(client, ip)
+    resource_type = resource_id = None
+    if server:
+        resource_type = ResourceType.SERVER
+        resource_id = server
+    if balancer:
+        resource_type = ResourceType.BALANCER
+        resource_id = balancer
+    if database:
+        resource_type = ResourceType.DATABASE
+        resource_id = database
+    response = client.attach_floating_ip(
+        ip,
+        resource_type=resource_type,
+        resource_id=resource_id,
+    )
+    if not resource_type or not resource_id:
+        sys.exit(
+            "Error: Please set one of options: ['--server', '--balancer', '--database']"
+        )
+    if response.status_code == 204:
+        print(resource_id)
+    else:
+        sys.exit(fmt.printer(response))
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip detach                                      #
+# ------------------------------------------------------------- #
+
+
+@floating_ip.command("detach")
+def floating_ip_detach(
+    ip: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+):
+    """Detach floating IP from service."""
+    client = create_client(config, profile)
+    try:
+        _ = UUID(ip)
+    except ValueError:
+        ip = get_floating_ip_id(client, ip)
+    response = client.detach_floating_ip(ip)
+    if response.status_code == 204:
+        print(ip)
+    else:
+        sys.exit(fmt.printer(response))
+
+
+# ------------------------------------------------------------- #
+# $ twc floating-ip set                                         #
+# ------------------------------------------------------------- #
+
+
+@floating_ip.command("set")
+def floating_ip_set(
+    ip: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+    comment: Optional[str] = typer.Option(None, help="Set comment."),
+    ptr: Optional[str] = typer.Option(None, help="Set reverse DNS pointer."),
+):
+    """Set floating IP parameters."""
+    client = create_client(config, profile)
+    try:
+        _ = UUID(ip)
+    except ValueError:
+        ip = get_floating_ip_id(client, ip)
+    response = client.update_floating_ip(ip, comment=comment, ptr=ptr)
+    fmt.printer(
+        response,
+        output_format=output_format,
+        func=lambda response: print(response.json()["ip"]["ip"]),
+    )

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/image.py

@@ -262,13 +262,16 @@ def image_upload(
     client = create_client(config, profile)
     if re.match(r"https?://", file):
         debug(f"Upload URL: {file}")
-        response = client.create_image(
-            upload_url=file,
-            name=name,
-            description=desc,
-            os_type=os_type,
-            location=region,
-        )
+    else:
+        sys.exit(f"Invalid link: {file}")
+
+    response = client.create_image(
+        upload_url=file,
+        name=name,
+        description=desc,
+        os_type=os_type,
+        location=region,
+    )
 
     # FUTURE: Implement file upload from local disk
 

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/project.py

@@ -295,11 +295,10 @@ def project_resource_move(
     if bucket:
         for bucket_id in bucket:
             if not bucket_id.isdigit():
-                bucket_name = bucket_id
                 bucket_id = resolve_bucket_id(client, bucket_id)
             response = client.add_bucket_to_project(bucket_id, project_id)
             if response.status_code == 200:
-                print(bucket_name)
+                print(bucket_id)
             else:
                 sys.exit(fmt.printer(response))
     if cluster:

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/server.py

@@ -7,7 +7,7 @@ from logging import debug
 from typing import Optional, List, Union
 from pathlib import Path
 from datetime import date, datetime
-from ipaddress import IPv4Address, IPv6Address
+from ipaddress import IPv4Address, IPv6Address, IPv4Network
 
 import typer
 from click import UsageError
@@ -28,7 +28,6 @@ from twc.api import (
     BackupAction,
 )
 from twc.vars import (
-    REGIONS_WITH_CONFIGURATOR,
     REGIONS_WITH_IPV6,
     CONTROL_PANEL_URL,
 )
@@ -40,6 +39,7 @@ from .common import (
     yes_option,
     output_format_option,
     region_option,
+    zone_option,
     load_from_config_callback,
 )
 
@@ -48,7 +48,7 @@ server = TyperAlias(help=__doc__)
 server_ip = TyperAlias(help="Manage public IPs.")
 server_disk = TyperAlias(help="Manage Cloud Server disks.")
 server_backup = TyperAlias(help="Manage Cloud Server disk backups.")
-server.add_typer(server_ip, name="ip")
+server.add_typer(server_ip, name="ip", deprecated=True)
 server.add_typer(server_disk, name="disk")
 server.add_typer(server_backup, name="backup")
 
@@ -80,10 +80,9 @@ def print_servers(
         ]
     )
     for srv in servers:
+        main_ipv4 = None
         for network in srv["networks"]:
             if network["type"] == "public":
-                if not network["ips"]:
-                    main_ipv4 = None
                 for addr in network["ips"]:
                     if addr["type"] == "ipv4" and addr["is_main"]:
                         main_ipv4 = addr["ip"]
@@ -139,10 +138,9 @@ def print_server(response: Response):
             "IPV4",
         ]
     )
+    main_ipv4 = None
     for network in srv["networks"]:
         if network["type"] == "public":
-            if not network["ips"]:
-                main_ipv4 = None
             for addr in network["ips"]:
                 if addr["type"] == "ipv4" and addr["is_main"]:
                     main_ipv4 = addr["ip"]
@@ -509,11 +507,14 @@ def server_create(
     ssh_keys: Optional[List[str]] = typer.Option(
         None, "--ssh-key", help="SSH-key file, name or ID. Can be multiple."
     ),
+    user_data: Optional[typer.FileText] = typer.Option(
+        None, help="user-data file for cloud-init."
+    ),
     ddos_protection: bool = typer.Option(
         False,
         "--ddos-protection",
         show_default=True,
-        help="Enable DDoS-Guard.",
+        help="Request public IPv4 with L3/L4 DDoS protection.",
     ),
     local_network: Optional[bool] = typer.Option(
         # is_local_network paramenter is deprecated!
@@ -524,6 +525,15 @@ def server_create(
         hidden=True,
     ),
     network: Optional[str] = typer.Option(None, help="Private network ID."),
+    private_ip: Optional[str] = typer.Option(
+        None, help="Private IPv4 address."
+    ),
+    public_ip: Optional[str] = typer.Option(
+        None, help="Public IPv4 address. New address by default."
+    ),
+    no_public_ip: Optional[bool] = typer.Option(
+        False, "--no-public-ip", help="Do not add public IPv4 address."
+    ),
     nat_mode: ServerNATMode = typer.Option(
         None,
         "--nat-mode",
@@ -531,6 +541,7 @@ def server_create(
         help="Apply NAT mode.",
     ),
     region: Optional[str] = region_option,
+    availability_zone: Optional[str] = zone_option,
     project_id: int = typer.Option(
         None,
         envvar="TWC_PROJECT",
@@ -541,17 +552,14 @@ def server_create(
 ):
     """Create Cloud Server."""
     client = create_client(config, profile)
-
-    if nat_mode:
-        if not network:
-            sys.exit("Error: Pass '--network' option first.")
-
     payload = {
         "name": name,
         "comment": comment,
         "avatar_id": avatar_id,
         "software_id": software_id,
         "is_ddos_guard": ddos_protection,
+        "availability_zone": availability_zone,
+        "network": {},
         **(
             {"is_local_network": local_network}
             if local_network is not None
@@ -559,8 +567,44 @@ def server_create(
         ),
     }
 
+    # Check availability zone
+    usable_zones = ServiceRegion.get_zones(region)
+    if availability_zone is not None and availability_zone not in usable_zones:
+        sys.exit(
+            f"Error: Wrong availability zone, usable zones are: {usable_zones}"
+        )
+
+    # Set network parameters
+    if nat_mode or private_ip:
+        if not network:
+            sys.exit("Error: Pass '--network' option first.")
     if network:
-        payload["network"] = {"id": network}
+        payload["network"]["id"] = network
+        if private_ip:
+            net = IPv4Network(
+                client.get_vpc(network).json()["vpc"]["subnet_v4"]
+            )
+            if IPv4Address(private_ip) > IPv4Address(
+                int(net.network_address) + 4
+            ):
+                payload["network"]["ip"] = private_ip
+            else:
+                # First 3 addresses is reserved for networks OVN based networks
+                sys.exit(
+                    f"Error: Private address '{private_ip}' is not allowed. "
+                    "IP must be at least the fourth in order in the network."
+                )
+    if public_ip:
+        try:
+            _ = IPv4Address(public_ip)
+            payload["network"]["floating_ip"] = public_ip
+        except ValueError:
+            sys.exit(f"Error: '{public_ip}' is not valid IPv4 address.")
+    else:
+        # New public IPv4 address will be automatically requested with
+        # correct availability zone. This is official dirty hack.
+        if no_public_ip is False:
+            payload["network"]["floating_ip"] = "create_ip"
 
     # Set server configuration parameters
     if preset_id and (cpu or ram or disk):
@@ -609,6 +653,10 @@ def server_create(
             ssh_keys_ids.append(process_ssh_key(client, key))
     payload["ssh_keys_ids"] = ssh_keys_ids
 
+    # Set cloud-init user-data
+    if user_data:
+        payload["cloud_init"] = user_data.read()
+
     # Check project_id before creating server
     if project_id:
         if not project_id in [
@@ -738,12 +786,6 @@ def server_resize(
     # Return error if user tries to switch from preset to configurator in
     # location where configurator is unavailable.
     if cpu or ram or disk:
-        if old_state["location"] not in REGIONS_WITH_CONFIGURATOR:
-            sys.exit(
-                "Error: Can not change configuration in location "
-                + f"'{old_state['location']}'. Change preset_id instead."
-            )
-
         # Get original server configurator_id
         configurator_id = old_state["configurator_id"]
         configurator = None
@@ -775,6 +817,7 @@ def server_resize(
         payload["configuration"] = {}
 
         # Get original size of primary disk
+        primary_disk_size = 0
         for old_disk in old_state["disks"]:
             if old_disk["is_system"]:  # is True
                 primary_disk_size = old_disk["size"]
@@ -963,13 +1006,19 @@ def server_remove(
     config: Optional[Path] = config_option,
     profile: Optional[str] = profile_option,
     yes: Optional[bool] = yes_option,
+    keep_public_ip: Optional[bool] = typer.Option(
+        False,
+        "--keep-public-ip",
+        help="Do not remove public IP attached to server. [default: false]",
+    ),
 ):
-    """Clone Cloud Server."""
+    """Remove Cloud Server."""
     if not yes:
         typer.confirm("This action cannot be undone. Continue?", abort=True)
 
     client = create_client(config, profile)
     for server_id in server_ids:
+        server_data = client.get_server(server_id).json()["server"]
         response = client.delete_server(server_id)
         if response.status_code == 200:
             del_hash = response.json()["server_delete"]["hash"]
@@ -981,6 +1030,11 @@ def server_remove(
             print(server_id)
         else:
             sys.exit(fmt.printer(response))
+        if keep_public_ip is False:
+            for network in server_data["networks"]:
+                for ip in network["ips"]:
+                    if ip.get("id") is not None:
+                        client.delete_floating_ip(ip["id"])
 
 
 # ------------------------------------------------------------- #

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/storage.py

@@ -5,7 +5,6 @@ Cloud specific API methods instead. Use third party S3 clients to manage
 objects e.g. s3cmd, rclone, etc.
 """
 
-
 import sys
 from logging import debug
 from typing import Optional, List

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/commands/vpc.py

@@ -13,9 +13,10 @@ import typer
 from requests import Response
 
 from twc import fmt
+from twc.api import ServiceRegion
 from twc.typerx import TyperAlias
 from twc.apiwrap import create_client
-from twc.vars import REGIONS_WITH_LAN
+from twc.vars import REGIONS_WITH_LAN, ZONES_WITH_LAN
 from .common import (
     verbose_option,
     config_option,
@@ -24,6 +25,7 @@ from .common import (
     output_format_option,
     filter_option,
     region_option,
+    zone_option,
 )
 
 
@@ -31,9 +33,11 @@ vpc = TyperAlias(help=__doc__)
 vpc_port = TyperAlias(help="Manage network ports.")
 vpc.add_typer(vpc_port, name="port", aliases=["ports"])
 
-ALLOWED_SUBNETS = [IPv4Network("10.0.0.0/16"), IPv4Network("192.168.0.0/16")]
-MAX_PREFIXLEN = 16
-MIN_PREFIXLEN = 32
+ALLOWED_SUBNETS = [
+    IPv4Network("10.0.0.0/8"),
+    IPv4Network("192.168.0.0/16"),
+    IPv4Network("172.16.0.0/12"),
+]
 
 
 # ------------------------------------------------------------- #
@@ -46,12 +50,13 @@ def print_networks(response: Response, filters: Optional[str] = None):
     if filters:
         nets = fmt.filter_list(nets, filters)
     table = fmt.Table()
-    table.header(["ID", "REGION", "SUBNET"])
+    table.header(["ID", "REGION", "ZONE", "SUBNET"])
     for net in nets:
         table.row(
             [
                 net["id"],
                 net["location"],
+                net["availability_zone"],
                 net["subnet_v4"],
             ]
         )
@@ -99,8 +104,6 @@ def validate_network(value):
                 f"Error: Network {value} is not subnet of: "
                 f"{[n.with_prefixlen for n in ALLOWED_SUBNETS]}"
             )
-        if network.prefixlen in range(MIN_PREFIXLEN, MAX_PREFIXLEN + 1):
-            sys.exit("Error: Minimum network prefix is 32, maximum is 16.")
     return value
 
 
@@ -108,7 +111,7 @@ def validate_network(value):
 def vpc_create(
     subnet: str = typer.Argument(
         ...,
-        metavar="IP_NETWORK",
+        metavar="NETWORK_SUBNET",
         callback=validate_network,
         help="IPv4 network CIDR.",
     ),
@@ -119,13 +122,23 @@ def vpc_create(
     name: str = typer.Option(None, help="Network display name."),
     desc: Optional[str] = typer.Option(None, help="Description."),
     region: Optional[str] = region_option,
+    availability_zone: Optional[str] = zone_option,
 ):
     """Create network."""
     client = create_client(config, profile)
     if region not in REGIONS_WITH_LAN:
         sys.exit(
             f"Error: Cannot create network in location '{region}'. "
-            f"Available regions is {REGIONS_WITH_LAN}"
+            f"Available regions are: {REGIONS_WITH_LAN}"
+        )
+    usable_zones = set(ZONES_WITH_LAN).intersection(
+        set(ServiceRegion.get_zones(region))
+    )
+    if availability_zone is not None and availability_zone not in usable_zones:
+        sys.exit(
+            f"Error: Cannot create network in region '{region}' with "
+            f"availability zone '{availability_zone}'. "
+            f"Usable zones are: {list(usable_zones)}"
         )
     if not name:
         name = subnet
@@ -134,6 +147,7 @@ def vpc_create(
         description=desc,
         subnet=subnet,
         location=region,
+        availability_zone=availability_zone,
     )
     fmt.printer(
         response,

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/fmt.py

@@ -31,7 +31,7 @@ class Table:
 
     """
 
-    def __init__(self, whitespace: str = "\t"):
+    def __init__(self, whitespace: str = "  "):
         self.__rows = []
         self.__whitespace = whitespace
 

{twc_cli-2.4.0 → twc_cli-2.5.0}/twc/vars.py

@@ -6,11 +6,11 @@ expand or other infrastructure or product changes occur.
 
 # Service URLs
 CONTROL_PANEL_URL = "https://timeweb.cloud/my"
-S3_ENDPOINT = "s3.timeweb.com"
+S3_ENDPOINT_DEPRECATED = "s3.timeweb.com"
+S3_ENDPOINT = "s3.timeweb.cloud"
 
 # Location specific parameters. May change later.
-REGIONS_WITH_CONFIGURATOR = ["ru-1", "ru-2", "pl-1", "kz-1", "nl-1"]
 REGIONS_WITH_IPV6 = ["ru-1", "pl-1"]
-REGIONS_WITH_IMAGES = ["ru-1", "pl-1", "nl-1"]
-REGIONS_WITH_LAN = ["ru-1", "pl-1"]
-REGIONS_WITH_DBAAS = ["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"]