thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove mon and osd user types

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-05-19 17:19:47 +03:00
parent 3779e2670d
commit 3dd0e4daca
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/etcd_state_client.cpp
+1 -3
View File
@@ -1423,9 +1423,7 @@ void etcd_state_client_t::parse_state(const etcd_kv_t & kv)
inf = std::make_shared<user_info_t>(); inf = std::make_shared<user_info_t>();
inf->name = name; inf->name = name;
} }
inf->type = value["type"] == "admin" ? user_type_t::ADMIN : inf->type = value["type"] == "admin" ? user_type_t::ADMIN : user_type_t::CLIENT;
(value["type"] == "mon" ? user_type_t::MON :
(value["type"] == "osd" ? user_type_t::OSD : user_type_t::CLIENT));
inf->groups.clear(); inf->groups.clear();
for (auto & group: value["groups"].array_items()) for (auto & group: value["groups"].array_items())
{ {
src/client/etcd_state_client.h
-2
View File
@@ -115,8 +115,6 @@ enum class user_type_t
{ {
CLIENT = 0, CLIENT = 0,
ADMIN = 1, ADMIN = 1,
MON = 2,
OSD = 3,
}; };
struct user_perm_t struct user_perm_t
src/cmd/cli_modify_user.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ struct cli_modify_user_t
goto resume_1; goto resume_1;
else if (state == 2) else if (state == 2)
goto resume_2; goto resume_2;
if (user_type != "client" && user_type != "admin" && user_type != "mon" && user_type != "osd") if (user_type != "client" && user_type != "admin")
{ {
result = (cli_result_t){ .err = EINVAL, .text = "Unknown user type: "+user_type }; result = (cli_result_t){ .err = EINVAL, .text = "Unknown user type: "+user_type };
state = 100; state = 100;
src/cmd/openapi.json
+1 -1
View File
@@ -946,7 +946,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "type": "string", "description": "User name" }, "name": { "type": "string", "description": "User name" },
"type": { "type": "string", "enum": [ "osd", "mon", "admin", "client" ], "description": "User type" }, "type": { "type": "string", "enum": [ "admin", "client" ], "description": "User type" },
"groups": { "type": "array", "items": { "type": "string" }, "description": "User group names" } "groups": { "type": "array", "items": { "type": "string" }, "description": "User group names" }
} }
}, },