Fixes CI issues

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
 
   integration-test:
     name: Integration tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.gitignore

@@ -5,3 +5,6 @@ build/
 .coverage
 __pycache__/
 *.py[cod]
+
+.idea/
+

pyproject.toml

@@ -47,6 +47,10 @@ allow_redefinition = true
 module = ["ops.*", "kubernetes.*", "flatten_json.*", "git.*"]
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = ["charms.*"]
+follow_imports = "silent"
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 log_cli_level = "INFO"

src/charm.py

@@ -47,8 +47,8 @@ def __init__(self, *args):
         self.tls_certificates = TLSCertificatesProvidesV1(self, "certificates")
         self.vault = Vault(
             url=f"http://localhost:{self.VAULT_PORT}",
-            role_id=self._stored.role_id,
-            secret_id=self._stored.secret_id,
+            role_id=self._stored.role_id,  # type: ignore[arg-type]
+            secret_id=self._stored.secret_id,  # type: ignore[arg-type]
         )
         self._service_name = self._container_name = "vault"
         self._container = self.unit.get_container(self._container_name)
@@ -225,7 +225,7 @@ def _on_generate_certificate_action(self, event: ActionEvent) -> None:
         csr = generate_csr(
             private_key=private_key,
             subject=event.params["cn"],
-            sans=event.params["sans"],
+            sans=event.params["sans"],  # type: ignore[arg-type]
         )
         certificate = self.vault.issue_certificate(certificate_signing_request=csr.decode())
         event.set_results(

src/vault.py

@@ -40,7 +40,7 @@ def __init__(self, reason):
 class Vault:
     """Class to interact with Vault through its API."""
 
-    def __init__(self, url: str, role_id: str = None, secret_id: str = None):
+    def __init__(self, url: str, role_id: Optional[str] = None, secret_id: Optional[str] = None):
         self._client = hvac.Client(url=url)
         if role_id and secret_id:
             self.approle_login(role_id=role_id, secret_id=secret_id)
@@ -209,7 +209,9 @@ def generate_root_certificate(self, ttl: str = "87599h") -> str:
         logger.info("Generated root CA")
         return root_certificate["data"]["certificate"]
 
-    def enable_secrets_engine(self, ttl: str = None, max_ttl: str = None) -> None:
+    def enable_secrets_engine(
+        self, ttl: Optional[str] = None, max_ttl: Optional[str] = None
+    ) -> None:
         """Enables Vault's secret engine if the backend is mounted.
 
         Args:

tests/integration/test_integration.py

@@ -10,7 +10,7 @@
 import pytest
 import requests.exceptions  # type: ignore[import]
 import yaml
-from juju.errors import JujuError  # type: ignore[import]
+from juju.errors import JujuError
 
 from tests.integration.kubernetes import Kubernetes
 from tests.integration.vault import Vault
@@ -90,6 +90,7 @@ async def deploy_charm(ops_test, charm: Path) -> None:
             resources=resources,
             application_name=APPLICATION_NAME,
             trust=True,
+            series="focal",
         )
 
     async def post_deployment_tasks(self, namespace: str) -> str:

tests/unit/certificates.py

@@ -43,8 +43,8 @@ def generate_csr(
     private_key: bytes,
     subject: str,
     add_unique_id_to_subject_name: bool = True,
-    email_address: str = None,
-    country_name: str = None,
+    email_address: Optional[str] = None,
+    country_name: Optional[str] = None,
     private_key_password: Optional[bytes] = None,
     sans: Optional[List[str]] = None,
     additional_critical_extensions: Optional[List] = None,

tox.ini

@@ -75,9 +75,9 @@ commands =
 [testenv:integration]
 description = Run integration tests
 deps =
-    git+https://github.com/juju/python-libjuju.git
+    juju
     pytest
-    git+https://github.com/charmed-kubernetes/pytest-operator.git
+    pytest-operator
     -r{toxinidir}/requirements.txt
 commands =
     pytest --asyncio-mode=auto -v --tb native {[vars]integration_test_path} --log-cli-level=INFO -s {posargs} --destructive-mode