Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auth-service
Submodule auth-service updated 1 files
+1 −1 requirements.txt
2 changes: 1 addition & 1 deletion broker-bridge-service
Submodule broker-bridge-service updated 2 files
+12 −12 go.mod
+26 −27 go.sum
4 changes: 2 additions & 2 deletions docs/swagger-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -298,4 +298,4 @@ app.use(

app.listen(port, () => {
console.log(`Swagger UI available at http://localhost:${port}/docs`);
});
});
59 changes: 8 additions & 51 deletions haproxy/routes/bootstrap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -217,63 +217,20 @@ 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,
organization_required = true,
is_root_user_api = true,
},
POST = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = "Editor",
space_required = false,
Expand All @@ -283,31 +240,31 @@ routes = {
},
["^/api/console/organizations/monitoring/[0-9a-f-]+/?$"] = {
GET = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = "Viewer",
space_required = false,
organization_required = true,
is_root_user_api = true,
},
PUT = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = "Editor",
space_required = false,
organization_required = true,
is_root_user_api = true,
},
PATCH = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = "Editor",
space_required = false,
organization_required = true,
is_root_user_api = true,
},
DELETE = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = "Admin",
space_required = false,
Expand All @@ -317,7 +274,7 @@ routes = {
},
["^/api/organizations/monitoring/?$"] = {
GET = {
service = "console",
service = "bootstrap",
auth_required = true,
role_required = nil,
space_required = false,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion mpa-service
Submodule mpa-service updated 3 files
+2 −2 cmd/mpa/cmd/serve.go
+16 −16 go.mod
+34 −35 go.sum
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion telemetry-service
2 changes: 1 addition & 1 deletion transformer-service
Submodule transformer-service updated 2 files
+17 −17 go.mod
+36 −37 go.sum
Loading