Skip to content

Commit c1c090b

Browse files
author
Bryan Sieber
committed
Updates from review
1 parent 2b8bf69 commit c1c090b

File tree

20 files changed

+168
-338
lines changed

20 files changed

+168
-338
lines changed
File renamed without changes.
File renamed without changes.

src/jbi/whiteboard_tags/example.json renamed to config/whiteboard_tags/example.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"enabled": false,
3-
"action": "example_action",
2+
"enabled": true,
3+
"action": "src.jbi.whiteboard_actions.example",
44
"whiteboard_tag": "example",
55
"jira_project_key": "EXMPL",
66
"example_field": {

docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ services:
1414
# Let the init system handle signals for us.
1515
# among other things this helps shutdown be fast
1616
init: true
17+
env_file:
18+
- infra/config/local_dev.env

src/app/environment.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ class Settings(BaseSettings):
1010
port: str = "80"
1111
app_reload: bool = True
1212

13-
# JBI env vars
14-
jbi_action_key: str = "jbi"
15-
jbi_folder_path: str = "src/jbi/whiteboard_tags/"
13+
# Jira
1614
jira_base_url: str = "https://jira.allizom.org/"
17-
bugzilla_base_url: str = "https://bugzilla-dev.allizom.org/"
18-
19-
# Secrets below
2015
jira_username: str
2116
jira_password: str
17+
18+
# Bugzilla
19+
bugzilla_base_url: str = "https://bugzilla-dev.allizom.org/"
2220
bugzilla_api_key: str
2321

2422
# Logging

src/app/monitor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
def heartbeat(request: Request, settings: environment.Settings):
1313
"""Return status of backing services, as required by Dockerflow."""
14-
data: Dict = {}
15-
data.update(jbi_service_health_map())
14+
data: Dict = {**jbi_service_health_map()}
1615
status_code = 200
1716
for _, health in data.items():
1817
if not health.get("up"):

src/core/__init__.py

Whitespace-only changes.

src/core/actions.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/core/configurator.py

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)