From ecbb40ce071173c4a61f65bbe88a92371362ca8c Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Mon, 6 Jul 2015 16:09:48 +0400 Subject: [PATCH] fix creating new keys --- devops-service/db/validators/key/scope.rb | 2 +- devops-service/routes/v2.0/handlers/key.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devops-service/db/validators/key/scope.rb b/devops-service/db/validators/key/scope.rb index 0e89a03..136169c 100644 --- a/devops-service/db/validators/key/scope.rb +++ b/devops-service/db/validators/key/scope.rb @@ -2,7 +2,7 @@ module Validators class Key::Scope < Base def valid? - [::Key::SYSTEM, ::Key::USER].include?(@model.scope) + [Devops::Model::Key::SYSTEM, Devops::Model::Key::USER].include?(@model.scope) end def message diff --git a/devops-service/routes/v2.0/handlers/key.rb b/devops-service/routes/v2.0/handlers/key.rb index ab824f6..fb96bd9 100644 --- a/devops-service/routes/v2.0/handlers/key.rb +++ b/devops-service/routes/v2.0/handlers/key.rb @@ -19,14 +19,14 @@ module Devops fname = check_filename(key["file_name"], "Parameter 'file_name' must be a not empty string") kname = check_string(key["key_name"], "Parameter 'key_name' should be a not empty string") content = check_string(key["content"], "Parameter 'content' should be a not empty string") - file_name = File.join(DevopsService.config[:keys_dir], fname) + file_name = File.join(settings.keys_dir, fname) halt(400, "File '#{fname}' already exist") if File.exists?(file_name) File.open(file_name, "w") do |f| f.write(content) f.chmod(0400) end - key = Key.new({"path" => file_name, "id" => kname}) + key = Devops::Model::Key.new({"path" => file_name, "id" => kname}) settings.mongo.key_insert key create_response("Created", nil, 201) }