style: flake8

SwanseaUniversityMedical · Mar 21, 2024 · fc24ae2 · fc24ae2
1 parent da6395e
commit fc24ae2
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 19 deletions.
diff --git a/containers/controller/src/controller/api/connections/delete.py b/containers/controller/src/controller/api/connections/delete.py
@@ -1,5 +1,3 @@
-
-import json
 import logging
 from urllib.parse import quote
 

diff --git a/containers/controller/src/controller/api/connections/get.py b/containers/controller/src/controller/api/connections/get.py
@@ -43,6 +43,7 @@ def api_get_connection(
     logging.debug(f"{response=}")
     return response
 
+
 def api_get_connection_parameters(
     hostname: str,
     port: int,

diff --git a/containers/controller/src/controller/api/connections/list.py b/containers/controller/src/controller/api/connections/list.py
@@ -15,7 +15,7 @@ def api_list_connections(
     data_source: str
 ) -> dict:
 
-    logging.debug(f"List connections")
+    logging.debug("List connections")
     response = requests.get(
         build_url(
             scheme="http",

diff --git a/containers/controller/src/controller/api/error.py b/containers/controller/src/controller/api/error.py
@@ -2,5 +2,6 @@
 class APIUserDoesNotExistError(RuntimeError):
     pass
 
+
 class APIConnectionDoesNotExistError(RuntimeError):
     pass
diff --git a/containers/controller/src/controller/api/users/delete.py b/containers/controller/src/controller/api/users/delete.py
@@ -1,5 +1,3 @@
-
-import json
 import logging
 from urllib.parse import quote
 

diff --git a/containers/controller/src/controller/api/users/list.py b/containers/controller/src/controller/api/users/list.py
@@ -15,7 +15,7 @@ def api_list_users(
     data_source: str
 ) -> dict:
 
-    logging.debug(f"List users")
+    logging.debug("List users")
     response = requests.get(
         build_url(
             scheme="http",

diff --git a/containers/controller/src/controller/api/wrapper.py b/containers/controller/src/controller/api/wrapper.py
@@ -56,7 +56,6 @@ def list_users(self):
             data_source=self.data_source
         )
 
-
     def get_user(self, username: str):
         # logging.info(f"Get user {username=}")
         return api_get_user(
@@ -67,7 +66,6 @@ def get_user(self, username: str):
             username=username
         )
 
-
     def get_user_effective_permissions(self, username: str):
         # logging.info(f"Get user effective permissions {username=}")
         return api_get_user_effective_permissions(
@@ -103,7 +101,6 @@ def create_user(
             role=role
         )
 
-
     def update_user(
         self,
         username: str,
@@ -213,7 +210,6 @@ def get_connection(self, conn_id: int):
             conn_id=conn_id
         )
 
-
     def get_connection_parameters(self, conn_id: int):
         # logging.info(f"Get connection parameters {conn_id=}")
         return api_get_connection_parameters(
@@ -224,7 +220,6 @@ def get_connection_parameters(self, conn_id: int):
             conn_id=conn_id
         )
 
-
     def create_connection(
         self,
         name: str,
@@ -249,7 +244,6 @@ def create_connection(
 
         return response["identifier"]
 
-
     def update_connection(
         self,
         conn_id: int,
@@ -285,8 +279,8 @@ def create_or_update_connection(
         try:
             conn_id = self.get_connection_id(conn_name=name)
 
-            connection = self.get_connection(conn_id=conn_id)
-            connection_parameters = self.get_connection_parameters(conn_id=conn_id)
+            # connection = self.get_connection(conn_id=conn_id)
+            # connection_parameters = self.get_connection_parameters(conn_id=conn_id)
 
             # TODO determine if connection needs updating
             needs_update = True
@@ -307,7 +301,6 @@ def create_or_update_connection(
             # else:
             #     logging.info(f"Skipping updating connection {name=}")
 
-
         except APIConnectionDoesNotExistError:
 
             return self.create_connection(
@@ -358,7 +351,6 @@ def delete_user_connection(
             conn_id=conn_id,
         )
 
-
     def list_connection_users(
         self,
         conn_id: int

diff --git a/containers/controller/src/controller/sync/sync_connections.py b/containers/controller/src/controller/sync/sync_connections.py
@@ -16,7 +16,6 @@ def sync_connections(
     # Add connections via api
     for manifest_name, manifest in manifests.items():
 
-
         name = manifest["metadata"]["name"]
         namespace = manifest["metadata"]["namespace"]
 

diff --git a/containers/controller/src/controller/sync/sync_users.py b/containers/controller/src/controller/sync/sync_users.py
@@ -2,7 +2,6 @@
 
 from .get_unique_users import get_unique_users
 from ..api import API
-from ..directory import LDAP
 
 
 def sync_users(
@@ -31,4 +30,3 @@ def sync_users(
     for observed_user in observed_users.values():
         if (observed_user["username"] not in expected_users) and (observed_user["username"] != api.username):
             api.delete_user(username=observed_user["username"])
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,6 @@ @@
     class APIUserDoesNotExistError(RuntimeError):
         pass
     class APIConnectionDoesNotExistError(RuntimeError):
         pass