This commit is contained in:
2026-01-11 12:35:27 -06:00
parent 4216e833e5
commit 894dc2f3e0
12 changed files with 121 additions and 86 deletions

View File

@@ -1,6 +1,6 @@
from collections.abc import Iterable, Iterator
from dataclasses import dataclass
from typing import Self, final, override
from dataclasses import dataclass, field
from typing import Self, final
from docker_compose.cfg.org import OrgData
from docker_compose.compose.net_yaml import NetArgsYaml, NetYaml
@@ -11,11 +11,18 @@ from docker_compose.compose.services import Service
@dataclass(frozen=True, slots=True)
class NetArgs:
name: str
full_name: str = field(init=False)
external: bool = field(init=False)
def __post_init__(self):
setter = super(NetArgs, self).__setattr__
setter("full_name", f"{OrgData.org_app.dest}_{self.name}")
setter("external", self.name == "proxy")
@property
def as_dict(self) -> NetArgsYaml:
yaml_dict = NetArgsYaml(
name=str(self),
name=self.full_name,
)
if self.external:
yaml_dict["external"] = self.external
@@ -25,14 +32,6 @@ class NetArgs:
# def as_key_dict(self) -> tuple[str, NetArgsYaml]:
# return str(self), self.as_dict
@override
def __str__(self) -> str:
return f"{OrgData.org_app.dest}_{self.name}"
@property
def external(self) -> bool:
return self.name == "proxy"
@final
@dataclass
@@ -58,4 +57,4 @@ class Net:
for net in self.data:
if not net.external:
continue
yield str(net)[:-6]
yield net.full_name[:-6]