twc-cli 2.7.0__tar.gz → 2.8.0__tar.gz

{twc_cli-2.7.0 → twc_cli-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twc-cli
-Version: 2.7.0
+Version: 2.8.0
 Summary: Timeweb Cloud Command Line Interface.
 Home-page: https://github.com/timeweb-cloud/twc
 License: MIT
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
 Requires-Dist: pygments (>=2.18.0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)

{twc_cli-2.7.0 → twc_cli-2.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twc-cli"
-version = "2.7.0"
+version = "2.8.0"
 description = "Timeweb Cloud Command Line Interface."
 authors = ["ge <dev@timeweb.cloud>"]
 homepage = "https://github.com/timeweb-cloud/twc"

{twc_cli-2.7.0 → twc_cli-2.8.0}/twc/__version__.py

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

{twc_cli-2.7.0 → twc_cli-2.8.0}/twc/api/client.py

@@ -1410,18 +1410,28 @@ class TimewebCloud(TimewebCloudBase):
         self,
         fqdn: str,
         dns_record_type: DNSRecordType,
-        value: str,
+        value: Optional[str] = None,
         subdomain: Optional[str] = None,
         priority: Optional[int] = None,
+        ttl: Optional[int] = None,
+        protocol: Optional[str] = None,
+        service: Optional[str] = None,
+        host: Optional[str] = None,
+        port: Optional[int] = None,
         *,
         null_subdomain: bool = False,
     ):
         """Add DNS record to domain."""
         payload = {
             "type": dns_record_type,
-            "value": value,
+            **({"value": value} if value else {}),
             **({"subdomain": subdomain} if subdomain else {}),
-            **({"priority": priority} if priority else {}),
+            **({"priority": priority} if priority is not None else {}),
+            **({"ttl": ttl} if ttl else {}),
+            **({"protocol": protocol} if protocol else {}),
+            **({"service": service} if service else {}),
+            **({"host": host} if host else {}),
+            **({"port": port} if port else {}),
         }
         if null_subdomain:
             payload["subdomain"] = None

{twc_cli-2.7.0 → twc_cli-2.8.0}/twc/commands/domain.py

@@ -2,6 +2,7 @@
 
 import re
 import sys
+from enum import Enum
 from typing import Optional, List
 from pathlib import Path
 
@@ -316,6 +317,14 @@ def domain_remove_dns_record(
 # ------------------------------------------------------------- #
 
 
+class SRVProtocol(str, Enum):
+    """Supported protocols for SRV records."""
+
+    TCP = "TCP"
+    UPD = "UDP"
+    TLS = "TLS"
+
+
 @domain_record.command("add", "create")
 def domain_add_dns_record(
     domain_name: str,
@@ -331,12 +340,40 @@ def domain_add_dns_record(
         metavar="TYPE",
         help=f"[{'|'.join([k.value for k in DNSRecordType])}]",
     ),
-    value: Optional[str] = typer.Option(...),
+    value: Optional[str] = typer.Option(
+        None,
+        help="Record value. Skip it for SRV records.",
+    ),
     priority: Optional[int] = typer.Option(
         None,
         "--prio",
         help="Record priority. Supported for MX, SRV records.",
     ),
+    service: Optional[str] = typer.Option(
+        None,
+        "--service",
+        help="Service for SRV record e.g '_matrix'.",
+    ),
+    proto: Optional[SRVProtocol] = typer.Option(
+        None,
+        "--proto",
+        help="Protocol for SRV record.",
+    ),
+    host: Optional[str] = typer.Option(
+        None,
+        "--host",
+        help="Host for SRV record.",
+    ),
+    port: Optional[int] = typer.Option(
+        None,
+        "--port",
+        help="Port for SRV record.",
+        min=1,
+        max=65535,
+    ),
+    ttl: Optional[int] = typer.Option(
+        None, "--ttl", help="Time-To-Live for DNS record."
+    ),
     second_ld: Optional[bool] = typer.Option(
         False,
         "--2ld",
@@ -346,6 +383,9 @@ def domain_add_dns_record(
     """Add dns record for domain or subdomain."""
     client = create_client(config, profile)
 
+    if record_type != "SRV" and not value:
+        sys.exit("Error: --value is expected for non-SRV DNS records")
+
     null_subdomain = False
 
     if second_ld:
@@ -372,14 +412,21 @@ def domain_add_dns_record(
             domain_name = original_domain_name
             subdomain = None
 
-    response = client.add_domain_dns_record(
-        domain_name,
-        record_type,
-        value,
-        subdomain,
-        priority,
-        null_subdomain=null_subdomain,
-    )
+    payload = {
+        "fqdn": domain_name,
+        "dns_record_type": record_type,
+        "value": value,
+        "subdomain": subdomain,
+        "priority": priority,
+        "ttl": ttl,
+        "protocol": "_" + proto if proto else None,
+        "service": service,
+        "host": host,
+        "port": port,
+        "null_subdomain": null_subdomain,
+    }
+
+    response = client.add_domain_dns_record(**payload)
     fmt.printer(
         response,
         output_format=output_format,