From 22e0867b68627d4412e0c159219b538dea8ffce1 Mon Sep 17 00:00:00 2001 From: Jillian Tullo Date: Thu, 6 Apr 2017 17:03:08 -0400 Subject: [PATCH] symbolize keys that are passed to provider methods --- app/controllers/api/authentications_controller.rb | 2 +- .../api/configuration_script_sources_controller.rb | 4 ++-- lib/services/api/authentication_service.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/authentications_controller.rb b/app/controllers/api/authentications_controller.rb index 9be15e1a527..3bf7f487633 100644 --- a/app/controllers/api/authentications_controller.rb +++ b/app/controllers/api/authentications_controller.rb @@ -3,7 +3,7 @@ class AuthenticationsController < BaseController def edit_resource(type, id, data) auth = resource_search(id, type, collection_class(:authentications)) raise "Update not supported for #{authentication_ident(auth)}" unless auth.respond_to?(:update_in_provider_queue) - task_id = auth.update_in_provider_queue(data) + task_id = auth.update_in_provider_queue(data.deep_symbolize_keys) action_result(true, "Updating #{authentication_ident(auth)}", :task_id => task_id) rescue => err action_result(false, err.to_s) diff --git a/app/controllers/api/configuration_script_sources_controller.rb b/app/controllers/api/configuration_script_sources_controller.rb index d287d9e3e78..d9e8c2caec8 100644 --- a/app/controllers/api/configuration_script_sources_controller.rb +++ b/app/controllers/api/configuration_script_sources_controller.rb @@ -3,7 +3,7 @@ class ConfigurationScriptSourcesController < BaseController def edit_resource(type, id, data) config_script_src = resource_search(id, type, collection_class(:configuration_script_sources)) raise "Update not supported for #{config_script_src_ident(config_script_src)}" unless config_script_src.respond_to?(:update_in_provider_queue) - task_id = config_script_src.update_in_provider_queue(data) + task_id = config_script_src.update_in_provider_queue(data.deep_symbolize_keys) action_result(true, "Updating #{config_script_src_ident(config_script_src)}", :task_id => task_id) rescue => err action_result(false, err.to_s) @@ -25,7 +25,7 @@ def create_resource(_type, _id, data) manager = resource_search(manager_id, :providers, collection_class(:providers)) type = ConfigurationScriptSource.class_for_manager(manager) raise "ConfigurationScriptSource cannot be added to #{manager_ident(manager)}" unless type.respond_to?(:create_in_provider_queue) - task_id = type.create_in_provider_queue(manager.id, data.except('manager_resource')) + task_id = type.create_in_provider_queue(manager.id, data.except('manager_resource').deep_symbolize_keys) action_result(true, "Creating ConfigurationScriptSource for #{manager_ident(manager)}", :task_id => task_id) rescue => err action_result(false, err.to_s) diff --git a/lib/services/api/authentication_service.rb b/lib/services/api/authentication_service.rb index b1a16ee41c6..b11ab1c2332 100644 --- a/lib/services/api/authentication_service.rb +++ b/lib/services/api/authentication_service.rb @@ -4,7 +4,7 @@ def self.create_authentication_task(manager_resource, attrs) klass = ::Authentication.class_from_request_data(attrs) # TODO: Temporary validation - remove raise 'type not currently supported' unless klass.respond_to?(:create_in_provider_queue) - klass.create_in_provider_queue(manager_resource.id, attrs) + klass.create_in_provider_queue(manager_resource.id, attrs.deep_symbolize_keys) end end end