Formatting fixes

canonical · Jun 29, 2023 · 88a76db · 88a76db
1 parent 4d3b201
commit 88a76db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/charms/jimm-k8s/src/charm.py b/charms/jimm-k8s/src/charm.py
@@ -20,7 +20,6 @@
 import logging
 import os
 import socket
-import functools
 
 import hvac
 import requests
@@ -89,7 +88,7 @@ def __init__(self, *args):
         super().__init__(*args)
 
         self._state = State(self.app, lambda: self.model.get_relation("peer"))
-        
+
         self.framework.observe(self.on.peer_relation_changed, self._on_peer_relation_changed)
         self.framework.observe(self.on.jimm_pebble_ready, self._on_jimm_pebble_ready)
         self.framework.observe(self.on.config_changed, self._on_config_changed)
@@ -342,7 +341,6 @@ def _on_update_status(self, _):
 
     @requires_state_setter
     def _on_dashboard_relation_joined(self, event: RelationJoinedEvent):
-
         dns_name = self._get_dns_name(event)
         if not dns_name:
             return
@@ -500,7 +498,6 @@ def _on_vault_relation_joined(self, event):
 
     @requires_state_setter
     def _on_vault_relation_changed(self, event):
-
         container = self.unit.get_container(WORKLOAD_CONTAINER)
 
         # if we can't connect to the container we should defer
@@ -564,15 +561,14 @@ def _hash(self, filename):
 
     @requires_state_setter
     def _on_openfga_store_created(self, event: OpenFGAStoreCreateEvent):
-
         if not event.store_id:
             return
 
         # secret = self.model.get_secret(id=event.token_secret_id)
         # secret_content = secret.get_content()
 
         self._state.openfga_store_id = event.store_id
-        self._state.openfga_token = event.token # secret_content["token"]
+        self._state.openfga_token = event.token  # secret_content["token"]
         self._state.openfga_address = event.address
         self._state.openfga_port = event.port
         self._state.openfga_scheme = event.scheme
@@ -599,7 +595,6 @@ def _get_dns_name(self, event):
 
     @requires_state_setter
     def _on_certificates_relation_joined(self, event: RelationJoinedEvent) -> None:
-
         dns_name = self._get_dns_name(event)
         if not dns_name:
             return
@@ -615,7 +610,6 @@ def _on_certificates_relation_joined(self, event: RelationJoinedEvent) -> None:
 
     @requires_state_setter
     def _on_certificate_available(self, event: CertificateAvailableEvent) -> None:
-
         self._state.certificate = event.certificate
         self._state.ca = event.ca
         self._state.chain = event.chain
@@ -624,7 +618,6 @@ def _on_certificate_available(self, event: CertificateAvailableEvent) -> None:
 
     @requires_state_setter
     def _on_certificate_expiring(self, event: CertificateExpiringEvent) -> None:
-
         old_csr = self._state.csr
         private_key = self._state.private_key
         dns_name = self._get_dns_name(event)
@@ -645,7 +638,6 @@ def _on_certificate_expiring(self, event: CertificateExpiringEvent) -> None:
 
     @requires_state_setter
     def _on_certificate_revoked(self, event: CertificateRevokedEvent) -> None:
-
         old_csr = self._state.csr
         private_key = self._state.private_key
         dns_name = self._get_dns_name(event)
@@ -671,21 +663,18 @@ def _on_certificate_revoked(self, event: CertificateRevokedEvent) -> None:
 
     @requires_state_setter
     def _on_ingress_ready(self, event: IngressPerAppReadyEvent):
-
         self._state.dns_name = event.url
 
         self._update_workload(event)
 
     @requires_state_setter
     def _on_ingress_revoked(self, event: IngressPerAppRevokedEvent):
-
         del self._state.dns_name
 
         self._update_workload(event)
 
     @requires_state_setter
     def _on_create_authorization_model_action(self, event: ActionEvent):
-
         model = event.params["model"]
         if not model:
             event.fail("authorization model not specified")

diff --git a/charms/jimm-k8s/src/state.py b/charms/jimm-k8s/src/state.py
@@ -7,7 +7,6 @@
 import json
 
 
-
 def requires_state_setter(func):
     @functools.wraps(func)
     def wrapper(self, event):

diff --git a/charms/jimm/src/charm.py b/charms/jimm/src/charm.py
@@ -417,7 +417,7 @@ def _on_openfga_store_created(self, event: OpenFGAStoreCreateEvent):
             "openfga_port": event.port,
             "openfga_scheme": event.scheme,
             "openfga_store": event.store_id,
-            "openfga_token": event.token # secret_content["token"],
+            "openfga_token": event.token,  # secret_content["token"],
         }
 
         with open(self._env_filename("openfga"), "wt") as f: