t-bug-catcher 0.6.9__tar.gz → 0.6.11__tar.gz

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t_bug_catcher
-Version: 0.6.9
+Version: 0.6.11
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.9
+current_version = 0.6.11
 commit = True
 tag = False
 

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/setup.py

@@ -26,7 +26,7 @@ setup(
     packages=find_packages(include=["t_bug_catcher", "t_bug_catcher.*"]),
     test_suite="tests",
     url="https://www.thoughtful.ai/",
-    version="0.6.9",
+    version="0.6.11",
     zip_safe=False,
     install_requires=install_requirements,
     include_package_data=True,

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/t_bug_catcher/__init__.py

@@ -3,7 +3,7 @@
 __author__ = """Thoughtful"""
 __email__ = "support@thoughtful.ai"
 # fmt: off
-__version__ = '0.6.9'
+__version__ = '0.6.11'
 # fmt: on
 
 from .bug_catcher import (

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/t_bug_catcher/bug_catcher.py

@@ -30,6 +30,7 @@ class Configurator:
         api_token: str,
         project_key: str,
         webhook_url: Optional[str] = None,
+        webhook_secret: Optional[str] = None,
         default_assignee: Optional[str] = None,
     ):
         """Configures the JiraPoster and BugSnag classes.
@@ -39,6 +40,7 @@ class Configurator:
             api_token (str): The API token for the Jira account.
             project_key (str): The key of the Jira project.
             webhook_url (str, optional): The webhook URL for the Jira project. Defaults to None.
+            webhook_secret (str, optional): The webhook secret for the Jira project. Defaults to None.
             default_assignee (str, optional): The default assignee for the Jira project. Defaults to None.
 
         Returns:
@@ -49,6 +51,7 @@ class Configurator:
             api_token=api_token,
             project_key=project_key,
             webhook_url=webhook_url,
+            webhook_secret=webhook_secret,
             default_assignee=default_assignee,
         )
 

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/t_bug_catcher/jira.py

@@ -54,9 +54,11 @@ class Jira:
         self._issue_types = {}
         self._project_key = None
         self._webhook_url = None
+        self._webhook_secret = None
         self._auth = None
         self._default_assignee = None
         self._build_info: Optional[dict] = None
+        self._status_to_transition = ["to do", "open", "backlog"]
 
     @staticmethod
     def _is_json_response(response) -> bool:
@@ -99,6 +101,7 @@ class Jira:
         api_token: str,
         project_key: str,
         webhook_url: Optional[str] = None,
+        webhook_secret: Optional[str] = None,
         default_assignee: Optional[str] = None,
     ) -> bool:
         """Sets the webhook URL for the Jira project.
@@ -108,6 +111,7 @@ class Jira:
             api_token (str): The API token for the Jira account.
             project_key (str): The key of the Jira project.
             webhook_url (str): The webhook URL for the Jira project.
+            webhook_secret (str, optional): The webhook secret for the Jira project. Defaults to None.
             default_assignee (str, optional): The default assignee for the Jira project. Defaults to None.
 
         Returns:
@@ -120,6 +124,7 @@ class Jira:
             if not webhook_url:
                 logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
             self._webhook_url = webhook_url
+            self._webhook_secret = webhook_secret
             self._auth = self._authenticate(login, api_token)
             try:
                 self.get_current_user()
@@ -265,10 +270,13 @@ class Jira:
             None
         """
         payload = json.dumps({"issues": [ticket_id]})
+        headers = {"Content-type": "application/json"}
+        if self._webhook_secret:
+            headers["X-Automation-Webhook-Token"] = self._webhook_secret
         requests.request(
             "POST",
             url=self._webhook_url,
-            headers={"Content-type": "application/json"},
+            headers=headers,
             data=payload,
         )
 
@@ -303,7 +311,7 @@ class Jira:
         Returns:
             dict: The board information
         """
-        if self._transition_types.get("to do"):
+        if any(self._transition_types.get(status) for status in self._status_to_transition):
             return self._transition_types
 
         response = requests.request(
@@ -1138,10 +1146,24 @@ class Jira:
         """
         issue_status = self.check_issue_status(existing_ticket["id"])
         self._transition_types = self.__get_transtion_types(issue_id=existing_ticket["id"])
-        if issue_status.lower() not in ["to do", "open"]:
+        transition_id = next(
+            (
+                self._transition_types.get(status)
+                for status in self._status_to_transition
+                if self._transition_types.get(status)
+            ),
+            None,
+        )
+        if not transition_id:
+            transitions_str = [k for k in self._transition_types.keys()]
+            raise BadRequestError(
+                f"Transition ID not found for statuses: {self._status_to_transition}. "
+                f"Available transitions: {transitions_str}"
+            )
+        if issue_status.lower() not in self._status_to_transition:
             self.issue_transition(
                 ticket_id=existing_ticket["id"],
-                transition_id=self._transition_types.get("to do") or self._transition_types.get("open"),
+                transition_id=transition_id,
             )
             self.update_comment(
                 ticket_id=existing_ticket["id"],

{t_bug_catcher-0.6.9 → t_bug_catcher-0.6.11}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t_bug_catcher
-Version: 0.6.9
+Version: 0.6.11
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful