fix: support asterisk and multiple domains

app/services/aws.py

@@ -1,5 +1,6 @@
 from boto3 import client
 import json
+from slugify import slugify
 
 from .certbot import Cert
 
@@ -13,7 +14,7 @@ def upload_certs_as_secrets(
     certs: list[Cert], name: str, secret_names: list[str] = None, description: str = ''
 ) -> None:
     for cert in certs:
-        name = name.format(domain=cert.domain)
+        name = name.format(domain=slugify(cert.domain))
 
         create_or_update_secret(
             name=name,

app/services/certbot.py

@@ -53,20 +53,24 @@ def obtain_certbot_certs(
     ]
     certbot.main.main(certbot_args)
 
-    return read_certs_from_path(certbot_dir.joinpath("live"), domains)
+    return read_certs_from_path(certbot_dir.joinpath("live"))
 
 
-def read_certs_from_path(path: Path, domains: list[str]) -> list[Cert]:
+def read_certs_from_path(path: Path) -> list[Cert]:
     certs: list[Cert] = []
     cert_files = ["fullchain.pem", "chain.pem", "privkey.pem", "cert.pem"]
 
+    domains = [
+        v.name
+        for v in path.iterdir()
+        if v.is_dir()
+    ]
+
     for domain in domains:
-        domain_path = path.joinpath(domain)
+        if domain.startswith('*.'):
+            domain = domain[2:]
 
-        if not domain_path.is_dir():
-            raise RuntimeError(
-                f"Failed to generate cert for {domain}: {domain_path} is not a directory"
-            )
+        domain_path = path.joinpath(domain)
 
         cert = Cert(domain=domain, files=[])
 

pyproject.toml

@@ -26,6 +26,7 @@ certbot-dns-ovh = "^1.22.0"
 certbot-dns-rfc2136 = "^1.22.0"
 certbot-dns-sakuracloud = "^1.22.0"
 python-dotenv = "^0.19.2"
+python-slugify = "^5.0.2"
 
 [tool.poetry.dev-dependencies]
 taskipy = "^1.9.0"