kubernetes-watch 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

kube_watch/modules/providers/aws.py

@@ -1,10 +1,10 @@
 #========================================================================
 # This class is deprecated. Please refer to aws.py
 #========================================================================
-import boto3
-import base64
 import json
+import base64
 from datetime            import datetime   , timezone, timedelta
+import boto3
 from botocore.exceptions import ClientError
 from prefect             import get_run_logger
 from kube_watch.enums.providers import AwsResources

kube_watch/modules/providers/vault.py

@@ -31,7 +31,7 @@ def login(url, app_role_id, secret_id, path):
                 logger.info("Authenticated with existing token.")
                 return vault_client
         except hvac.exceptions.InvalidRequest as e:
-            logger.warning("Failed to authenticate with the existing token:", str(e))
+            logger.warning(f"Failed to authenticate with the existing token: {str(e)}")
 
     # If token is not valid or not present, authenticate with AppRole
     try:
@@ -47,7 +47,7 @@ def login(url, app_role_id, secret_id, path):
 
         return vault_client
     except hvac.exceptions.InvalidRequest as e:
-        logger.error("Authentication failed with provided secret_id:", str(e))
+        logger.error(f"Authentication failed with provided secret_id: {str(e)}")
         raise RuntimeError("Authentication failed: unable to log in with the provided credentials.") from e
 
 
@@ -105,9 +105,62 @@ def generate_provider_creds(vault_client, provider, backend_path, role_name):
 
 
 def generate_new_secret_id(vault_client, role_name, vault_path, env_var_name):
+    """
+    Generates new secret_id. Note an admin role is required for this.
+    """
     new_secret_response = vault_client.auth.approle.generate_secret_id(
         role_name=role_name,
         mount_point=f'approle/{vault_path}'
     )
 
-    return { env_var_name : new_secret_response['data']['secret_id'] }
+    return { env_var_name : new_secret_response['data']['secret_id'] }
+
+
+
+def delete_secret_id(vault_client, role_name, secret_id, vault_path):
+    """
+    Delete (revoke) a secret ID associated with a role in Vault.
+    
+    Parameters:
+        vault_client (hvac.Client): An authenticated Vault client.
+        role_name (str): The name of the role the secret ID is associated with.
+        secret_id (str): The secret ID to be deleted.
+        vault_path (str): The path where the AppRole is enabled.
+    """
+    try:
+        vault_client.auth.approle.destroy_secret_id(
+            mount_point=f"approle/{vault_path}",
+            role_name=role_name,
+            secret_id=secret_id
+        )
+        
+        logger.info("Secret ID successfully revoked.")
+    except hvac.exceptions.InvalidRequest as e:
+        logger.error("Failed to revoke the secret ID: %s", str(e))
+        raise RuntimeError("Failed to delete the secret ID.") from e
+    
+
+def clean_secret_ids(vault_client, role_name, secret_id_env, vault_path, has_kube_secret_updated):
+    """
+    This function removes all idle secret-ids from `role_name`, except the 
+    inputted `secret_id_env`.
+
+    Note: secret_id_env is a dictionary. The key, VAULT_SECRET_ID, has the secret_id value.
+    """
+    secret_id = secret_id_env.get("VAULT_SECRET_ID")
+    if has_kube_secret_updated:
+        secret_ids_path = f'auth/approle/{vault_path}/role/{role_name}/secret-id'
+        try:
+            response = vault_client.list(secret_ids_path)
+            if 'data' in response:
+                secret_ids = response['data']['keys']
+                for idx in secret_ids:
+                    if idx != secret_id:
+                        delete_secret_id(vault_client, role_name, secret_id, vault_path)
+                        logger.info(f"Revoking idle secret id for role: {role_name}")
+            else:
+                logger.info("No secrets found at this path.")
+        except hvac.exceptions.Forbidden:
+            logger.error("Access denied. Ensure your token has the correct policies to read this path.")
+        except Exception as e:
+            logger.error(f"An error occurred: {e}")

kube_watch/watch/helpers.py

@@ -39,9 +39,9 @@ def func_task(name="default_task_name", task_input_type: TaskInputsType = TaskIn
         return execute_task
     if task_input_type == TaskInputsType.DICT:
         @task(name=name)
-        def execute_task(func, dict_inp):
+        def execute_task_dict(func, dict_inp):
             return func(dict_inp)
-        return execute_task
+        return execute_task_dict
     raise ValueError(f'Unknow Task Input Type. It should either be {TaskInputsType.ARG} or {TaskInputsType.DICT} but {task_input_type} is provided.')
 
 
@@ -79,10 +79,10 @@ def get_task_function(module_name, task_name, plugin_path=None):
         raise ImportError(f"Unable to import module '{module_name}': {e}")
     except AttributeError as e:
         raise AttributeError(f"The module '{module_name}' does not have a function named '{task_name}': {e}")
-    finally:
-        if plugin_path:
-            # Remove the plugin path from sys.path after importing
-            sys.path.pop(0)  # Using pop(0) is safer in the context of insert(0, plugin_path)
+    # finally:
+    #     if plugin_path:
+    #         # Remove the plugin path from sys.path after importing
+    #         sys.path.pop(0)  # Using pop(0) is safer in the context of insert(0, plugin_path)
 
 
 
@@ -141,4 +141,31 @@ def resolve_runner(runner):
     if runner == TaskRunners.RAY:
         raise ValueError("Ray Not Implemented")
         # return RayTaskRunner
-    raise ValueError("Invalid task runner type")
+    raise ValueError("Invalid task runner type")
+
+
+def filter_attributes(obj):
+    import uuid
+    from collections.abc import Iterable
+    import inspect
+
+    def is_simple(value):
+        """ Check if the value is a simple data type or a collection of simple data types """
+        if isinstance(value, (int, float, str, bool, type(None), uuid.UUID)):
+            return True
+        if isinstance(value, dict):
+            return all(is_simple(k) and is_simple(v) for k, v in value.items())
+        if isinstance(value, Iterable) and not isinstance(value, (str, bytes)):
+            return all(is_simple(item) for item in value)
+        return False
+
+    result = {}
+    for attr in dir(obj):
+        # Avoid magic methods and attributes
+        if attr.startswith("__") and attr.endswith("__"):
+            continue
+        value = getattr(obj, attr)
+        # Filter out methods and check if the attribute value is simple
+        if not callable(value) and not inspect.isclass(value) and is_simple(value):
+            result[attr] = value
+    return result

{kubernetes_watch-0.1.3.dist-info → kubernetes_watch-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernetes-watch
-Version: 0.1.3
+Version: 0.1.4
 Summary: 
 Author: bmotevalli
 Author-email: b.motevalli@gmail.com

{kubernetes_watch-0.1.3.dist-info → kubernetes_watch-0.1.4.dist-info}/RECORD

@@ -19,15 +19,15 @@ kube_watch/modules/logic/trasnform.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 kube_watch/modules/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kube_watch/modules/mock/mock_generator.py,sha256=j8UfcJeA9giEEyqH9Sf3RGtlMfGO13NbWMZ80dj4UtE,1315
 kube_watch/modules/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kube_watch/modules/providers/aws.py,sha256=1iyekXCeSu0owoS46VXFPp7iRy9U5bUMgrTD8BldpPM,8585
+kube_watch/modules/providers/aws.py,sha256=yvxVwL7seuvxpGR2ZCrmWEMKh9hesWdPTC6LvW7Bi9E,8585
 kube_watch/modules/providers/git.py,sha256=h3rcn1FhU82nF52Ol9YHyFk4cvPxxaz_AxHnip8OXPY,1183
 kube_watch/modules/providers/github.py,sha256=WCpZIKHr4U0a4El1leXkaCv1jznf9ob5xHVeTNSpNG0,5338
-kube_watch/modules/providers/vault.py,sha256=eGQbjrVLlHzOPW8SqRWn6S6j8WsQBvvG7jOhzJKEh1o,3983
+kube_watch/modules/providers/vault.py,sha256=kw-S4orCIrVgDKzctzYeICIVD3-A9cT_CyyFAwi4oPM,6215
 kube_watch/standalone/metarecogen/ckan_to_gn.py,sha256=FBiv6McWh4hqV6Bz08zGLzEIe4v1-D3FawjBKYbV7Ms,4767
 kube_watch/watch/__init__.py,sha256=6Ay9P_Ws7rP7ZaIrFRZtp_1uwVK4ZDmkkNhFyqPNQIU,61
-kube_watch/watch/helpers.py,sha256=JRXGIoDKcsBnGirlr8Et0Qaz8aPsKz4WsmFFwcEmml8,5373
+kube_watch/watch/helpers.py,sha256=T0xDSCfrW7NrmQzgIzOiojQzu_HesajMb7S_AX-tt98,6431
 kube_watch/watch/workflow.py,sha256=h0b_P_kfiPxqTFHZ6o2HkDkNaUBOwv1DKJnwEMMVXaI,4203
-kubernetes_watch-0.1.3.dist-info/LICENSE,sha256=StyinJRmy--Pc2vQbRToZSN4sjSVg3zccMFrktVcrEw,1096
-kubernetes_watch-0.1.3.dist-info/METADATA,sha256=VqRB-sKEaMUf-hh4kuADHA9Eau8o9NnKloEGDCy5XNM,4969
-kubernetes_watch-0.1.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kubernetes_watch-0.1.3.dist-info/RECORD,,
+kubernetes_watch-0.1.4.dist-info/LICENSE,sha256=StyinJRmy--Pc2vQbRToZSN4sjSVg3zccMFrktVcrEw,1096
+kubernetes_watch-0.1.4.dist-info/METADATA,sha256=n9GU5CEsh33BEGgYDApxctg_Rl0Oav6RfeYwVMM-fzs,4969
+kubernetes_watch-0.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kubernetes_watch-0.1.4.dist-info/RECORD,,