From be3a6baf75f576b13c033c239e150ae46c824dbc Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Tue, 26 Dec 2023 12:55:46 +0100 Subject: [PATCH] Api v1.17.0 (#1805) * refactor(chalice): upgraded dependencies * refactor(DB): removed duplicate indexes --- ee/api/Pipfile | 10 +++++----- ee/api/requirements-alerts.txt | 4 ++-- ee/api/requirements-crons.txt | 2 +- ee/api/requirements.txt | 2 +- .../schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql | 5 +++++ .../schema/db/init_dbs/postgresql/init_schema.sql | 4 +--- .../schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql | 5 +++++ scripts/schema/db/init_dbs/postgresql/init_schema.sql | 2 -- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ee/api/Pipfile b/ee/api/Pipfile index 1279cb5500..328a1a54ea 100644 --- a/ee/api/Pipfile +++ b/ee/api/Pipfile @@ -6,12 +6,12 @@ name = "pypi" [packages] urllib3 = "==1.26.16" requests = "==2.31.0" -boto3 = "==1.29.7" +boto3 = "==1.34.1" pyjwt = "==2.8.0" psycopg2-binary = "==2.9.9" -elasticsearch = "==8.11.0" +elasticsearch = "==8.11.1" jira = "==3.5.2" -fastapi = "==0.104.1" +fastapi = "==0.105.0" gunicorn = "==21.2.0" python-decouple = "==3.8" apscheduler = "==3.10.4" @@ -19,10 +19,10 @@ python-multipart = "==0.0.6" redis = "==5.0.1" python3-saml = "==1.16.0" azure-storage-blob = "==12.19.0" -uvicorn = {extras = ["standard"], version = "==0.23.2"} +psycopg = {extras = ["pool", "binary"], version = "==3.1.15"} +uvicorn = {extras = ["standard"], version = "==0.25.0"} pydantic = {extras = ["email"], version = "==2.3.0"} clickhouse-driver = {extras = ["lz4"], version = "==0.2.6"} -psycopg = {extras = ["binary", "pool"], version = "==3.1.12"} [dev-packages] diff --git a/ee/api/requirements-alerts.txt b/ee/api/requirements-alerts.txt index a92ea3dfa2..171bbcbe84 100644 --- a/ee/api/requirements-alerts.txt +++ b/ee/api/requirements-alerts.txt @@ -5,13 +5,13 @@ boto3==1.34.1 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.15 -elasticsearch==8.11.0 +elasticsearch==8.11.1 jira==3.5.2 fastapi==0.105.0 -uvicorn[standard]==0.23.2 +uvicorn[standard]==0.25.0 python-decouple==3.8 pydantic[email]==2.3.0 apscheduler==3.10.4 diff --git a/ee/api/requirements-crons.txt b/ee/api/requirements-crons.txt index 3298da78d1..d220f173ac 100644 --- a/ee/api/requirements-crons.txt +++ b/ee/api/requirements-crons.txt @@ -5,7 +5,7 @@ boto3==1.34.1 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.15 -elasticsearch==8.11.0 +elasticsearch==8.11.1 jira==3.5.2 diff --git a/ee/api/requirements.txt b/ee/api/requirements.txt index b54e210ad9..105328610d 100644 --- a/ee/api/requirements.txt +++ b/ee/api/requirements.txt @@ -11,7 +11,7 @@ jira==3.5.2 fastapi==0.105.0 -uvicorn[standard]==0.23.2 +uvicorn[standard]==0.25.0 gunicorn==21.2.0 python-decouple==3.8 pydantic[email]==2.3.0 diff --git a/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql b/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql index 45f2244bd6..f9947b368b 100644 --- a/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql +++ b/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql @@ -29,6 +29,11 @@ UPDATE public.sessions SET has_ut_test= TRUE WHERE session_id IN (SELECT session_id FROM public.ut_tests_signals); +DROP INDEX IF EXISTS public.errors_error_id_idx; +DROP INDEX IF EXISTS public.issues_issue_id_idx; +DROP INDEX IF EXISTS public.projects_project_key_key; +DROP INDEX IF EXISTS public.user_favorite_sessions_user_id_session_id_idx; + COMMIT; \elif :is_next diff --git a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql index 838016bc4c..079044eb3e 100644 --- a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql +++ b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql @@ -274,7 +274,7 @@ $$ button_url text NULL, image_url text NULL, created_at timestamp NOT NULL DEFAULT timezone('utc'::text, now()), - options jsonb NOT NULL DEFAULT'{}'::jsonb, + options jsonb NOT NULL DEFAULT '{}'::jsonb, CONSTRAINT notification_tenant_xor_user CHECK ( tenant_id NOTNULL AND user_id ISNULL OR tenant_id ISNULL AND user_id NOTNULL ) ); @@ -401,7 +401,6 @@ $$ CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception'; CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id); CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception'; - CREATE INDEX errors_error_id_idx ON public.errors (error_id); CREATE INDEX errors_parent_error_id_idx ON public.errors (parent_error_id); CREATE TABLE public.user_favorite_errors @@ -541,7 +540,6 @@ $$ session_id bigint NOT NULL REFERENCES public.sessions (session_id) ON DELETE CASCADE, PRIMARY KEY (user_id, session_id) ); - CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON public.user_favorite_sessions (user_id, session_id); CREATE TABLE public.assigned_sessions diff --git a/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql b/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql index c6c0c4028b..dc55a135fc 100644 --- a/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql +++ b/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql @@ -29,6 +29,11 @@ UPDATE public.sessions SET has_ut_test= TRUE WHERE session_id IN (SELECT session_id FROM public.ut_tests_signals); +DROP INDEX IF EXISTS public.errors_error_id_idx; +DROP INDEX IF EXISTS public.issues_issue_id_idx; +DROP INDEX IF EXISTS public.projects_project_key_key; +DROP INDEX IF EXISTS public.user_favorite_sessions_user_id_session_id_idx; + COMMIT; \elif :is_next diff --git a/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/scripts/schema/db/init_dbs/postgresql/init_schema.sql index b684e3622d..a46e515f59 100644 --- a/scripts/schema/db/init_dbs/postgresql/init_schema.sql +++ b/scripts/schema/db/init_dbs/postgresql/init_schema.sql @@ -363,7 +363,6 @@ $$ CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception'; CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id); CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception'; - CREATE INDEX errors_error_id_idx ON public.errors (error_id); CREATE INDEX errors_parent_error_id_idx ON public.errors (parent_error_id); CREATE TABLE public.user_favorite_errors @@ -502,7 +501,6 @@ $$ session_id bigint NOT NULL REFERENCES public.sessions (session_id) ON DELETE CASCADE, PRIMARY KEY (user_id, session_id) ); - CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON public.user_favorite_sessions (user_id, session_id); CREATE TABLE public.assigned_sessions