tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
amartynov 2014-07-15 14:06:58 +04:00
parent 2438917854
commit 1ad0f0b069
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devops-service/routes/v2.0/server.rb
View File

@ -38,15 +38,6 @@ module Version2_0
puts "Server routes initialized" puts "Server routes initialized"
end end
before "/server/:name_or_cmd" do
if request.get?
check_headers :accept
else
check_headers :accept, :content_type
end
check_privileges("server")
end
before %r{\A/server/[\w]+/(pause|unpouse|reserve|unreserve)\z} do before %r{\A/server/[\w]+/(pause|unpouse|reserve|unreserve)\z} do
check_headers :accept, :content_type check_headers :accept, :content_type
check_privileges("server", "w") check_privileges("server", "w")
@ -54,11 +45,6 @@ module Version2_0
@key = (body.nil? ? nil : body["key"]) @key = (body.nil? ? nil : body["key"])
end end
before "/servers/:provider" do
check_headers :accept
check_privileges("server", "r")
end
after %r{\A/server(/[\w]+)?\z | \A/server/(add|bootstrap)\z | \A/server/[\w]+/(un)?pause\z} do after %r{\A/server(/[\w]+)?\z | \A/server/(add|bootstrap)\z | \A/server/[\w]+/(un)?pause\z} do
statistic statistic
end end
@ -99,6 +85,8 @@ module Version2_0
# } # }
# ] # ]
get "/servers/chef" do get "/servers/chef" do
check_headers :accept
check_privileges("server", "r")
json KnifeCommands.chef_node_list json KnifeCommands.chef_node_list
end end
@ -139,6 +127,8 @@ module Version2_0
# } # }
# ] # ]
get "/servers/:provider" do get "/servers/:provider" do
check_headers :accept
check_privileges("server", "r")
json ::Provider::ProviderFactory.get(params[:provider]).servers json ::Provider::ProviderFactory.get(params[:provider]).servers
end end
@ -158,6 +148,8 @@ module Version2_0
# } # }
# ] # ]
get "/server/:name" do get "/server/:name" do
check_headers :accept
check_privileges("server", "r")
json get_server(params[:name], params[:key]).to_hash json get_server(params[:name], params[:key]).to_hash
end end
@ -176,6 +168,8 @@ module Version2_0
# * *Returns* : # * *Returns* :
# 200 - Deleted # 200 - Deleted
delete "/server/:id" do delete "/server/:id" do
check_headers :accept
check_privileges("server", "w")
body = create_object_from_json_body(Hash, true) body = create_object_from_json_body(Hash, true)
key = (body.nil? ? nil : body["key"]) key = (body.nil? ? nil : body["key"])
s = get_server(params[:id], key) s = get_server(params[:id], key)
@ -387,6 +381,8 @@ module Version2_0
# * *Returns* : text stream # * *Returns* : text stream
# TODO: check bootstrap template name # TODO: check bootstrap template name
post "/server/bootstrap" do post "/server/bootstrap" do
check_headers
check_privileges("server", "w")
body = create_object_from_json_body(Hash, true) body = create_object_from_json_body(Hash, true)
id = check_string(body["instance_id"], "Parameter 'instance_id' must be a not empty string") id = check_string(body["instance_id"], "Parameter 'instance_id' must be a not empty string")
name = check_string(body["name"], "Parameter 'name' should be a not empty string", true) name = check_string(body["name"], "Parameter 'name' should be a not empty string", true)
@ -456,6 +452,8 @@ module Version2_0
# 200 - Added # 200 - Added
# TODO: should be refactored # TODO: should be refactored
post "/server/add" do post "/server/add" do
check_headers
check_privileges("server", "w")
body = create_object_from_json_body body = create_object_from_json_body
project = check_string(body["project"], "Parameter 'project' must be a not empty string") project = check_string(body["project"], "Parameter 'project' must be a not empty string")
deploy_env = check_string(body["deploy_env"], "Parameter 'deploy_env' must be a not empty string") deploy_env = check_string(body["deploy_env"], "Parameter 'deploy_env' must be a not empty string")