fix(typing): class attributes (#52)

wiremind · Apr 19, 2024 · 793399b · 793399b
1 parent cddebbe
commit 793399b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # wiremind-kubernetes
 
+## v7.4.3 (2024-04-19)
+### Fix
+- correct class attributes typing
+
 ## v7.4.2 (2024-04-19)
 ### Fix
 - kubernetes_helper: correct typing for `use_kubeconfig`

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.4.2
+7.4.3
diff --git a/src/wiremind_kubernetes/exceptions.py b/src/wiremind_kubernetes/exceptions.py
@@ -6,6 +6,8 @@ class WiremindKubernetesException(Exception):
     Base wiremind-kubernetes Exception.
     """
 
+    message: str
+
     def __init__(self, message: Optional[str] = None):
         super().__init__()
         if message:

diff --git a/src/wiremind_kubernetes/kubernetes_client_additional_arguments.py b/src/wiremind_kubernetes/kubernetes_client_additional_arguments.py
@@ -10,15 +10,19 @@ class ClientWithArguments:
     Currently add dry_run support for write functions and pretty to all.
     """
 
+    client: Any
+    read_additional_arguments: Dict[str, Any]
+    additional_arguments: Dict[str, Any]
+
     def __init__(self, client: Any, dry_run: bool = False, pretty: bool = True):
         self.client = client()  # like kubernetes.client.CoreV1Api
-        self.read_additional_arguments: Dict[str, Any] = {}
+        self.read_additional_arguments = {}
         # Only add it when its true because we set pretty client wide,
         # read_cluster_custom_object which accepts it will not have it set, but it's ok for now.
         if pretty:
             self.read_additional_arguments["pretty"] = pretty
         # Every request, either read or write, will have those arguments added
-        self.additional_arguments: Dict[str, Any] = self.read_additional_arguments.copy()
+        self.additional_arguments = self.read_additional_arguments.copy()
         if dry_run:
             # Dry run, in kube API, is not true or false, but either dry_run: All or not defined.
             self.additional_arguments["dry_run"] = "All"

diff --git a/src/wiremind_kubernetes/kubernetes_helper.py b/src/wiremind_kubernetes/kubernetes_helper.py
@@ -29,7 +29,19 @@ class KubernetesHelper:
     A simple helper for Kubernetes manipulation.
     """
 
-    SCALE_DOWN_MAX_WAIT_TIME = 3600
+    SCALE_DOWN_MAX_WAIT_TIME: int = 3600
+
+    client_corev1_api: kubernetes.client.CoreV1Api
+    client_appsv1_api: kubernetes.client.AppsV1Api
+    client_batchv1_api: kubernetes.client.BatchV1Api
+    client_autoscalingv1_api: kubernetes.client.AutoscalingV1Api
+    client_custom_objects_api: kubernetes.client.CustomObjectsApi
+    client_rbac_authorization_v1_api: kubernetes.client.RbacAuthorizationV1Api
+    client_networking_v1_api: kubernetes.client.NetworkingV1Api
+    client_storage_v1_api: kubernetes.client.StorageV1Api
+
+    dry_run: bool
+    pretty: bool
 
     def __init__(
         self,
@@ -52,27 +64,17 @@ def __init__(
         """
         if should_load_kubernetes_config:
             load_kubernetes_config(use_kubeconfig=use_kubeconfig, context=context)
-        self.client_corev1_api: kubernetes.client.CoreV1Api = CoreV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
-        self.client_appsv1_api: kubernetes.client.AppsV1Api = AppV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
-        self.client_batchv1_api: kubernetes.client.BatchV1Api = BatchV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
-        self.client_autoscalingv1_api: kubernetes.client.AutoscalingV1Api = AutoscalingV1ApiWithArguments(
-            dry_run=dry_run, pretty=pretty
-        )
-        self.client_custom_objects_api: kubernetes.client.CustomObjectsApi = CustomObjectsApiWithArguments(
-            dry_run=dry_run, pretty=pretty
-        )
-        self.client_rbac_authorization_v1_api: kubernetes.client.RbacAuthorizationV1Api = (
-            RbacAuthorizationV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
-        )
-        self.client_networking_v1_api: kubernetes.client.NetworkingV1Api = NetworkingV1ApiWithArguments(
-            dry_run=dry_run, pretty=pretty
-        )
-        self.client_storage_v1_api: kubernetes.client.StorageV1Api = StorageV1ApiWithArguments(
-            dry_run=dry_run, pretty=pretty
-        )
+        self.client_corev1_api = CoreV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_appsv1_api = AppV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_batchv1_api = BatchV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_autoscalingv1_api = AutoscalingV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_custom_objects_api = CustomObjectsApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_rbac_authorization_v1_api = RbacAuthorizationV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_networking_v1_api = NetworkingV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
+        self.client_storage_v1_api = StorageV1ApiWithArguments(dry_run=dry_run, pretty=pretty)
 
-        self.dry_run: bool = dry_run
-        self.pretty: bool = pretty
+        self.dry_run = dry_run
+        self.pretty = pretty
 
 
 def _get_namespace_from_kube() -> str:
@@ -84,6 +86,8 @@ class NamespacedKubernetesHelper(KubernetesHelper):
     A simple helper for Kubernetes manipulation.
     """
 
+    namespace: str
+
     def __init__(
         self,
         use_kubeconfig: Optional[bool] = False,
@@ -254,6 +258,8 @@ class KubernetesDeploymentManager(NamespacedKubernetesHelper):
     a.start_pods()
     """
 
+    release_name: str
+
     def __init__(self, release_name: str, **kwargs: Any):
         self.release_name = release_name
         super().__init__(**kwargs)