diff --git a/generate/container.py b/generate/container.py index c4edba3..27238ae 100644 --- a/generate/container.py +++ b/generate/container.py @@ -24,18 +24,6 @@ class ConfigError(Exception): return f"Configuration error: {self.message}" -def join(data: list, separator: str = ",") -> str: - """Join a list together.""" - ret: str = "" - x = data.copy() - if len(x) == 0: - return ret - while len(x) > 1: - ret += x.pop() + separator - ret += x.pop() - return ret - - def maybe(json: dict, key: str) -> str | dict | list | bool | None: """Maybe get a value.""" try: @@ -132,7 +120,8 @@ class Secret: cmd = ( f"--secret {self.name},type={self.secret_type},target={self.target}" ) - if self.target == "mount" and self.options != "": + # Not a password, ruff... + if self.secret_type == "mount" and self.options != "": # noqa: S105 cmd = f"{cmd},{self.options}" return cmd @@ -265,7 +254,7 @@ class Network: if self.mode == "": return "" cmd = f"--network={self.mode}" - opts = join(self.options) + opts = ",".join(self.options) if opts != "": cmd += f":{opts}" return cmd @@ -346,10 +335,10 @@ class Dns: if len(self.servers) == 0: return f"--dns-search={self.search}" if self.search == "": - return f"--dns={join(self.servers)}" + return f"--dns={','.join(self.servers)}" cmd = f"--dns-search={self.search} \\\n\t--dns=" - cmd += join(self.servers) + cmd += ",".join(self.servers) return cmd