twc-cli 2.3.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

twc/commands/balancer.py

@@ -48,8 +48,8 @@ def print_balancers(response: Response, filters: Optional[str]):
             "ID",
             "NAME",
             "STATUS",
-            "EXTERNAL IP",
             "INTERNAL IP",
+            "EXTERNAL IP",
         ]
     )
     for lb in balancers:
@@ -58,8 +58,8 @@ def print_balancers(response: Response, filters: Optional[str]):
                 lb["id"],
                 lb["name"],
                 lb["status"],
-                lb["ip"],
                 lb["local_ip"],
+                lb["ip"],
             ]
         )
     table.print()
@@ -98,8 +98,8 @@ def print_balancer(response: Response):
             "ID",
             "NAME",
             "STATUS",
-            "EXTERNAL IP",
             "INTERNAL IP",
+            "EXTERNAL IP",
         ]
     )
     table.row(
@@ -107,8 +107,8 @@ def print_balancer(response: Response):
             lb["id"],
             lb["name"],
             lb["status"],
-            lb["ip"],
             lb["local_ip"],
+            lb["ip"],
         ]
     )
     table.print()
@@ -164,7 +164,7 @@ def balancer_create(
     port: int = typer.Option(80, help="Load balancer listen port."),
     path: str = typer.Option("/", help="URL path."),
     proto: LoadBalancerProto = typer.Option(
-        ..., help="Health check protocol."
+        LoadBalancerProto.HTTP.value, help="Health check protocol."
     ),
     inter: int = typer.Option(10, help="Health checks interval in seconds."),
     timeout: int = typer.Option(5, help="Health check timeout in seconds."),
@@ -187,6 +187,7 @@ def balancer_create(
         callback=load_from_config_callback,
         help="Add load balancer to specific project.",
     ),
+    network: Optional[str] = typer.Option(None, help="Private network ID."),
 ):
     """Create load balancer."""
     client = create_client(config, profile)
@@ -206,22 +207,28 @@ def balancer_create(
         ]:
             sys.exit(f"Wrong project ID: Project '{project_id}' not found.")
 
-    response = client.create_load_balancer(
-        name=name,
-        preset_id=preset_id,
-        algo=algo,
-        proto=proto,
-        port=port,
-        path=path,
-        inter=inter,
-        timeout=timeout,
-        fall=fall,
-        rise=rise,
-        sticky=sticky,
-        proxy_protocol=proxy_protocol,
-        force_https=force_https,
-        backend_keepalive=backend_keepalive,
-    )
+    payload = {
+        "name": name,
+        "preset_id": preset_id,
+        "algo": algo,
+        "proto": proto,
+        "port": port,
+        "path": path,
+        "inter": inter,
+        "timeout": timeout,
+        "fall": fall,
+        "rise": rise,
+        "sticky": sticky,
+        "proxy_protocol": proxy_protocol,
+        "force_https": force_https,
+        "backend_keepalive": backend_keepalive,
+    }
+
+    if network:
+        payload["network"] = {"id": network}
+
+    # Create LB
+    response = client.create_load_balancer(**payload)
 
     # Add created LB to project if set
     if project_id:
@@ -478,23 +485,18 @@ def balancer_rule_list(
 # ------------------------------------------------------------- #
 
 
-def port_proto_callback(value):
+def validate_balancer_port_proto_callback(value):
     """Typer callback for PORT/PROTO validation."""
     if value:
-        if not re.match(r"^\d+\/(http|http2|https|tcp)$", value):
+        if not re.match(r"^\d+\/(http|http2|https|tcp)$", value, re.I):
             sys.exit(
                 f"Error: Malformed argument: '{value}': "
-                "Correct patterns: '443/https', '2000/tcp', etc."
+                "Correct patterns: '443/HTTPS', '2000/TCP', etc.\n"
+                "Available protocols: "
+                f"{', '.join([lb.value for lb in LoadBalancerProto])}"
             )
         port, proto = value.split("/")
-        if port.isdigit():
-            port = int(port)
-        else:
-            raise typer.BadParameter("Port number must be integer.")
-        try:
-            LoadBalancerProto(proto)
-        except ValueError as e:
-            raise typer.BadParameter(f"Protocol {e}")
+        port = int(port)
         return port, proto
     return value
 
@@ -508,13 +510,13 @@ def balancer_rule_add(
     output_format: Optional[str] = output_format_option,
     frontend: str = typer.Option(
         ...,
-        callback=port_proto_callback,
+        callback=validate_balancer_port_proto_callback,
         metavar="PORT/PROTO",
         help="Frontend port and protocol.",
     ),
     backend: str = typer.Option(
         ...,
-        callback=port_proto_callback,
+        callback=validate_balancer_port_proto_callback,
         metavar="PORT/PROTO",
         help="Backend port and protocol.",
     ),
@@ -566,13 +568,13 @@ def balancer_rule_update(
     output_format: Optional[str] = output_format_option,
     frontend: Optional[str] = typer.Option(
         None,
-        callback=port_proto_callback,
+        callback=validate_balancer_port_proto_callback,
         metavar="PORT/PROTO",
         help="Frontend port and protocol.",
     ),
     backend: Optional[str] = typer.Option(
         None,
-        callback=port_proto_callback,
+        callback=validate_balancer_port_proto_callback,
         metavar="PORT/PROTO",
         help="Backend port and protocol.",
     ),

twc/commands/common.py

@@ -152,13 +152,17 @@ def profile_callback(value: str, ctx: typer.Context) -> str:
 def filter_callback(value: str) -> str:
     """Validate filters format."""
     if value:
-        if not re.match(r"^(([a-z0-9._-]+:[a-z0-9._-]+),?)+$", value, re.I):
+        if not re.match(
+            r"^(([a-z0-9._-]+:[a-z0-9._\-/+%]+),?)+$", value, re.I
+        ):
             raise UsageError(
                 "Invalid filter format. Filter must contain comma separated "
-                + "KEY:VALUE pairs. Allowed characters: [a-zA-Z0-9_.]"
+                + "KEY:VALUE pairs. Allowed characters: [a-zA-Z0-9_.-/+%]"
             )
-        # Make alias 'region=location'
-        value = value.replace("region", "location")
+        # Make aliases
+        value = value.replace("region:", "location:")
+        value = value.replace("proto:", "protocol:")
+        value = value.replace("rule_id:", "id:")
     return value
 
 

twc/commands/config.py

@@ -24,7 +24,7 @@ from .common import (
 )
 
 
-config = typer.Typer(help=__doc__)
+config = typer.Typer(help=__doc__, no_args_is_help=False)
 
 
 DEFAULT_CONFIG = {"default": {"token": None}}
@@ -277,3 +277,30 @@ def config_edit(
 ):
     """Open configuration file in default editor."""
     typer.launch(str(config))
+
+
+# ------------------------------------------------------------- #
+# $ twc config profiles                                         #
+# ------------------------------------------------------------- #
+
+
+@config.command("profiles")
+def config_profile(
+    # pylint: disable=redefined-outer-name
+    config: Optional[Path] = typer.Option(
+        None,
+        "--config",
+        "-c",
+        envvar="TWC_CONFIG_FILE",
+        show_envvar=False,
+        exists=True,
+        dir_okay=False,
+        callback=config_callback,
+        hidden=True,
+        help="Use config.",
+    ),
+):
+    """Display configuration profiles."""
+    config_dict = load_config(config)
+    for key in config_dict.keys():
+        print(key)