Merge branch 'main' into TELCO-889-remove-defers

canonical · Feb 26, 2024 · 0f941f5 · 0f941f5
2 parents 1a6814e + b1cbb03
commit 0f941f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -11,9 +11,7 @@ parts:
   charm:
     build-packages:
       - cargo
+      - libffi-dev
+      - libssl-dev
+      - pkg-config
       - rustc
-    charm-binary-python-packages:
-      - cryptography
-      - jsonschema
-      - pip
-      - setuptools
diff --git a/lib/charms/tls_certificates_interface/v3/tls_certificates.py b/lib/charms/tls_certificates_interface/v3/tls_certificates.py
@@ -312,7 +312,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 = 1
+LIBPATCH = 2
 
 PYDEPS = ["cryptography", "jsonschema"]
 
@@ -1488,10 +1488,10 @@ def get_requirer_csrs(self) -> List[RequirerCSR]:
         Returns:
             list: List of RequirerCSR objects.
         """
-        requirer_csrs = []
         relation = self.model.get_relation(self.relationship_name)
         if not relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
+            return []
+        requirer_csrs = []
         requirer_relation_data = _load_relation_data(relation.data[self.model.unit])
         requirer_csrs_dict = requirer_relation_data.get("certificate_signing_requests", [])
         for requirer_csr_dict in requirer_csrs_dict: