foreman_salt 14.0.0 → 15.1.0

data/app/controllers/foreman_salt/concerns/salt_variable_parameters.rb

@@ -10,11 +10,11 @@ module ForemanSalt
       class_methods do
         def salt_variable_params_filter
           Foreman::ParameterFilter.new(::ForemanSalt::SaltVariable).tap do |filter|
-            filter.permit :salt_module_id, :salt_modules => [], :salt_module_ids => [],
-                          :salt_module_names => [], :param_classes => [], :param_classes_ids => [],
-                          :param_classes_names => []
-            filter.permit_by_context :required, :nested => true
-            filter.permit_by_context :id, :ui => false, :api => false, :nested => true
+            filter.permit :salt_module_id, salt_modules: [], salt_module_ids: [],
+                                           salt_module_names: [], param_classes: [], param_classes_ids: [],
+                                           param_classes_names: []
+            filter.permit_by_context :required, nested: true
+            filter.permit_by_context :id, ui: false, api: false, nested: true
             add_lookup_key_params_filter(filter)
           end
         end

data/app/controllers/foreman_salt/minions_controller.rb

@@ -3,8 +3,8 @@ module ForemanSalt
     include ::Foreman::Controller::SmartProxyAuth
     include ::Foreman::Controller::Parameters::Host
 
-    before_action :find_resource, :only => [:node, :run]
-    add_smart_proxy_filters :node, :features => 'Salt'
+    before_action :find_resource, only: %i[node]
+    add_smart_proxy_filters :node, features: 'Salt'
 
     def node
       enc = {}
@@ -19,28 +19,19 @@ module ForemanSalt
 
       enc['environment'] = env
       respond_to do |format|
-        format.html { render :plain => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
-        format.yml  { render :plain => enc.to_yaml }
+        format.html { render plain: "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
+        format.yml  { render plain: enc.to_yaml }
       end
-    rescue
+    rescue StandardError
       logger.warn "Failed to generate external nodes for #{@minion} with #{$ERROR_INFO}"
-      render(:plain => _('Unable to generate output, Check log files\n'), :status => 412) && return
-    end
-
-    def run
-      if @minion.saltrun!
-        success _('Successfully executed, check log files for more details')
-      else
-        error @minion.errors[:base].to_sentence
-      end
-      redirect_to host_path(@minion)
+      render(plain: _('Unable to generate output, Check log files\n'), status: :precondition_failed) && return
     end
 
     def salt_environment_selected
       if params[:host][:salt_environment_id].present?
         @salt_environment = ::ForemanSalt::SaltEnvironment.friendly.find(params[:host][:salt_environment_id])
         load_ajax_vars
-        render :partial => 'foreman_salt/salt_modules/host_tab_pane'
+        render partial: 'foreman_salt/salt_modules/host_tab_pane'
       else
         logger.info 'environment_id is required to render states'
       end
@@ -48,8 +39,6 @@ module ForemanSalt
 
     def action_permission
       case params[:action]
-      when 'run'
-        :saltrun
       when 'node'
         :view
       when 'salt_environment_selected'
@@ -70,7 +59,7 @@ module ForemanSalt
     private
 
     def load_ajax_vars
-      @minion = Host::Base.authorized(:view_hosts, Host).find_by_id(params[:host_id])
+      @minion = Host::Base.authorized(:view_hosts, Host).find_by(id: params[:host_id])
       if @minion
         unless @minion.is_a?(Host::Managed)
           @minion      = @minion.becomes(Host::Managed)
@@ -82,7 +71,7 @@ module ForemanSalt
       end
 
       @obj = @minion
-      @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @minion.hostgroup ? @minion.hostgroup.all_salt_modules : [])
+      @inherited_salt_modules = @salt_environment.salt_modules.where(id: @minion.hostgroup ? @minion.hostgroup.all_salt_modules : [])
       @salt_modules = @salt_environment.salt_modules - @inherited_salt_modules
       @selected = @minion.salt_modules || []
     end

data/app/controllers/foreman_salt/salt_autosign_controller.rb

@@ -3,7 +3,7 @@ module ForemanSalt
     def index
       setup
       autosign = @api.autosign_list
-      @autosign = autosign.paginate :page => params[:page], :per_page => Setting[:entries_per_page]
+      @autosign = autosign.paginate page: params[:page], per_page: Setting[:entries_per_page]
     end
 
     def new
@@ -14,10 +14,10 @@ module ForemanSalt
       setup
 
       if @api.autosign_create(params[:id])
-        process_success(:success_redirect => hash_for_smart_proxy_salt_autosign_index_path, :success_msg => _("Autosign created for #{params[:id]}"),
-                        :object_name => params[:id])
+        process_success(success_redirect: hash_for_smart_proxy_salt_autosign_index_path, success_msg: _("Autosign created for #{params[:id]}"),
+                        object_name: params[:id])
       else
-        process_error(:redirect => hash_for_smart_proxy_salt_autosign_index_path)
+        process_error(redirect: hash_for_smart_proxy_salt_autosign_index_path)
       end
     end
 
@@ -25,10 +25,10 @@ module ForemanSalt
       setup
 
       if @api.autosign_remove(params[:id])
-        process_success(:success_redirect => hash_for_smart_proxy_salt_autosign_index_path, :success_msg => _("Autosign deleted for #{params[:id]}"),
-                        :object_name => params[:id])
+        process_success(success_redirect: hash_for_smart_proxy_salt_autosign_index_path, success_msg: _("Autosign deleted for #{params[:id]}"),
+                        object_name: params[:id])
       else
-        process_error(:redirect => hash_for_smart_proxy_salt_autosign_index_path)
+        process_error(redirect: hash_for_smart_proxy_salt_autosign_index_path)
       end
     end
 
@@ -36,7 +36,7 @@ module ForemanSalt
 
     def setup
       @proxy = SmartProxy.authorized(:view_smart_proxies_salt_autosign).find(params[:smart_proxy_id])
-      @api = ProxyAPI::Salt.new(:url => @proxy.url)
+      @api = ProxyAPI::Salt.new(url: @proxy.url)
     end
   end
 end

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -3,10 +3,10 @@ module ForemanSalt
     include Foreman::Controller::AutoCompleteSearch
     include ::ForemanSalt::Concerns::SaltEnvironmentParameters
 
-    before_action :find_resource, :only => [:edit, :update, :destroy]
+    before_action :find_resource, only: %i[edit update destroy]
 
     def index
-      @salt_environments = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+      @salt_environments = resource_base.search_for(params[:search], order: params[:order]).paginate(page: params[:page])
     end
 
     def new
@@ -26,8 +26,8 @@ module ForemanSalt
     end
 
     def update
-      if @salt_environment.update_attributes(salt_environment_params)
-        success _('Successfully updated %s.' % @salt_environment.to_s)
+      if @salt_environment.update(salt_environment_params)
+        success _("Successfully updated #{@salt_environment}")
         redirect_to salt_environments_path
       else
         process_error

data/app/controllers/foreman_salt/salt_keys_controller.rb

@@ -7,19 +7,19 @@ module ForemanSalt
       keys = if params[:state].blank?
                SmartProxies::SaltKeys.all @proxy
              else
-               SmartProxies::SaltKeys.find_by_state @proxy, params[:state].downcase
+               SmartProxies::SaltKeys.find_by_state(@proxy, params[:state].downcase)
              end
-      @keys = keys.sort.paginate :page => params[:page], :per_page => Setting[:entries_per_page]
+      @keys = keys.sort.paginate page: params[:page], per_page: Setting[:entries_per_page]
     end
 
     def accept
       @proxy = find_proxy(:edit_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:salt_key_id])
       if key.accept
-        process_success(:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),
-                        :success_msg => _("Key accepted for #{key}"), :object_name => key.to_s)
+        process_success(success_redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true),
+                        success_msg: _("Key accepted for #{key}"), object_name: key.to_s)
       else
-        process_error(:redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true))
+        process_error(redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true))
       end
     end
 
@@ -27,10 +27,10 @@ module ForemanSalt
       @proxy = find_proxy(:edit_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:salt_key_id])
       if key.reject
-        process_success(:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),
-                        :success_msg => _("Key rejected for #{key}"), :object_name => key.to_s)
+        process_success(success_redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true),
+                        success_msg: _("Key rejected for #{key}"), object_name: key.to_s)
       else
-        process_error(:redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true))
+        process_error(redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true))
       end
     end
 
@@ -38,10 +38,10 @@ module ForemanSalt
       @proxy = find_proxy(:destroy_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:id])
       if key.delete
-        process_success(:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),
-                        :success_msg => _("Key deleted for #{key}"), :object_name => key.to_s)
+        process_success(success_redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true),
+                        success_msg: _("Key deleted for #{key}"), object_name: key.to_s)
       else
-        process_error(:redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true))
+        process_error(redirect: hash_for_smart_proxy_salt_keys_path(state: params[:state], expire_cache: true))
       end
     end
 

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -4,11 +4,11 @@ module ForemanSalt
     include ::ForemanSalt::Concerns::SaltModuleParameters
     include StateImporter
 
-    before_action :find_resource, :only => [:edit, :update, :destroy]
-    before_action :find_proxy, :only => :import
+    before_action :find_resource, only: %i[edit update destroy]
+    before_action :find_proxy, only: :import
 
     def index
-      @salt_modules = resource_base.search_for(params[:search], :order => params[:order]).includes(:salt_environments).paginate(:page => params[:page])
+      @salt_modules = resource_base.search_for(params[:search], order: params[:order]).includes(:salt_environments).paginate(page: params[:page])
     end
 
     def new
@@ -30,8 +30,8 @@ module ForemanSalt
     end
 
     def update
-      if @salt_module.update_attributes(salt_module_params)
-        success _('Successfully updated %s.' % @salt_module.to_s)
+      if @salt_module.update(salt_module_params)
+        success _("Successfully updated #{@salt_module}.")
         redirect_to salt_modules_path
       else
         process_error
@@ -62,10 +62,9 @@ module ForemanSalt
       @changes = result[:changes]
       @deletes = result[:deletes]
 
-      if @changes.empty?
-        info _('No changes found')
-        redirect_to salt_modules_path
-      end
+      return unless @changes.empty?
+      info _('No changes found')
+      redirect_to salt_modules_path
     end
 
     def apply_changes
@@ -75,8 +74,8 @@ module ForemanSalt
         params[:changed].each do |environment, states|
           next unless states[:add] || states[:remove]
 
-          add_to_environment(JSON.load(states[:add]), environment) if states[:add]
-          remove_from_environment(JSON.load(states[:remove]), environment) if states[:remove]
+          add_to_environment(JSON.parse(states[:add]), environment) if states[:add]
+          remove_from_environment(JSON.parse(states[:remove]), environment) if states[:remove]
         end
 
         clean_orphans

data/app/controllers/foreman_salt/salt_variables_controller.rb

@@ -6,12 +6,12 @@ module ForemanSalt
     include Foreman::Controller::AutoCompleteSearch
     include ::ForemanSalt::Concerns::SaltVariableParameters
 
-    before_action :find_resource, :only => [:edit, :update, :destroy], :if => proc { params[:id] }
+    before_action :find_resource, only: %i[edit update destroy], if: proc { params[:id] }
 
     def index
       @salt_variables = resource_base.search_for(params[:search],
-                                                 :order => params[:order]).paginate(:page => params[:page],
-                                                 :per_page => params[:per_page])
+        order: params[:order]).paginate(page: params[:page],
+                                        per_page: params[:per_page])
     end
 
     def new
@@ -33,7 +33,8 @@ module ForemanSalt
 
     private
 
-    def default_order; end
+    def default_order
+    end
 
     def resource
       @salt_variable

data/app/controllers/foreman_salt/state_importer.rb

@@ -10,10 +10,10 @@ module ForemanSalt
     end
 
     def fetch_states_from_proxy(proxy, environments = nil)
-      result = { :changes => {},
-                 :deletes => [] }
+      result = { changes: {},
+                 deletes: [] }
 
-      new = ProxyAPI::Salt.new(:url => proxy.url).states_list
+      new = ProxyAPI::Salt.new(url: proxy.url).states_list
       old = SaltModule.to_hash
 
       environments ||= new.keys + old.keys
@@ -30,26 +30,25 @@ module ForemanSalt
           removed = []
         end
 
-        if added.any? || removed.any?
-          result[:changes][environment] = {}
+        next unless added.any? || removed.any?
+        result[:changes][environment] = {}
 
-          unless removed.blank?
-            result[:changes][environment][:remove] = removed
-            result[:deletes] << environment if removed.count == old[environment].count && added.blank?
-          end
-
-          result[:changes][environment][:add] = added unless added.blank?
+        if removed.present?
+          result[:changes][environment][:remove] = removed
+          result[:deletes] << environment if removed.count == old[environment].count && added.blank?
         end
+
+        result[:changes][environment][:add] = added if added.present?
       end
 
       result
     end
 
     def add_to_environment(states, environment)
-      environment = SaltEnvironment.where(:name => environment).first_or_create
+      environment = SaltEnvironment.where(name: environment).first_or_create
 
       states.each do |state_name|
-        state = SaltModule.where(:name => state_name).first_or_create
+        state = SaltModule.where(name: state_name).first_or_create
         state.salt_environments << environment unless state.salt_environments.include? environment
       end
     end

data/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb

@@ -5,29 +5,19 @@ module ForemanSalt
     module Overrides
       def show_appropriate_host_buttons(host)
         (super(host) +
-         [(link_to_if_authorized(_('Salt ENC'), { :controller => :'foreman_salt/minions', :action => :node, :id => host },
-                                 :title => _('Salt external nodes YAML dump'), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
-      end
-
-      def host_title_actions(host)
-        unless Setting[:salt_hide_run_salt_button]
-          title_actions(
-            button_group(
-              if host.try(:salt_proxy)
-                link_to_if_authorized(_('Run Salt'), { :controller => :'foreman_salt/minions', :action => :run, :id => host },
-                                      :title => _('Trigger a state.highstate run on a node'), :class => 'btn btn-primary')
-            end
-            )
-          )
-        end
-        super(host)
+         [(if host.salt_master.present?
+             link_to_if_authorized(_('Salt ENC'), { controller: :'foreman_salt/minions', action: :node, id: host },
+               title: _('Salt external nodes YAML dump'), class: 'btn btn-default')
+           end)]).flatten.compact
       end
 
       def multiple_actions
         actions = super
-        if authorized_for(:controller => :hosts, :action => :edit)
-          actions << [_('Change Salt Master'), select_multiple_salt_master_hosts_path] if SmartProxy.unscoped.authorized.with_features("Salt")
-          actions << [_('Change Salt Environment'), select_multiple_salt_environment_hosts_path] if SmartProxy.unscoped.authorized.with_features("Salt")
+        if authorized_for(controller: :hosts, action: :edit)
+          actions << [_('Change Salt Master'), select_multiple_salt_master_hosts_path] if SmartProxy.unscoped.authorized.with_features('Salt')
+          if SmartProxy.unscoped.authorized.with_features('Salt')
+            actions << [_('Change Salt Environment'), select_multiple_salt_environment_hosts_path]
+          end
         end
         actions
       end
@@ -35,8 +25,10 @@ module ForemanSalt
       def overview_fields(host)
         fields = super(host)
 
-        fields.insert(5, [_('Salt Master'), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
-        fields.insert(6, [_('Salt Environment'), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
+        fields.insert(5, [_('Salt Master'), (link_to(host.salt_proxy, hosts_path(search: "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
+        fields.insert(6, [_('Salt Environment'), (if host.salt_environment
+                                                    link_to(host.salt_environment, hosts_path(search: "salt_environment = #{host.salt_environment}"))
+                                                  end)])
 
         fields
       end

data/app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb

@@ -7,8 +7,8 @@ module ForemanSalt
         actions = super
 
         if proxy.has_feature?('Salt')
-          actions << display_link_if_authorized(_('Salt Keys'), :controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy)
-          actions << display_link_if_authorized(_('Salt Autosign'), :controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy)
+          actions << display_link_if_authorized(_('Salt Keys'), controller: 'foreman_salt/salt_keys', action: 'index', smart_proxy_id: proxy)
+          actions << display_link_if_authorized(_('Salt Autosign'), controller: 'foreman_salt/salt_autosign', action: 'index', smart_proxy_id: proxy)
         end
 
         actions

data/app/helpers/foreman_salt/salt_keys_helper.rb

@@ -2,7 +2,8 @@ module ForemanSalt
   module SaltKeysHelper
     def salt_keys_state_filter
       select_tag 'Filter', options_for_select(['', _('Accepted'), _('Rejected'), _('Unaccepted')], params[:state]),
-                 :onchange => "window.location.href = location.protocol + '//' + location.host + location.pathname + (this.value == '' ? '' : ('?state=' + this.value))"
+        onchange: "window.location.href = location.protocol + '//' + " \
+        "location.host + location.pathname + (this.value == '' ? '' : ('?state=' + this.value))"
     end
   end
 end

data/app/helpers/foreman_salt/salt_modules_helper.rb

@@ -2,29 +2,29 @@ module ForemanSalt
   module SaltModulesHelper
     def import_from_proxies
       links = SmartProxy.with_features('Salt').map do |proxy|
-        display_link_if_authorized(_('Import from %s') % proxy.name, hash_for_import_salt_modules_path.merge(:proxy => proxy), :class => 'btn btn-default')
+        display_link_if_authorized(_('Import from %s') % proxy.name, hash_for_import_salt_modules_path.merge(proxy: proxy), class: 'btn btn-default')
       end.flatten
 
       select_action_button(_('Import'), {}, links)
     end
 
     def salt_module_select(form, persisted)
-      blank_opt = persisted ? {} : { :include_blank => true }
+      blank_opt = persisted ? {} : { include_blank: true }
       select_items = persisted ? [form.object.salt_module] : SaltModule.order(:name)
       select_f form,
-               :salt_module_id,
-               select_items,
-               :id,
-               :to_label,
-               blank_opt,
-               :label => _('Salt State'),
-               :disabled => persisted,
-               :required => true
+        :salt_module_id,
+        select_items,
+        :id,
+        :to_label,
+        blank_opt,
+        label: _('Salt State'),
+        disabled: persisted,
+        required: true
     end
 
     def colorize(state)
       # Make the state easier to read
-      combo = %w(2E9DB9 4D1D59 2C777E 1C4758 591D4B)
+      combo = %w[2E9DB9 4D1D59 2C777E 1C4758 591D4B]
       state.split('.').each_with_index.map do |section, index|
         "<span style='color: ##{combo[index % 5]}; font-weight: bold;'>#{section}</span>"
       end.join('.').html_safe

data/app/helpers/foreman_salt/salt_reports_helper.rb

@@ -5,4 +5,3 @@ module ForemanSalt
     end
   end
 end
-

data/app/lib/actions/foreman_salt/report_import.rb

@@ -6,14 +6,14 @@ module Actions
       end
 
       def plan(job, proxy_id)
-        plan_self(:job_id => job[:job_id], :report => job[:result], :proxy_id => proxy_id)
+        plan_self(job_id: job[:job_id], report: job[:result], proxy_id: proxy_id)
       end
 
       def run
         ::User.as_anonymous_admin do
           reports = ::ForemanSalt::ReportImporter.import(input[:report], input[:proxy_id])
 
-          output[:state] = { :message => "Imported #{reports.count} new reports" }
+          output[:state] = { message: "Imported #{reports.count} new reports" }
           output[:hosts] = reports.map { |report| report.host.name }
         end
       end

data/app/lib/proxy_api/salt.rb

@@ -1,47 +1,47 @@
 module ::ProxyAPI
   class Salt < ::ProxyAPI::Resource
     def initialize(args)
-      @url  = args[:url] + '/salt/'
+      @url = "#{args[:url]}/salt/"
       super args
     end
 
     def autosign_list
       parse(get('autosign'))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to fetch autosign list'))
     end
 
     def autosign_create(name)
-      parse(post('', "autosign/#{URI.escape(name)}"))
-    rescue => e
+      parse(post('', "autosign/#{CGI.escape(name)}"))
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to set Salt autosign hostname for %s'), name)
     end
 
     def autosign_remove(name)
-      parse(delete("autosign/#{URI.escape(name)}"))
+      parse(delete("autosign/#{CGI.escape(name)}"))
     rescue RestClient::ResourceNotFound
       true # entry doesn't exists anyway
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to delete Salt autosign hostname for %s'), name)
     end
 
     def autosign_create_key(key)
-      parse(post('', "autosign_key/#{URI.escape(key)}"))
-    rescue => e
+      parse(post('', "autosign_key/#{CGI.escape(key)}"))
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to create Salt autosign key %s'), key)
     end
 
     def autosign_remove_key(key)
-      parse(delete("autosign_key/#{URI.escape(key)}"))
+      parse(delete("autosign_key/#{CGI.escape(key)}"))
     rescue RestClient::ResourceNotFound
       true # entry doesn't exists anyway
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to delete Salt autosign key %s'), key)
     end
 
     def environments_list
       parse(get('environments'))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to fetch Salt environments list'))
     end
 
@@ -53,25 +53,25 @@ module ::ProxyAPI
       end
 
       states
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to fetch Salt states list'))
     end
 
     def key_list
       parse(get('key'))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to fetch Salt key list'))
     end
 
     def key_accept(name)
       parse(post('', "key/#{name}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to accept Salt key for %s'), name)
     end
 
     def key_reject(name)
       parse(delete("key/reject/#{name}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to reject Salt key for %s'), name)
     end
 
@@ -79,13 +79,13 @@ module ::ProxyAPI
       parse(delete("key/#{name}"))
     rescue RestClient::ResourceNotFound
       true
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to delete Salt key for %s'), name)
     end
 
     def highstate(name)
       parse(post('', "highstate/#{name}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to run Salt state.highstate for %s'), name)
     end
   end