changes checking modified events with last-modified annotations

.gitignore

@@ -8,3 +8,4 @@ test-bin/
 .env
 *.swp
 .ansible
+.pytest_cache/

CHANGELOG.rst

@@ -4,6 +4,15 @@ Junipernetworks EDA source Collection Release Notes
 
 .. contents:: Topics
 
+v1.4.5
+=======
+
+Minor Changes
+-------------
+
+- Edge case fix when last-applied-configuration is not present in the event and the event is a MODIFIED event.
+
+
 v1.4.4
 =======
 

Pipfile

@@ -5,8 +5,8 @@ name = "pypi"
 # Packages in this list should ~=, used to generate requirements.txt
 
 [packages]
-kubernetes-asyncio = "*"
-kubernetes = "*"
+kubernetes-asyncio = "31.1.1"
+kubernetes = "31.0.0"
 
 [dev-packages]
 pytest-asyncio = "*"

docs/juniper.eda.k8s_source_plugin.rst

@@ -452,6 +452,7 @@ Notes
 
 .. note::
    - To avoid SSL certificate validation errors when ``validate_certs`` is *True*, the full certificate chain for the API server must be provided via ``ca_cert`` or in the kubeconfig file.
+   - changed_fields will works only for MODIFIED events which has annotations kubectl.kubernetes.io/last-applied-configuration.
 
 
 

galaxy.yml

@@ -4,7 +4,7 @@ namespace: juniper
 
 name: eda
 
-version: 1.4.4
+version: 1.4.5
 
 readme: README.md
 

plugins/event_source/k8s.py

@@ -604,9 +604,20 @@ def get_nested_value(d, keys):
                                         "{}",
                                     )
                                 )
-                                last_applied_configuration = json.loads(
-                                    last_applied_configuration_str
-                                )
+                                # Check if the fields in changed_fields is present and If present, check if last-applied-configuration is present
+                                # parse it as JSON
+                                # If not present, skip the event
+                                if last_applied_configuration_str:
+                                    last_applied_configuration = json.loads(
+                                        last_applied_configuration_str
+                                    )
+                                else:
+                                    self.logger.debug(
+                                        "No last-applied-configuration found, skipping event",
+                                        object_name,
+                                        self.changed_fields,
+                                    )
+                                    continue
                                 if any(
                                     get_nested_value(
                                         last_applied_configuration, field.split(".")
@@ -622,6 +633,7 @@ def get_nested_value(d, keys):
                                 else:
                                     self.logger.debug(
                                         "No change detected in fields %s, skipping event",
+                                        object_name,
                                         self.changed_fields,
                                     )
                                     continue
@@ -633,6 +645,7 @@ def get_nested_value(d, keys):
                                 self.logger.debug(
                                     "Ignoring MODIFIED event for deleted object %s",
                                     object_name,
+                                    self.changed_fields,
                                 )
                                 continue
 

plugins/event_source/test_k8s.py

@@ -14,7 +14,7 @@
 
 # Timeout constants
 INIT_DONE_TIMEOUT = 10
-POD_CREATION_TIMEOUT = 60
+POD_CREATION_TIMEOUT = 90
 NAMESPACE_CREATION_TIMEOUT = 10
 HEARTBEAT_INTERVAL = 3
 
@@ -387,13 +387,58 @@ async def wait_for_event(
                 },
             ],
         },
+        {
+            "args": {
+                "kind": "ConfigMap",
+                "changed_fields": ["data", "metadata.annotations.foo"],
+                "kubeconfig": KUBECONFIG,
+                "test_events_qty": 2,
+                "heartbeat_interval": HEARTBEAT_INTERVAL,
+            },
+            "created_watch_count": 1,
+            "modified_watch_count": 1,
+            "deleted_watch_count": 0,
+            "k8sclient_objects": [
+                {
+                    "method": "create_namespaced_config_map",
+                    "body": {
+                        "apiVersion": "v1",
+                        "kind": "ConfigMap",
+                        "metadata": {
+                            "name": "no-last-applied-config",
+                            "namespace": "pytest",
+                            "description": "CONFIG MAP WITHOUT LAST APPLIED CONFIG",
+                        },
+                        "data": {
+                            "key": "value",
+                        },
+                    },
+                },
+                {
+                    "method": "patch_namespaced_config_map",
+                    "body": {
+                        "apiVersion": "v1",
+                        "kind": "ConfigMap",
+                        "metadata": {
+                            "name": "no-last-applied-config",
+                            "namespace": "pytest",
+                            "description": "UPDATED CONFIG MAP WITHOUT LAST APPLIED CONFIG",
+                        },
+                        "data": {
+                            "key": "new-value",
+                        },
+                    },
+                },
+            ],
+        },
     ],
     ids=[
         "create_namespace_kind",
         "create_namespace_configmap_kinds",
         "modify_configmap_changed_fields",
         "modify_deleted_pod",
         "ignore_modify_deleted_pod",
+        "modify_configmap_no_last_applied_config",
     ],
 )
 async def test_batch(k8s_client, test_case):

requirements.txt

@@ -1,3 +1,3 @@
 -i https://pypi.org/simple
 kubernetes==31.0.0; python_version >= '3.6'
-kubernetes-asyncio==32.0.0
+kubernetes-asyncio==31.1.1