jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/api-v1.9.5' into dev

Browse source
This commit is contained in:
Taha Yassine Kraiem 2023-01-26 11:59:19 +01:00
commit 4babae1881
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/chalicelib/core/sessions_devtool.py
View file

@ -13,9 +13,11 @@ def __get_devtools_keys(project_id, session_id):
]
def get_urls(session_id, project_id):
def get_urls(session_id, project_id, check_existence: bool = True):
results = []
for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
if check_existence and not s3.exists(bucket=config("sessions_bucket"), key=k):
continue
results.append(s3.client.generate_presigned_url(
'get_object',
Params={'Bucket': config("sessions_bucket"), 'Key': k},

8
api/chalicelib/core/sessions_mobs.py
View file

@ -18,9 +18,11 @@ def __get_mob_keys_deprecated(session_id):
return [str(session_id), str(session_id) + "e"]
def get_urls(project_id, session_id):
def get_urls(project_id, session_id, check_existence: bool = True):
results = []
for k in __get_mob_keys(project_id=project_id, session_id=session_id):
if check_existence and not s3.exists(bucket=config("sessions_bucket"), key=k):
continue
results.append(s3.client.generate_presigned_url(
'get_object',
Params={'Bucket': config("sessions_bucket"), 'Key': k},
@ -29,9 +31,11 @@ def get_urls(project_id, session_id):
return results
def get_urls_depercated(session_id):
def get_urls_depercated(session_id, check_existence: bool = True):
results = []
for k in __get_mob_keys_deprecated(session_id=session_id):
if check_existence and not s3.exists(bucket=config("sessions_bucket"), key=k):
continue
results.append(s3.client.generate_presigned_url(
'get_object',
Params={'Bucket': config("sessions_bucket"), 'Key': k},

4
ee/api/chalicelib/core/sessions_devtool.py
View file

@ -18,11 +18,13 @@ def __get_devtools_keys(project_id, session_id):
]
def get_urls(session_id, project_id, context: schemas_ee.CurrentContext):
def get_urls(session_id, project_id, context: schemas_ee.CurrentContext, check_existence: bool = True):
if not permissions.check(security_scopes=SCOPES, context=context):
return []
results = []
for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
if check_existence and not s3.exists(bucket=config("sessions_bucket"), key=k):
continue
results.append(s3.client.generate_presigned_url(
'get_object',
Params={'Bucket': config("sessions_bucket"), 'Key': k},

1
scripts/schema/db/init_dbs/postgresql/init_schema.sql
View file

@ -538,7 +538,6 @@ $$
);
CREATE INDEX issues_issue_id_timestamp_idx ON events_common.issues (issue_id, timestamp);
CREATE INDEX issues_timestamp_idx ON events_common.issues (timestamp);
CREATE INDEX issues_project_id_issue_id_idx ON public.issues (project_id, issue_id);
CREATE TYPE http_method AS ENUM ('GET','HEAD','POST','PUT','DELETE','CONNECT','OPTIONS','TRACE','PATCH');
CREATE TABLE events_common.requests