Skip to content

Commit e054965

Browse files
Merge pull request #11 from mozilla/init_jbi-yaml
Trying config as yaml; withyamllint
2 parents c1c090b + e3c149e commit e054965

File tree

11 files changed

+138
-76
lines changed

11 files changed

+138
-76
lines changed

.yamllint

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
extends: default
4+
5+
rules:
6+
key-duplicates: enable
7+
key-ordering: enable
8+
9+
yaml-files:
10+
- 'config.yaml'
11+
- '.yamllint'

config.yaml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
---
2+
3+
# Action Config
4+
actions:
5+
addons:
6+
action: src.jbi.whiteboard_actions.default
7+
contact: tbd
8+
description: Addons whiteboard tag for AMO Team
9+
enabled: true
10+
parameters:
11+
jira_project_key: WEBEXT
12+
whiteboard_tag: addons
13+
fidedi:
14+
action: src.jbi.whiteboard_actions.default
15+
contact: tbd
16+
description: Firefox Desktop Integration whiteboard tag
17+
enabled: true
18+
parameters:
19+
jira_project_key: FIDEDI
20+
whiteboard_tag: fidedi
21+
fidefe:
22+
action: src.jbi.whiteboard_actions.default
23+
contact: tbd
24+
description: Firefox Front End whiteboard tag
25+
enabled: true
26+
parameters:
27+
jira_project_key: FIDEFE
28+
whiteboard_tag: fidefe
29+
fxatps:
30+
action: src.jbi.whiteboard_actions.default
31+
contact: tbd
32+
description: Privacy & Security and Anti-Tracking Team whiteboard tag
33+
enabled: true
34+
parameters:
35+
jira_project_key: FXATPS
36+
whiteboard_tag: fxatps
37+
fxsync:
38+
action: src.jbi.whiteboard_actions.default
39+
contact: tbd
40+
description: Firefox Sync Team whiteboard tag
41+
enabled: true
42+
parameters:
43+
jira_project_key: SYNC
44+
whiteboard_tag: fxsync
45+
gv:
46+
action: src.jbi.whiteboard_actions.default
47+
contact: tbd
48+
description: GeckoView Team whiteboard tag
49+
enabled: true
50+
parameters:
51+
jira_project_key: ANDP
52+
whiteboard_tag: gv
53+
mr2qa:
54+
action: src.jbi.whiteboard_actions.default
55+
contact: tbd
56+
description: MR2 whiteboard tag
57+
enabled: true
58+
parameters:
59+
jira_project_key: MR2
60+
whiteboard_tag: mr2qa
61+
mv3:
62+
action: src.jbi.whiteboard_actions.default
63+
contact: tbd
64+
description: MV3 whiteboard tag
65+
enabled: true
66+
parameters:
67+
jira_project_key: WEBEXT
68+
whiteboard_tag: mv3
69+
nimbus:
70+
action: src.jbi.whiteboard_actions.default
71+
contact: tbd
72+
description: Nimbus Team whiteboard tag
73+
enabled: true
74+
parameters:
75+
jira_project_key: MR2
76+
whiteboard_tag: mr2qa
77+
prodtest:
78+
action: src.jbi.whiteboard_actions.default
79+
contact: tbd
80+
description: ProdTest tag
81+
enabled: false
82+
parameters:
83+
jira_project_key: OSS
84+
whiteboard_tag: prodtest
85+
proton:
86+
action: src.jbi.whiteboard_actions.default
87+
contact: tbd
88+
description: Proton whiteboard tag for Firefox Frontend
89+
enabled: true
90+
parameters:
91+
jira_project_key: FIDEFE
92+
whiteboard_tag: proton
93+
relops:
94+
action: src.jbi.whiteboard_actions.default
95+
contact: tbd
96+
description: Release Operations Team Tag
97+
enabled: true
98+
parameters:
99+
jira_project_key: RELOPS
100+
whiteboard_tag: relops

config/whiteboard_tags/README.md

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

config/whiteboard_tags/TEMPLATE

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

config/whiteboard_tags/example.json

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

config/whiteboard_tags/proton.json

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

infra/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,16 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
8080
CMD uvicorn src.app.api:app --reload --host=0.0.0.0 --port=$PORT
8181

8282

83-
# 'lint' stage runs similar checks to pre-commit / scripts/lint.sh
83+
# 'lint' stage runs similar checks to pre-commit
8484
# running in check mode means build will fail if any linting errors occur
8585
FROM development AS lint
8686
RUN bandit -lll --recursive src --exclude "src/poetry.lock,src/.venv,src/.mypy,src/build"
8787
RUN mypy src
8888
RUN black --config ./pyproject.toml --check src tests
8989
RUN isort --recursive --settings-path ./pyproject.toml --check-only src
9090
RUN pylint src tests/unit
91-
CMD ./infra/lint.sh
91+
RUN yamllint .
92+
CMD ./infra/detect_secrets_helper.sh
9293

9394

9495
# 'test' stage runs our unit tests with pytest and
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
#!/bin/sh
22

3-
set -e
3+
set -ex
44

55
CURRENT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
66
BASE_DIR="$(dirname "$CURRENT_DIR")"
77
HAS_GIT="$(command -v git || echo '')"
8-
echo $HAS_GIT
9-
10-
bandit -lll --recursive "${BASE_DIR}" --exclude "${BASE_DIR}/poetry.lock,${BASE_DIR}/.venv,${BASE_DIR}/.mypy,${BASE_DIR}/build"
118

129
if [ -n "$HAS_GIT" ]; then
1310
# Scan only files checked into the repo, omit poetry.lock
1411
SECRETS_TO_SCAN=`git ls-tree --full-tree -r --name-only HEAD | grep -v poetry.lock`
1512
detect-secrets-hook $SECRETS_TO_SCAN --baseline .secrets.baseline
1613
fi
17-
18-
mypy "${BASE_DIR}"
19-
black --config "${BASE_DIR}/pyproject.toml" "${BASE_DIR}"
20-
isort --recursive --settings-path "${BASE_DIR}/pyproject.toml" "${BASE_DIR}"
21-
pylint src tests/unit

poetry.lock

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ prometheus-client = "^0.13.1"
1515
python-bugzilla = "^3.2.0"
1616
atlassian-python-api = "^3.20.1"
1717
dockerflow = "2022.1.0"
18+
yamllint = "^1.26.3"
1819

1920
[tool.poetry.dev-dependencies]
2021
pre-commit = "^2.17.0"

0 commit comments

Comments
 (0)