Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vallbull committed Jul 25, 2024
1 parent 38b9cd1 commit ee10e6e
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 11 deletions.
6 changes: 1 addition & 5 deletions app/app_configs/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,4 @@ CSRF_TIME_LIMIT: 43200
DL_CRY_ACTUAL_KEY_ID: '0'
DL_CRY_KEYMAP: {}
SENTRY_DSN_DATASET_API: ''
SENTRY_ENABLED: false
REDIS_FILE_UPLOADER_DATA_DB: 9
REDIS_FILE_UPLOADER_TASKS_DB: 11
FILE_UPLOADER_S3_PERSISTENT_BUCKET_NAME: bi-file-uploader-testing
FILE_UPLOADER_S3_TMP_BUCKET_NAME: bi-file-uploader-tmp-testing
SENTRY_ENABLED: false
32 changes: 32 additions & 0 deletions app/app_configs/file_api.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
CORS_ALLOWED_HEADERS:
- Content-Type
- X-Request-ID
- X-DL-TenantId
- X-CSRF-Token
- X-DL-Allow-Superuser
- X-DL-Sudo
CORS_ALLOWED_ORIGINS:
- '*'
CORS_EXPOSE_HEADERS:
- X-Request-ID
CSRF_HEADER_NAME: X-CSRF-Token
CSRF_METHODS:
- POST
- PUT
- DELETE
CSRF_TIME_LIMIT: 43200
FILE_UPLOADER_S3_PERSISTENT_BUCKET_NAME: dl-file-uploader
FILE_UPLOADER_S3_TMP_BUCKET_NAME: dl-file-uploader-tmp
REDIS_FILE_UPLOADER_DATA_DB: 9
REDIS_FILE_UPLOADER_TASKS_DB: 11
REDIS_PERSISTENT_CLUSTER_NAME: opensource
REDIS_PERSISTENT_HOSTS:
- http://redis:6379
REDIS_PERSISTENT_MODE: 1
REDIS_PERSISTENT_PORT: 26379
REDIS_PERSISTENT_SSL: null
S3_ENDPOINT_URL: http://s3-storage:8000
SENTRY_DSN_FILE_UPLOADER_API: ''
SENTRY_ENABLED: false

21 changes: 21 additions & 0 deletions app/app_configs/file_worker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
CONNECTORS:
FILE:
CONN_FILE_CH_HOST: http://db-clickhouse
CONN_FILE_CH_PORT: 8123
CONN_FILE_CH_USERNAME: default
FILE_UPLOADER_S3_PERSISTENT_BUCKET_NAME: dl-file-uploader
FILE_UPLOADER_S3_TMP_BUCKET_NAME: dl-file-uploader-tmp
REDIS_FILE_UPLOADER_DATA_DB: 9
REDIS_FILE_UPLOADER_TASKS_DB: 11
REDIS_PERSISTENT_CLUSTER_NAME: opensource
REDIS_PERSISTENT_HOSTS:
- http://redis
REDIS_PERSISTENT_MODE: 1
REDIS_PERSISTENT_PORT: 6379
REDIS_PERSISTENT_SSL: null
S3_ENDPOINT_URL: http://s3-storage:8000
SENTRY_DSN_FILE_UPLOADER_WORKER: ''
SENTRY_ENABLED: false
US_BASE_URL: http://us:8083

4 changes: 2 additions & 2 deletions app/dl_file_uploader_api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ RUN poetry export --only app_dl_os_file_uploader_api --without-hashes --format=r
RUN pip install -r requirements.txt

# Configs
ENV CONFIG_PATH="/etc/backend-configs/api.yaml"
COPY --from=bake_ctx_app_configs /app_configs/api.yaml "$CONFIG_PATH"
ENV CONFIG_PATH="/etc/backend-configs/file_api.yaml"
COPY --from=bake_ctx_app_configs /app_configs/file_api.yaml "$CONFIG_PATH"

# Setting up the runtime user
ARG USER=app
Expand Down
2 changes: 1 addition & 1 deletion app/dl_file_uploader_api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readme = "README.md"
aiohttp = ">=3.9.1"
attrs = ">=22.2.0"
gunicorn = ">=21.2.0"
python = ">=3.10, <3.12"
python = ">=3.10, <3.13"
dl-version = {path = "../../lib/dl_version"}
dl-core = {path = "../../lib/dl_core"}
dl-file-uploader-api-lib = {path = "../../lib/dl_file_uploader_api_lib"}
Expand Down
4 changes: 4 additions & 0 deletions app/dl_file_uploader_worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ RUN pip install -r requirements.txt
# Entrypoint
WORKDIR /src/$APP_DIR

# Configs
ENV CONFIG_PATH="/etc/backend-configs/file_worker.yaml"
COPY --from=bake_ctx_app_configs /app_configs/file_worker.yaml "$CONFIG_PATH"

ENTRYPOINT ["/etc/service/dl_file_uploader_worker/run"]

2 changes: 1 addition & 1 deletion app/dl_file_uploader_worker/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiohttp = ">=3.9.1"
attrs = ">=22.2.0"
gunicorn = ">=21.2.0"
ipython = ">=8.10.0"
python = ">=3.10, <3.12"
python = ">=3.10, <3.13"
dl-core = {path = "../../lib/dl_core"}
dl-file-uploader-worker-lib = {path = "../../lib/dl_file_uploader_worker_lib"}
dl-file-secure-reader-lib = {path = "../../lib/dl_file_secure_reader_lib"}
Expand Down
48 changes: 46 additions & 2 deletions metapkg/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ee10e6e

Please sign in to comment.