From 20fd478ffde361783669488df92ca3416d85407a Mon Sep 17 00:00:00 2001 From: ShiKhu Date: Thu, 13 May 2021 04:29:07 +0200 Subject: [PATCH] Dev (#3) * fix (frontend): snippets & sentences * fix (backend-db): issue_type for error hardcoded * fix(frontend): autocomplete-off on main searchbar * fix(pg_schema): session duration DEFAULT NULL * fix (chalice): some required env vars --- api/chalicelib/core/sessions_mobs.py | 6 +++++- scripts/helm/app/chalice.yaml | 20 +++++++++---------- .../db/init_dbs/postgresql/init_schema.sql | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/api/chalicelib/core/sessions_mobs.py b/api/chalicelib/core/sessions_mobs.py index 7c3e7fd0a..d3da91f52 100644 --- a/api/chalicelib/core/sessions_mobs.py +++ b/api/chalicelib/core/sessions_mobs.py @@ -4,7 +4,11 @@ import boto3 def get_web(sessionId): - return boto3.client('s3', region_name=environ["sessions_region"]).generate_presigned_url( + return boto3.client('s3', + endpoint_url=environ["S3_HOST"], + aws_access_key_id=environ["S3_KEY"], + aws_secret_access_key=environ["S3_SECRET"], + region_name=environ["sessions_region"]).generate_presigned_url( 'get_object', Params={ 'Bucket': environ["sessions_bucket"], diff --git a/scripts/helm/app/chalice.yaml b/scripts/helm/app/chalice.yaml index 581bb6f55..e43cdbeec 100644 --- a/scripts/helm/app/chalice.yaml +++ b/scripts/helm/app/chalice.yaml @@ -36,14 +36,14 @@ env: assign_link: http://127.0.0.1:8000/async/email_assignment captcha_server: '' captcha_key: '' - sessions_bucket: asayer-mobs-staging + sessions_bucket: asayer-mobs sessions_region: eu-central-1 put_S3_TTL: '20' - sourcemaps_bucket: '' - sourcemaps_bucket_key: '' - sourcemaps_bucket_secret: '' - sourcemaps_bucket_region: '' - js_cache_bucket: '' + sourcemaps_bucket: asayer-sourcemaps + sourcemaps_bucket_key: minios3AccessKeyS3cr3t + sourcemaps_bucket_secret: m1n10s3CretK3yPassw0rd + sourcemaps_bucket_region: eu-central-1 + js_cache_bucket: asayer-sessions-assets async_Token: '' EMAIL_HOST: '' EMAIL_PORT: '587' @@ -57,11 +57,11 @@ env: SITE_URL: '' announcement_url: '' jwt_secret: '' - jwt_algorithm: '' - jwt_exp_delta_seconds: '' + jwt_algorithm: 'HS512' + jwt_exp_delta_seconds: '2592000' S3_HOST: 's3://minio.db.svc.cluster.local:9000' - S3_KEY: '' - S3_SECRET: '' + S3_KEY: minios3AccessKeyS3cr3t + S3_SECRET: m1n10s3CretK3yPassw0rd # Enable logging for python app # Ref: https://stackoverflow.com/questions/43969743/logs-in-kubernetes-pod-not-showing-up PYTHONUNBUFFERED: '0' diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql index faaf21ab9..ed1449309 100644 --- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql +++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql @@ -433,7 +433,7 @@ CREATE TABLE sessions project_id integer NOT NULL REFERENCES projects (project_id) ON DELETE CASCADE, tracker_version text NOT NULL, start_ts bigint NOT NULL, - duration integer NOT NULL, + duration integer DEFAULT NULL, rev_id text DEFAULT NULL, platform platform NOT NULL DEFAULT 'web', is_snippet boolean NOT NULL DEFAULT FALSE,