Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update charm libraries #28

Merged
merged 1 commit into from
Jan 18, 2024
Merged

chore: Update charm libraries #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions lib/charms/lego_base_k8s/v0/lego_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def _plugin_config(self):
from cryptography.x509.oid import NameOID
from ops.charm import CharmBase
from ops.framework import EventBase
from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, WaitingStatus
from ops.model import ActiveStatus, BlockedStatus
from ops.pebble import ExecError

# The unique Charmhub library identifier, never change it
Expand All @@ -85,7 +85,7 @@ def _plugin_config(self):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 1
LIBPATCH = 2


logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -198,22 +198,17 @@ def _on_certificate_creation_request(self, event: CertificateCreationRequestEven
if not self.unit.is_leader():
return
if not self._container.can_connect():
self.unit.status = WaitingStatus("Waiting for container to be ready")
logger.info("Waiting for container to be ready")
event.defer()
return
csr_subject = self._get_subject_from_csr(event.certificate_signing_request)
if len(csr_subject) > 64:
self.unit.status = BlockedStatus(
f"Subject is too long (> 64 characters): {csr_subject}"
)
logger.error("Subject is too long (> 64 characters): %s", csr_subject)
return
logger.info("Received Certificate Creation Request for domain %s", csr_subject)
self._push_csr_to_workload(event.certificate_signing_request)
self.unit.status = MaintenanceStatus("Executing lego command")
if not self._execute_lego_cmd():
self.unit.status = BlockedStatus(
"Workload command execution failed, use `juju debug-log` for more information."
)
logger.error("Failed to execute lego command")
return
signed_certificates = self._pull_certificates_from_workload(csr_subject)
self.tls_certificates.set_relation_certificate(
Expand All @@ -223,7 +218,6 @@ def _on_certificate_creation_request(self, event: CertificateCreationRequestEven
chain=list(reversed(signed_certificates)),
relation_id=event.relation_id,
)
self.unit.status = ActiveStatus()

@property
def _cmd(self) -> List[str]:
Expand Down