11
11
LdapRequirer ,
12
12
LdapUnavailableEvent ,
13
13
)
14
- from charms .postgresql_k8s .v0 .postgresql_tls import (
15
- TLS_TRANSFER_RELATION ,
16
- )
17
14
from ops import Relation
18
15
from ops .framework import Object
19
- from ops .model import ActiveStatus , BlockedStatus
16
+ from ops .model import ActiveStatus
20
17
21
18
logger = logging .getLogger (__name__ )
22
19
@@ -35,29 +32,13 @@ def __init__(self, charm, relation_name: str):
35
32
self .framework .observe (self .ldap .on .ldap_ready , self ._on_ldap_ready )
36
33
self .framework .observe (self .ldap .on .ldap_unavailable , self ._on_ldap_unavailable )
37
34
38
- @property
39
- def ca_transferred (self ) -> bool :
40
- """Return whether the CA certificate has been transferred."""
41
- ca_transferred_relations = self .model .relations [TLS_TRANSFER_RELATION ]
42
-
43
- for relation in ca_transferred_relations :
44
- if relation .app .name == self ._relation .app .name :
45
- return True
46
-
47
- return False
48
-
49
35
@property
50
36
def _relation (self ) -> Relation :
51
37
"""Return the relation object."""
52
38
return self .model .get_relation (self .relation_name )
53
39
54
- def _on_ldap_ready (self , event : LdapReadyEvent ) -> None :
40
+ def _on_ldap_ready (self , _ : LdapReadyEvent ) -> None :
55
41
"""Handler for the LDAP ready event."""
56
- if not self .ca_transferred :
57
- self .charm .unit .status = BlockedStatus ("LDAP insecure. Send LDAP server certificate" )
58
- event .defer ()
59
- return
60
-
61
42
logger .debug ("Enabling LDAP connection" )
62
43
if self .charm .unit .is_leader ():
63
44
self .charm .app_peer_data .update ({"ldap_enabled" : "True" })
0 commit comments