Skip to content

Commit a4ab3ae

Browse files
authored
Use fqdn only if no SANs provided (#56)
1 parent b6cc48c commit a4ab3ae

File tree

2 files changed

+4
-68
lines changed

2 files changed

+4
-68
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

lib/charms/observability_libs/v0/cert_handler.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
LIBID = "b5cd5cd580f3428fa5f59a8876dcbe6a"
6464
LIBAPI = 0
65-
LIBPATCH = 5
65+
LIBPATCH = 6
6666

6767

6868
class CertChanged(EventBase):
@@ -101,16 +101,16 @@ def __init__(
101101
peer_relation_name: Must match metadata.yaml.
102102
certificates_relation_name: Must match metadata.yaml.
103103
cert_subject: Custom subject. Name collisions are under the caller's responsibility.
104-
extra_sans_dns: Any additional DNS names apart from FQDN.
104+
extra_sans_dns: DNS names. If none are given, use FQDN.
105105
"""
106106
super().__init__(charm, key)
107107

108108
self.charm = charm
109109
self.cert_subject = cert_subject or charm.unit.name
110110
self.cert_subject = charm.unit.name if not cert_subject else cert_subject
111111

112-
# Auto-include the fqdn and drop empty/duplicate sans
113-
self.sans_dns = list(set(filter(None, (extra_sans_dns or []) + [socket.getfqdn()])))
112+
# Use fqdn only if no SANs were given, and drop empty/duplicate SANs
113+
self.sans_dns = list(set(filter(None, (extra_sans_dns or [socket.getfqdn()]))))
114114

115115
self.peer_relation_name = peer_relation_name
116116
self.certificates_relation_name = certificates_relation_name

0 commit comments

Comments
 (0)