Skip to content

Commit

Permalink
Merge pull request #111 from canonical/DPE-5515/v217
Browse files Browse the repository at this point in the history
[DPE-5515] Version 2.17
  • Loading branch information
juditnovak authored Sep 20, 2024
2 parents 8cfa5f9 + ef8d9a6 commit 8c2cae6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions lib/charms/tls_certificates_interface/v3/tls_certificates.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def _on_all_certificates_invalidated(self, event: AllCertificatesInvalidatedEven

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

PYDEPS = ["cryptography", "jsonschema"]

Expand Down Expand Up @@ -1449,9 +1449,7 @@ def _revoke_certificates_for_which_no_csr_exists(self, relation_id: int) -> None
Returns:
None
"""
provider_certificates = self.get_unsolicited_certificates(
relation_id=relation_id
)
provider_certificates = self.get_unsolicited_certificates(relation_id=relation_id)
for provider_certificate in provider_certificates:
self.on.certificate_revocation_request.emit(
certificate=provider_certificate.certificate,
Expand Down Expand Up @@ -2028,7 +2026,7 @@ def _find_certificate_in_relation_data(self, csr: str) -> Optional[ProviderCerti
def _get_csr_from_secret(self, secret: Secret) -> str:
"""Extract the CSR from the secret label or content.
This function is a workaround to maintain backwards compatiblity
This function is a workaround to maintain backwards compatibility
and fix the issue reported in
https://github.com/canonical/tls-certificates-interface/issues/228
"""
Expand Down
6 changes: 3 additions & 3 deletions src/literals.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

"""Collection of global literals for the charm."""

OPENSEARCH_DASHBOARDS_SNAP_REVISION = "23"
OPENSEARCH_DASHBOARDS_SNAP_REVISION = "24"

SUBSTRATE = "vm"
CHARM_KEY = "opensearch-dashboards"
Expand All @@ -20,10 +20,10 @@

DEPENDENCIES = {
"osd_upstream": {
"dependencies": {"opensearch": "2.16"},
"dependencies": {"opensearch": "2.17"},
"name": "opensearch-dashboards",
"upgrade_supported": ">=2",
"version": "2.16",
"version": "2.17",
},
}

Expand Down

0 comments on commit 8c2cae6

Please sign in to comment.