From 7f676f18e9da97aac06aea6fb1b04a7d0ddc5f09 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 21 Oct 2015 14:36:08 +0300 Subject: [PATCH 1/3] rename file with DevopsError --- devops-service/exceptions/{response_error.rb => devops_error.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename devops-service/exceptions/{response_error.rb => devops_error.rb} (100%) diff --git a/devops-service/exceptions/response_error.rb b/devops-service/exceptions/devops_error.rb similarity index 100% rename from devops-service/exceptions/response_error.rb rename to devops-service/exceptions/devops_error.rb From ae667301dbfc2d4aa1654ef46c4cca1894c44666 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 21 Oct 2015 14:38:48 +0300 Subject: [PATCH 2/3] #837: change env renaming error messages --- devops-service/app/api2/handlers/project.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops-service/app/api2/handlers/project.rb b/devops-service/app/api2/handlers/project.rb index ee45024..a4d016a 100644 --- a/devops-service/app/api2/handlers/project.rb +++ b/devops-service/app/api2/handlers/project.rb @@ -119,11 +119,11 @@ module Devops begin unless env.identifier == deploy_env servers = Devops::Db.connector.servers_by_project_and_deploy_env(id, deploy_env) - raise InvalidRecord.new("Can not update environment '#{deploy_env}', there are #{servers.size} servers on it") unless servers.empty? + raise InvalidRecord.new("Environment '#{deploy_env}' can't be updated: it has #{servers.size} running servers.") unless servers.empty? end begin project.deploy_env(env.identifier) - raise InvalidRecord.new("Can not change environment '#{deploy_env}' to '#{env.identifier}', environment '#{env.identifier}' already exist") unless deploy_env == env.identifier + raise InvalidRecord.new("Environment '#{deploy_env}' can't be renamed to '#{env.identifier}', environment '#{env.identifier}' already exists") unless deploy_env == env.identifier rescue RecordNotFound => e end env.validate! From 48f8812e29cbca1e69b9a7fbcfae34d5d1d92ea2 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 21 Oct 2015 15:00:37 +0300 Subject: [PATCH 3/3] #838: fix error in devops client related to deploy_envs deleting --- devops-service/app/api2/handlers/project.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devops-service/app/api2/handlers/project.rb b/devops-service/app/api2/handlers/project.rb index a4d016a..e82616c 100644 --- a/devops-service/app/api2/handlers/project.rb +++ b/devops-service/app/api2/handlers/project.rb @@ -185,13 +185,15 @@ module Devops def delete_project id deploy_env = parser.delete - servers = Devops::Db.connector.servers id - raise DependencyError.new "Deleting #{id} is forbidden: Project has servers" if !servers.empty? project = Devops::Db.connector.project(id) - info = if deploy_env.nil? + if deploy_env.nil? + servers = Devops::Db.connector.servers id + raise DependencyError.new "Deleting project #{id} is forbidden: Project has servers" unless servers.empty? project.delete "Project '#{id}' is deleted" else + servers = Devops::Db.connector.servers id, deploy_env + raise DependencyError.new "Deleting deploy_env #{deploy_env} is forbidden: Project has servers" unless servers.empty? project.delete_deploy_env(deploy_env) "Project '#{id}'. Deploy environment '#{deploy_env}' has been deleted" end