Merge pull request #50 from mozilla/settings-update

Settings builds vars before extracting env vars. Modifying approach to make see_also and jira_remote_link urls

Author: bsieber-mozilla

src/app/environment.py

@@ -23,13 +23,11 @@ class Settings(BaseSettings):
 
     # Jira
     jira_base_url: str = "https://mozit-test.atlassian.net/"
-    jira_issue_url: str = f"{jira_base_url}browse/%s"
     jira_username: str
     jira_api_key: str
 
     # Bugzilla
     bugzilla_base_url: str = "https://bugzilla-dev.allizom.org"
-    bugzilla_bug_url: str = f"{bugzilla_base_url}/show_bug.cgi?id=%s"
     bugzilla_api_key: str
 
     # Logging

src/jbi/whiteboard_actions/default.py

@@ -121,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 % jira_key_in_response
+        jira_url = f"{self.settings.jira_base_url}browse/{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 % bug_obj.id
+        bugzilla_url = f"{self.settings.bugzilla_base_url}/show_bug.cgi?id={bug_obj.id}"
         jira_response = self.jira_client.create_or_update_issue_remote_links(
             issue_key=jira_key_in_response,
             link_url=bugzilla_url,