Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix webserver twilio env (:warning: DEVOPS) #4566

Merged
merged 4 commits into from
Aug 2, 2023
Merged

🐛 Fix webserver twilio env (:warning: DEVOPS) #4566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31ff25d
Add TWILIO env to webserver
YuryHrytsuk Aug 2, 2023
2977e9c
Merge branch 'master' into fix-webserver-twilio-env
YuryHrytsuk Aug 2, 2023
a613377
Add TWILIO to local env
YuryHrytsuk Aug 2, 2023
3139297
Remove deprecated test
YuryHrytsuk Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env-devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
LOGIN_REGISTRATION_INVITATION_REQUIRED=0
LOGIN_2FA_REQUIRED=0
LOGIN_2FA_CODE_EXPIRATION_SEC=60
TWILIO_ACCOUNT_SID=DUMMY
TWILIO_AUTH_TOKEN=DUMMY
TWILIO_COUNTRY_CODES_W_ALPHANUMERIC_SID_SUPPORT=["41"]

WEBSERVER_FRONTEND={}

Expand Down
6 changes: 0 additions & 6 deletions packages/settings-library/tests/test_twilio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# pylint: disable=unused-argument
# pylint: disable=unused-variable

import pytest
from pydantic import ValidationError
from pytest import MonkeyPatch
from pytest_simcore.helpers.utils_envs import setenvs_from_dict
from settings_library.twilio import TwilioSettings
Expand All @@ -12,10 +10,6 @@
def test_twilio_settings_within_envdevel(
mock_env_devel_environment: dict[str, str], monkeypatch: MonkeyPatch
):
# in .env-devel these are for the oment undefined
with pytest.raises(ValidationError):
TwilioSettings.create_from_envs()
GitHK marked this conversation as resolved.
Show resolved Hide resolved

# adds twilio credentials
with monkeypatch.context() as patch:
setenvs_from_dict(
Expand Down
3 changes: 3 additions & 0 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ services:
LOGIN_REGISTRATION_INVITATION_REQUIRED: ${LOGIN_REGISTRATION_INVITATION_REQUIRED}
LOGIN_2FA_REQUIRED: ${LOGIN_2FA_REQUIRED}
LOGIN_2FA_CODE_EXPIRATION_SEC: ${LOGIN_2FA_CODE_EXPIRATION_SEC}
TWILIO_ACCOUNT_SID: ${TWILIO_ACCOUNT_SID}
TWILIO_AUTH_TOKEN: ${TWILIO_AUTH_TOKEN}
TWILIO_COUNTRY_CODES_W_ALPHANUMERIC_SID_SUPPORT: ${TWILIO_COUNTRY_CODES_W_ALPHANUMERIC_SID_SUPPORT}

# WEBSERVER_REDIS
REDIS_HOST: ${REDIS_HOST}
Expand Down