Compare commits

..

9 Commits

Author SHA1 Message Date
9f55f3b207 chore(ci): switch python_version to python-version 2024-11-28 21:50:40 +00:00
f5b13c7d14 chore(ci): use Python 3.13 in CI 2024-11-28 21:50:40 +00:00
d753053e87 chore(docker)(deps): bump python from 3.11-slim to 3.13-slim
Bumps python from 3.11-slim to 3.13-slim.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-28 21:22:31 +00:00
33186a47c7 chore(actions)(deps): bump actions/checkout from 4.1.7 to 4.2.2
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-28 21:16:26 +00:00
948d223fa4 fix(tests): config.approved_domains returns empty list when not set 2024-11-28 21:14:31 +00:00
70a92c76db chore(ci): run tests on release workflow 2024-11-24 11:02:31 +00:00
b11cc26daa fix(config): always return a list, even if empty, as required by webex_bot 2024-11-24 10:41:08 +00:00
6cac9dc9c2 fix(docker): disable auto-creation of virtualenv inside container 2024-11-24 10:31:49 +00:00
ebca87230a fix(docker): fix dependency installation 2024-11-24 10:24:44 +00:00
5 changed files with 21 additions and 13 deletions

View File

@ -13,6 +13,8 @@ on:
jobs:
ci:
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 }}

View File

@ -5,6 +5,14 @@ on:
- cron: "0 9 * * 0"
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:
name: Create Release
uses: luketainton/gha-workflows/.github/workflows/create-release.yml@main

View File

@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.13-slim
LABEL maintainer="Luke Tainton <luke@tainton.uk>"
LABEL org.opencontainers.image.source="https://github.com/luketainton/roboluke-tasks"
USER root
@ -12,7 +12,9 @@ RUN mkdir -p /.local && \
COPY pyproject.toml /run/pyproject.toml
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"]

View File

@ -47,31 +47,27 @@ class Config:
return os.environ["N8N_WEBHOOK_URL"]
@property
def approved_users(self) -> list | None:
def approved_users(self) -> list:
"""Returns a list of approved users."""
_emails: list[str] = os.environ.get("APPROVED_USERS", "").split(",")
_emails: list[str] = [i.strip() for i in _emails if i]
if not _emails:
return None
return []
emails = [i for i in _emails if validate_email_syntax(i)]
return emails
@property
def approved_rooms(self) -> list | None:
def approved_rooms(self) -> list:
"""Returns a list of approved rooms."""
_rooms: list[str] = os.environ.get("APPROVED_ROOMS", "").split(",")
rooms: list[str] = [i.strip() for i in _rooms if i]
if not rooms:
return None
return rooms
@property
def approved_domains(self) -> list | None:
def approved_domains(self) -> list:
"""Returns a list of approved domains."""
_domains: list[str] = os.environ.get("APPROVED_DOMAINS", "").split(",")
domains: list[str] = [i.strip() for i in _domains if i]
if not domains:
return None
return domains

View File

@ -25,9 +25,9 @@ def test_config_no_admin_vars() -> None:
# needs to be imported AFTER environment variables are set
from app.utils.config import config # pragma: no cover
assert config.approved_domains is None
assert config.approved_rooms is None
assert config.approved_users is None
assert config.approved_domains == []
assert config.approved_rooms == []
assert config.approved_users == []
assert config.admin_emails == config_vars["ADMIN_EMAIL"].split(",")
assert config.admin_first_name == config_vars["ADMIN_FIRST_NAME"]
assert config.bot_name == config_vars["BOT_NAME"]