diff --git a/config/envs/default.py b/config/envs/default.py index e55f444b..23c9fc28 100644 --- a/config/envs/default.py +++ b/config/envs/default.py @@ -13,11 +13,7 @@ class DefaultConfig: # Application Config FLASK_ENV = environ.get("FLASK_ENV", None) - SECRET_KEY = environ.get("SECRET_KEY", None) - if not SECRET_KEY: - if FLASK_ENV in ["dev", "test", "uat", "production"]: - raise KeyError("SECRET_KEY is not present in environment") - SECRET_KEY = "dev-secret" # pragma: allowlist secret + SECRET_KEY = CommonConfig.SECRET_KEY SESSION_COOKIE_NAME = environ.get("SESSION_COOKIE_NAME", "session_cookie") FLASK_ROOT = str(Path(__file__).parent.parent.parent) diff --git a/requirements-dev.txt b/requirements-dev.txt index 13c5da27..dea09af7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -60,7 +60,7 @@ blinker==1.8.2 boto3==1.34.152 # via # -r requirements.txt - # funding-service-design-utils + # flipper-client # moto botocore==1.34.152 # via @@ -70,6 +70,10 @@ botocore==1.34.152 # s3transfer build==1.2.1 # via pip-tools +cachetools==5.5.0 + # via + # -r requirements.txt + # flipper-client certifi==2024.7.4 # via # -r requirements.txt @@ -171,7 +175,11 @@ flask-sqlalchemy==3.1.1 # -r requirements.txt # flask-migrate # funding-service-design-utils -git+https://github.com/communitiesuk/funding-service-design-utils.git@fs-4647-a +flipper-client==1.3.2 + # via + # -r requirements.txt + # funding-service-design-utils +funding-service-design-utils==4.0.0 # via -r requirements.txt gunicorn==22.0.0 # via @@ -343,6 +351,10 @@ pycparser==2.22 # via # -r requirements.txt # cffi +pyee==6.0.0 + # via + # -r requirements.txt + # flipper-client pyflakes==3.2.0 # via flake8 pygments==2.18.0 @@ -369,6 +381,10 @@ pytest-flask==1.3.0 # via -r requirements-dev.in pytest-mock==3.14.0 # via -r requirements-dev.in +python-consul==1.1.0 + # via + # -r requirements.txt + # flipper-client python-dateutil==2.9.0.post0 # via # -r requirements.txt @@ -376,7 +392,7 @@ python-dateutil==2.9.0.post0 # flask-apscheduler # moto # pandas -python-dotenv==1.0.1 +python-dotenv==0.20.0 # via # -r requirements.txt # funding-service-design-utils @@ -411,6 +427,7 @@ redis==4.6.0 # via # -r requirements.txt # flask-redis + # flipper-client referencing==0.35.1 # via # -r requirements.txt @@ -425,6 +442,7 @@ requests==2.32.3 # jsonschema-path # moto # prance + # python-consul # responses responses==0.25.3 # via moto @@ -463,8 +481,10 @@ six==1.16.0 # apscheduler # jsonpath-rw # prance + # python-consul # python-dateutil # rfc3339-validator + # thrift slugify==0.0.1 # via -r requirements.txt sniffio==1.3.1 @@ -498,6 +518,10 @@ swagger-ui-bundle==1.1.0 # via # -r requirements.txt # connexion +thrift==0.20.0 + # via + # -r requirements.txt + # flipper-client tomli==2.0.1 # via # black diff --git a/requirements.in b/requirements.in index 4b84df75..88438e56 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,7 @@ #----------------------------------- # FSD Utils #----------------------------------- -funding-service-design-utils>=5.0.7,<=6.0.0 +funding-service-design-utils>=2.0.51,<=4.0.0 requests==2.32.3 slugify diff --git a/requirements.txt b/requirements.txt index a23a9a1c..840ff036 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,11 +38,13 @@ blinker==1.8.2 # flask # sentry-sdk boto3==1.34.152 - # via funding-service-design-utils + # via flipper-client botocore==1.34.152 # via # boto3 # s3transfer +cachetools==5.5.0 + # via flipper-client certifi==2024.7.4 # via # httpcore @@ -102,7 +104,9 @@ flask-sqlalchemy==3.1.1 # -r requirements.in # flask-migrate # funding-service-design-utils -git+https://github.com/communitiesuk/funding-service-design-utils.git@fs-4647-a +flipper-client==1.3.2 + # via funding-service-design-utils +funding-service-design-utils==4.0.0 # via -r requirements.in gunicorn==22.0.0 # via funding-service-design-utils @@ -196,19 +200,23 @@ psycopg2-binary==2.9.9 # via -r requirements.in pycparser==2.22 # via cffi +pyee==6.0.0 + # via flipper-client pygments==2.18.0 # via rich pyjwt[crypto]==2.9.0 # via # funding-service-design-utils # pyjwt +python-consul==1.1.0 + # via flipper-client python-dateutil==2.9.0.post0 # via # -r requirements.in # botocore # flask-apscheduler # pandas -python-dotenv==1.0.1 +python-dotenv==0.20.0 # via # funding-service-design-utils # uvicorn @@ -230,7 +238,9 @@ pyyaml==6.0.1 # jsonschema-path # uvicorn redis==4.6.0 - # via flask-redis + # via + # flask-redis + # flipper-client referencing==0.35.1 # via # jsonschema @@ -243,6 +253,7 @@ requests==2.32.3 # funding-service-design-utils # jsonschema-path # prance + # python-consul rfc3339-validator==0.1.4 # via openapi-schema-validator rich==12.6.0 @@ -258,16 +269,16 @@ ruamel-yaml-clib==0.2.8 s3transfer==0.10.2 # via boto3 sentry-sdk[flask]==2.12.0 - # via - # funding-service-design-utils - # sentry-sdk + # via funding-service-design-utils six==1.16.0 # via # apscheduler # jsonpath-rw # prance + # python-consul # python-dateutil # rfc3339-validator + # thrift slugify==0.0.1 # via -r requirements.in sniffio==1.3.1 @@ -296,6 +307,8 @@ swagger-ui-bundle==1.1.0 # via # -r requirements.in # connexion +thrift==0.20.0 + # via flipper-client typing-extensions==4.12.2 # via # a2wsgi