From 5389df0444bf5fd1d234919dbe8ad30f9844fc9d Mon Sep 17 00:00:00 2001 From: ngovinh2k2 Date: Mon, 14 Sep 2026 11:58:47 +0700 Subject: [PATCH] fix: upgrade version for library --- auth-service | 2 +- broker-bridge-service | 2 +- device-service | 2 +- docs/swagger-server.js | 4 +-- haproxy/routes/bootstrap.lua | 59 +++++------------------------------- mpa-service | 2 +- requirements-dev.txt | 2 +- telemetry-service | 2 +- transformer-service | 2 +- 9 files changed, 17 insertions(+), 60 deletions(-) diff --git a/auth-service b/auth-service index c13be06..ecda729 160000 --- a/auth-service +++ b/auth-service @@ -1 +1 @@ -Subproject commit c13be06d77ca6e5b09e8ed6c1878827990cf1148 +Subproject commit ecda7294e2db03f182674664cbbc7fcd41cb52a1 diff --git a/broker-bridge-service b/broker-bridge-service index 04dff71..e234586 160000 --- a/broker-bridge-service +++ b/broker-bridge-service @@ -1 +1 @@ -Subproject commit 04dff71b769fea199f1cbb9bec52333097501eb0 +Subproject commit e234586f5eaf98202b63b1523b1c1ab678e7452c diff --git a/device-service b/device-service index eec27ad..50908ed 160000 --- a/device-service +++ b/device-service @@ -1 +1 @@ -Subproject commit eec27ad0370dc9c8e67ba9b9c2c20ab57632091f +Subproject commit 50908ed304b638c44363e7ffdc51ae5757deb0e0 diff --git a/docs/swagger-server.js b/docs/swagger-server.js index bac8e86..1151c73 100644 --- a/docs/swagger-server.js +++ b/docs/swagger-server.js @@ -6,7 +6,7 @@ const app = express(); const port = 3000; const openApiUrls = [ - "http://console/console/docs/?format=openapi", + "http://bootstrap/bootstrap/docs/?format=openapi", "http://auth/auth/docs/?format=openapi", "http://dashboard/dashboard/docs/?format=openapi", "http://device/device/docs/?format=openapi", @@ -298,4 +298,4 @@ app.use( app.listen(port, () => { console.log(`Swagger UI available at http://localhost:${port}/docs`); -}); \ No newline at end of file +}); diff --git a/haproxy/routes/bootstrap.lua b/haproxy/routes/bootstrap.lua index 9bf1e48..5c0e092 100644 --- a/haproxy/routes/bootstrap.lua +++ b/haproxy/routes/bootstrap.lua @@ -217,55 +217,12 @@ routes = { is_root_user_api = true, } }, - -- -------------- - -- Plans (Billing) - -- -------------- - ["^/api/plans/[%w_%-]+/?$"] = { - GET = { - service = "console", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = false, - is_root_user_api = false, - }, - }, - ["^/api/plans/?$"] = { - GET = { - service = "console", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = false, - is_root_user_api = true, - }, - }, - ["^/api/contact%-sales/?$"] = { - POST = { - service = "console", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = false, - is_root_user_api = true, - }, - }, - ["^/api/contact%-sales/status/?$"] = { - GET = { - service = "console", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = false, - is_root_user_api = true, - }, - }, -- --------------- -- Monitoring -- --------------- ["^/api/console/organizations/monitoring/?$"] = { GET = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Viewer", space_required = false, @@ -273,7 +230,7 @@ routes = { is_root_user_api = true, }, POST = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Editor", space_required = false, @@ -283,7 +240,7 @@ routes = { }, ["^/api/console/organizations/monitoring/[0-9a-f-]+/?$"] = { GET = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Viewer", space_required = false, @@ -291,7 +248,7 @@ routes = { is_root_user_api = true, }, PUT = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Editor", space_required = false, @@ -299,7 +256,7 @@ routes = { is_root_user_api = true, }, PATCH = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Editor", space_required = false, @@ -307,7 +264,7 @@ routes = { is_root_user_api = true, }, DELETE = { - service = "console", + service = "bootstrap", auth_required = true, role_required = "Admin", space_required = false, @@ -317,7 +274,7 @@ routes = { }, ["^/api/organizations/monitoring/?$"] = { GET = { - service = "console", + service = "bootstrap", auth_required = true, role_required = nil, space_required = false, @@ -327,7 +284,7 @@ routes = { }, ["^/api/organizations/monitoring/[0-9a-f-]+/?$"] = { GET = { - service = "console", + service = "bootstrap", auth_required = true, role_required = nil, space_required = false, diff --git a/mpa-service b/mpa-service index d13d0f8..75c6917 160000 --- a/mpa-service +++ b/mpa-service @@ -1 +1 @@ -Subproject commit d13d0f82f4f34d1b35c673d4bb38cac732f000c3 +Subproject commit 75c691786610b40579aa1e7588ed10e82e22c78d diff --git a/requirements-dev.txt b/requirements-dev.txt index 3ea72e9..82d6880 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ python-dotenv==1.2.2 psycopg2-binary==2.9.9 # Rest apis -djangorestframework==3.15.2 +djangorestframework>=3.17.2 djangorestframework_simplejwt==5.5.1 django-cors-headers==4.4.0 drf-yasg==1.21.7 diff --git a/telemetry-service b/telemetry-service index 067f002..03abe64 160000 --- a/telemetry-service +++ b/telemetry-service @@ -1 +1 @@ -Subproject commit 067f00223bd0dbbd7845b4d854cbbc12d0caebf0 +Subproject commit 03abe64be81042e6ab58e620e9aebfdf1f083a66 diff --git a/transformer-service b/transformer-service index b87848b..d3221df 160000 --- a/transformer-service +++ b/transformer-service @@ -1 +1 @@ -Subproject commit b87848bb2a67b8701f63dd71207e4607b467e2d7 +Subproject commit d3221dfef91e0c4083bb50ff909486b30540ed0d