Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
9f55f3b207 | |||
f5b13c7d14 | |||
d753053e87 | |||
33186a47c7 | |||
948d223fa4 | |||
70a92c76db | |||
b11cc26daa | |||
6cac9dc9c2 | |||
ebca87230a |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -13,6 +13,8 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
ci:
|
ci:
|
||||||
uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main
|
uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main
|
||||||
|
with:
|
||||||
|
python-version: 3.13
|
||||||
secrets:
|
secrets:
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||||
|
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@ -5,6 +5,14 @@ on:
|
|||||||
- cron: "0 9 * * 0"
|
- cron: "0 9 * * 0"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
test:
|
||||||
|
uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main
|
||||||
|
with:
|
||||||
|
python-version: 3.13
|
||||||
|
secrets:
|
||||||
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||||
|
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||||
|
|
||||||
create_release:
|
create_release:
|
||||||
name: Create Release
|
name: Create Release
|
||||||
uses: luketainton/gha-workflows/.github/workflows/create-release.yml@main
|
uses: luketainton/gha-workflows/.github/workflows/create-release.yml@main
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM python:3.11-slim
|
FROM python:3.13-slim
|
||||||
LABEL maintainer="Luke Tainton <luke@tainton.uk>"
|
LABEL maintainer="Luke Tainton <luke@tainton.uk>"
|
||||||
LABEL org.opencontainers.image.source="https://github.com/luketainton/roboluke-tasks"
|
LABEL org.opencontainers.image.source="https://github.com/luketainton/roboluke-tasks"
|
||||||
USER root
|
USER root
|
||||||
@ -12,7 +12,9 @@ RUN mkdir -p /.local && \
|
|||||||
|
|
||||||
COPY pyproject.toml /run/pyproject.toml
|
COPY pyproject.toml /run/pyproject.toml
|
||||||
COPY poetry.lock /run/poetry.lock
|
COPY poetry.lock /run/poetry.lock
|
||||||
RUN poetry install --without dev --no-root
|
|
||||||
|
RUN poetry config virtualenvs.create false && \
|
||||||
|
poetry install --without dev
|
||||||
|
|
||||||
ENTRYPOINT ["python3", "-B", "-m", "app.main"]
|
ENTRYPOINT ["python3", "-B", "-m", "app.main"]
|
||||||
|
|
||||||
|
@ -47,31 +47,27 @@ class Config:
|
|||||||
return os.environ["N8N_WEBHOOK_URL"]
|
return os.environ["N8N_WEBHOOK_URL"]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def approved_users(self) -> list | None:
|
def approved_users(self) -> list:
|
||||||
"""Returns a list of approved users."""
|
"""Returns a list of approved users."""
|
||||||
_emails: list[str] = os.environ.get("APPROVED_USERS", "").split(",")
|
_emails: list[str] = os.environ.get("APPROVED_USERS", "").split(",")
|
||||||
_emails: list[str] = [i.strip() for i in _emails if i]
|
_emails: list[str] = [i.strip() for i in _emails if i]
|
||||||
if not _emails:
|
if not _emails:
|
||||||
return None
|
return []
|
||||||
emails = [i for i in _emails if validate_email_syntax(i)]
|
emails = [i for i in _emails if validate_email_syntax(i)]
|
||||||
return emails
|
return emails
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def approved_rooms(self) -> list | None:
|
def approved_rooms(self) -> list:
|
||||||
"""Returns a list of approved rooms."""
|
"""Returns a list of approved rooms."""
|
||||||
_rooms: list[str] = os.environ.get("APPROVED_ROOMS", "").split(",")
|
_rooms: list[str] = os.environ.get("APPROVED_ROOMS", "").split(",")
|
||||||
rooms: list[str] = [i.strip() for i in _rooms if i]
|
rooms: list[str] = [i.strip() for i in _rooms if i]
|
||||||
if not rooms:
|
|
||||||
return None
|
|
||||||
return rooms
|
return rooms
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def approved_domains(self) -> list | None:
|
def approved_domains(self) -> list:
|
||||||
"""Returns a list of approved domains."""
|
"""Returns a list of approved domains."""
|
||||||
_domains: list[str] = os.environ.get("APPROVED_DOMAINS", "").split(",")
|
_domains: list[str] = os.environ.get("APPROVED_DOMAINS", "").split(",")
|
||||||
domains: list[str] = [i.strip() for i in _domains if i]
|
domains: list[str] = [i.strip() for i in _domains if i]
|
||||||
if not domains:
|
|
||||||
return None
|
|
||||||
return domains
|
return domains
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,9 +25,9 @@ def test_config_no_admin_vars() -> None:
|
|||||||
# needs to be imported AFTER environment variables are set
|
# needs to be imported AFTER environment variables are set
|
||||||
from app.utils.config import config # pragma: no cover
|
from app.utils.config import config # pragma: no cover
|
||||||
|
|
||||||
assert config.approved_domains is None
|
assert config.approved_domains == []
|
||||||
assert config.approved_rooms is None
|
assert config.approved_rooms == []
|
||||||
assert config.approved_users is None
|
assert config.approved_users == []
|
||||||
assert config.admin_emails == config_vars["ADMIN_EMAIL"].split(",")
|
assert config.admin_emails == config_vars["ADMIN_EMAIL"].split(",")
|
||||||
assert config.admin_first_name == config_vars["ADMIN_FIRST_NAME"]
|
assert config.admin_first_name == config_vars["ADMIN_FIRST_NAME"]
|
||||||
assert config.bot_name == config_vars["BOT_NAME"]
|
assert config.bot_name == config_vars["BOT_NAME"]
|
||||||
|
Reference in New Issue
Block a user