Merge pull request #35 from mozilla/minor-fixes

Minor fixes based on initial testing

Author: bsieber-mozilla

.gitignore

@@ -130,3 +130,6 @@ dmypy.json
 
 # iSort - Pre-Commit
 .isort.cfg
+
+# Don't check in your own Env
+*local_dev.env

src/app/environment.py

@@ -18,7 +18,7 @@ class Settings(BaseSettings):
 
     # Jira
     jira_base_url: str = "https://mozit-test.atlassian.net/"
-    jira_issue_url: str = f"{jira_base_url}/browse/%s"
+    jira_issue_url: str = f"{jira_base_url}browse/%s"
     jira_username: str
     jira_password: str
 

src/jbi/router.py

@@ -46,13 +46,14 @@ def execute_action(request: BugzillaWebhookRequest, action_map, settings):
         if is_private_bug:
             raise IgnoreInvalidRequestError("private bugs are not valid")
 
-        request.bug = getbug_as_bugzilla_object(request=request)
-        current_action = extract_current_action(request.bug, action_map)  # type: ignore
+        bug_obj = getbug_as_bugzilla_object(request=request)
+        current_action = extract_current_action(bug_obj, action_map)  # type: ignore
         if not current_action:
             raise IgnoreInvalidRequestError(
                 "whiteboard tag not found in configured actions"
             )
 
+        jbi_logger.info("\nrequest: %s, \naction: %s", request.json(), current_action)
         action_module: ModuleType = importlib.import_module(current_action["action"])
         callable_action = action_module.init(  # type: ignore
             **current_action["parameters"]

src/jbi/whiteboard_actions/default.py

@@ -60,7 +60,7 @@ def bug_create_or_update(
         self, payload: BugzillaWebhookRequest
     ):  # pylint: disable=too-many-locals
         """Create and link jira issue with bug, or update; rollback if multiple events fire"""
-        linked_issue_key = payload.bug.extract_from_see_also()  # type: ignore
+        linked_issue_key = getbug_as_bugzilla_object(payload).extract_from_see_also()  # type: ignore
         if linked_issue_key:
             # update
             fields, comments = payload.map_as_tuple_of_field_dict_and_comments()
@@ -84,7 +84,14 @@ def bug_create_or_update(
 
     def create_and_link_issue(self, payload):
         """create jira issue and establish link between bug and issue; rollback/delete if required"""
-        fields = {**payload.bug.map_as_jira_issue(), "key": self.jira_project_key}  # type: ignore
+        comment_list = self.bugzilla_client.get_comments(idlist=[payload.bug.id])
+        fields = {
+            **payload.bug.map_as_jira_issue(),  # type: ignore
+            "description": comment_list["bugs"][str(payload.bug.id)]["comments"][0][
+                "text"
+            ],
+            "project": {"key": self.jira_project_key},
+        }
 
         jira_response_create = self.jira_client.create_issue(fields=fields)
 
@@ -114,11 +121,11 @@ def create_and_link_issue(self, payload):
             )
             return {"status": "duplicate", "jira_response": jira_response_delete}
         # else:
-        jira_url = self.settings.jira_issue_url.format(jira_key_in_response)
+        jira_url = self.settings.jira_issue_url % jira_key_in_response
         update = self.bugzilla_client.build_update(see_also_add=jira_url)
         bugzilla_response = self.bugzilla_client.update_bugs([bug_obj.id], update)
 
-        bugzilla_url = self.settings.bugzilla_bug_url.format(bug_obj.id)
+        bugzilla_url = self.settings.bugzilla_bug_url % bug_obj.id
         jira_response = self.jira_client.create_or_update_issue_remote_links(
             issue_key=jira_key_in_response,
             link_url=bugzilla_url,