tenno/containerctl
1
0
Fork 0
Code Releases 1 Activity

generate: container: Allow one secret to be used multiple times

Browse source 
Secret a can now be used more than once, but currently only with the same
secret type.

Signed-off-by: Enno Tensing <tenno@suij.in>
This commit is contained in:
Enno Tensing 2025-08-08 15:51:53 +02:00
parent 486a38440f
commit 8b7221363c
Signed by: tenno
GPG key ID: 95265603BD36E66C
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
generate/container.py
View file

@ -298,7 +298,7 @@ class Secret:
name: str name: str
secret_type: str secret_type: str
target: str target: list
options: str options: str
@classmethod @classmethod
@ -316,26 +316,35 @@ class Secret:
continue continue
name = key name = key
secret_type = maybe_or(val[key], "type", "") secret_type = maybe_or(val[key], "type", "")
target = maybe_or(val[key], "target", "") target = maybe(val[key], "target")
if isinstance(target, str):
target = [target]
if not isinstance(target, list):
target = []
options = maybe_or(val[key], "options", "") options = maybe_or(val[key], "options", "")
if options is None: if options is None:
options = "" options = ""
secrets.append( secrets.append(
cls(name, str(secret_type), str(target), str(options)) cls(name, str(secret_type), target, str(options))
) )
return secrets return secrets
def command(self) -> str: def command(self) -> str:
"""Option for podman container create.""" """Option for podman container create."""
cmd = ( cmd = ""
f"--secret {self.name},:" for target in self.target:
f"type={self.secret_type}," cmd += (
f"target={self.target}" f"\t--secret {self.name},:"
) f"type={self.secret_type},"
# Not a password, ruff... f"target={target}"
if self.secret_type == "mount" and self.options != "": # noqa: S105 )
cmd = f"{cmd},{self.options}" # Not a password, ruff...
has_option = self.secret_type == "mount" # noqa: S105
has_option = has_option and self.options != ""
if has_option:
cmd = f"{cmd},{self.options}"
cmd += " \\\n"
return cmd return cmd
@ -697,7 +706,7 @@ class Container:
cmd += f"{self.ports.command()}" cmd += f"{self.ports.command()}"
cmd += f"{self.env.command()}" cmd += f"{self.env.command()}"
for secret in self.secrets: for secret in self.secrets:
cmd += f"\t{secret.command()} \\\n" cmd += f"{secret.command()}"
for volume in self.volumes: for volume in self.volumes:
cmd += f"\t{volume.command()} \\\n" cmd += f"\t{volume.command()} \\\n"
for capability in self.capabilities: for capability in self.capabilities: