Skip to content

Commit 8c2cae6

Browse files
authored
Merge pull request #111 from canonical/DPE-5515/v217
[DPE-5515] Version 2.17
2 parents 8cfa5f9 + ef8d9a6 commit 8c2cae6

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

lib/charms/tls_certificates_interface/v3/tls_certificates.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def _on_all_certificates_invalidated(self, event: AllCertificatesInvalidatedEven
318318

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

323323
PYDEPS = ["cryptography", "jsonschema"]
324324

@@ -1449,9 +1449,7 @@ def _revoke_certificates_for_which_no_csr_exists(self, relation_id: int) -> None
14491449
Returns:
14501450
None
14511451
"""
1452-
provider_certificates = self.get_unsolicited_certificates(
1453-
relation_id=relation_id
1454-
)
1452+
provider_certificates = self.get_unsolicited_certificates(relation_id=relation_id)
14551453
for provider_certificate in provider_certificates:
14561454
self.on.certificate_revocation_request.emit(
14571455
certificate=provider_certificate.certificate,
@@ -2028,7 +2026,7 @@ def _find_certificate_in_relation_data(self, csr: str) -> Optional[ProviderCerti
20282026
def _get_csr_from_secret(self, secret: Secret) -> str:
20292027
"""Extract the CSR from the secret label or content.
20302028
2031-
This function is a workaround to maintain backwards compatiblity
2029+
This function is a workaround to maintain backwards compatibility
20322030
and fix the issue reported in
20332031
https://github.com/canonical/tls-certificates-interface/issues/228
20342032
"""

src/literals.py

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

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

7-
OPENSEARCH_DASHBOARDS_SNAP_REVISION = "23"
7+
OPENSEARCH_DASHBOARDS_SNAP_REVISION = "24"
88

99
SUBSTRATE = "vm"
1010
CHARM_KEY = "opensearch-dashboards"
@@ -20,10 +20,10 @@
2020

2121
DEPENDENCIES = {
2222
"osd_upstream": {
23-
"dependencies": {"opensearch": "2.16"},
23+
"dependencies": {"opensearch": "2.17"},
2424
"name": "opensearch-dashboards",
2525
"upgrade_supported": ">=2",
26-
"version": "2.16",
26+
"version": "2.17",
2727
},
2828
}
2929

0 commit comments

Comments
 (0)