Merge branch 'main' into pagerduty-create-at

integrations/azure-devops/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+# Port_Ocean 0.1.44 (2024-07-25)
+
+### Bug Fixes
+
+- Fixed case where comparing events failed because ADO returns unexpected additional keys inside the PublisherInputs.
+
+
 # Port_Ocean 0.1.43 (2024-07-24)
 
 ### Improvements

integrations/azure-devops/azure_devops/webhooks/webhook_event.py

@@ -25,9 +25,17 @@ def get_event_by_subscription(
                 subscribed_event.publisherId == self.publisherId
                 and subscribed_event.eventType == self.eventType
                 and subscribed_event.consumerInputs == self.consumerInputs
-                and subscribed_event.publisherInputs == self.publisherInputs
             ):
-                return subscribed_event
+                if not self.publisherInputs and not subscribed_event.publisherInputs:
+                    return subscribed_event
+
+                # Azure Devops sends more than just the projectId in the publisherInputs,
+                # And we only need to verify the projectId
+                if self.publisherInputs and subscribed_event.publisherInputs:
+                    if subscribed_event.publisherInputs.get(
+                        "projectId", None
+                    ) == self.publisherInputs.get("projectId", None):
+                        return subscribed_event
 
         return None
 

integrations/azure-devops/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "azure-devops"
-version = "0.1.43"
+version = "0.1.44"
 description = "An Azure Devops Ocean integration"
 authors = ["Matan Geva <[email protected]>"]