foreman_salt 14.0.0 → 14.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287507e11ca2f63bc8341eae5bc832e7d95ad5b848922b9eba44b85486fd9dc3
-  data.tar.gz: e1a70ace048abbcf30d57e0631f8b1ad1627bbad3c5261b2196d0a92663ef833
+  metadata.gz: '083d09f673c4a240a307a4392a31ce92f1c17c7a11706f751caa13482059ebcb'
+  data.tar.gz: ffd19624c13fc45f5c68c280e0700c16d8ef0d60a9df88371e5b14f783d63212
 SHA512:
-  metadata.gz: '08395ab98cb79f8dfc725268cfcb9dc8b11c015562625ea56f90315edaa9bcf1c76601d123481d57eed865212cc7212cfa36be6ea1506d8e59d1ac15afaa5f2b'
-  data.tar.gz: f7a59b6f52e80340520a8ed4523e39727659612a737fb848c33731013684f09dcbe83e27c02c928a22614f18842120ce3d53908bc2ec4176a153bb69c2124527
+  metadata.gz: 2ed29a4e256bc28f857fc6c3597f6b25a1d828b44ee4e50f851dcf3928b21b9d2d6f13c93848e06ca630f55bf3f824ea33a71c2e641591ae28925e1f6b73aa26
+  data.tar.gz: ba3b5cefb64dd18a6c3817fd6abf8016ecbfa86111e52349ebd68676225a003093998265deea497f57c14000971c06c074224f55d646721384cabf2c22173740

data/README.md

@@ -21,7 +21,7 @@ This plug-in adds support for Salt to Foreman.
 
 ## Documentation
 
-See the [Foreman Salt manuals](http://theforeman.org/plugins/foreman_salt/) on the Foreman web site.
+[Using Salt for Configuration Management](https://docs.theforeman.org/nightly/Managing_Hosts/index-foreman-el.html#using-salt-for-configuration-management_managing-hosts)
 
 ## Contributing
 
@@ -43,4 +43,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -34,4 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task :default => :test
+task default: :test

data/app/controllers/foreman_salt/api/v2/jobs_controller.rb

@@ -5,21 +5,21 @@ module ForemanSalt
     module V2
       class JobsController < ::ForemanSalt::Api::V2::BaseController
         include ::Foreman::Controller::SmartProxyAuth
-        add_smart_proxy_filters :upload, :features => 'Salt'
+        add_smart_proxy_filters :upload, features: 'Salt'
 
         include ::Foreman::Controller::FilterParameters
         filter_parameters :job
 
         def_param_group :job do
-          param :job, Hash, :required => true, :action_aware => true do
-            param :job_id, Integer, :required => true, :desc => N_('JID')
-            param :function, String, :required => true, :desc => N_('Function')
-            param :result, Hash, :required => true, :desc => N_('Result')
+          param :job, Hash, required: true, action_aware: true do
+            param :job_id, Integer, required: true, desc: N_('JID')
+            param :function, String, required: true, desc: N_('Function')
+            param :result, Hash, required: true, desc: N_('Result')
           end
         end
 
         api :POST, '/upload', N_('Upload a Job')
-        param_group :job, :as => :upload
+        param_group :job, as: :upload
 
         def upload
           params[:job].permit!
@@ -27,12 +27,12 @@ module ForemanSalt
           case params[:job][:function]
           when 'state.highstate'
             task = ForemanTasks.async_task(::Actions::ForemanSalt::ReportImport, params[:job], detected_proxy.try(:id))
-            render :json => { :task_id => task.id }
+            render json: { task_id: task.id }
           else
-            render :json => { :message => 'Unsupported function' }, :status => :unprocessable_entity
+            render json: { message: 'Unsupported function' }, status: :unprocessable_entity
           end
         rescue ::Foreman::Exception => e
-          render :json => { :message => e.to_s }, :status => :unprocessable_entity
+          render json: { message: e.to_s }, status: :unprocessable_entity
         end
 
         def resource_class

data/app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb

@@ -15,37 +15,38 @@ module ForemanSalt
         before_action :setup_proxy
 
         api :GET, '/salt_autosign/:smart_proxy_id', N_('List all autosign records')
-        param :smart_proxy_id, :identifier_dottable, :required => true
+        param :smart_proxy_id, :identifier_dottable, required: true
         def index
           @salt_autosigns = all_autosign
         end
 
         api :POST, '/salt_autosign/:smart_proxy_id', N_('Create an autosign record')
-        param :smart_proxy_id, :identifier_dottable, :required => true
-        param :record, String, :required => true, :desc => N_('Autosign record')
+        param :smart_proxy_id, :identifier_dottable, required: true
+        param :record, String, required: true, desc: N_('Autosign record')
         def create
           @api.autosign_create params[:record]
-          @salt_autosign = { :record => params[:record] }
+          @salt_autosign = { record: params[:record] }
         end
 
         api :DELETE, '/salt_autosign/:smart_proxy_id/:record', N_('Delete an autosign record')
-        param :smart_proxy_id, :identifier_dottable, :required => true
-        param :record, String, :required => true, :desc => N_('Autosign record')
+        param :smart_proxy_id, :identifier_dottable, required: true
+        param :record, String, required: true, desc: N_('Autosign record')
         def destroy
           @api.autosign_remove params[:record]
-          render :json => { root_node_name => _('Record deleted.') }
+          render json: { root_node_name => _('Record deleted.') }
         end
 
-        api :PUT, '/salt_autosign_auth', N_("Set the salt_status as \'successful authentication\' and remove the corresponding autosign key from the Smart Proxy")
-        param :name, String, :required => true
+        api :PUT, '/salt_autosign_auth',
+          N_("Set the salt_status as \'successful authentication\' and remove the corresponding autosign key from the Smart Proxy")
+        param :name, String, required: true
         def auth
           Rails.logger.info("Removing Salt autosign key and update status for host #{@host}")
           @api.autosign_remove_key(@host.salt_autosign_key) unless @host.salt_autosign_key.nil?
-          @host.update(:salt_status => ForemanSalt::SaltStatus.minion_auth_success)
-          render :json => { :message => "Removed autosign key and updated status succesfully" }, :status => 204
+          @host.update(salt_status: ForemanSalt::SaltStatus.minion_auth_success)
+          render json: { message: 'Removed autosign key and updated status succesfully' }, status: :no_content
         rescue ::Foreman::Exception => e
           Rails.logger.warn("Cannot delete autosign key of host (id => #{params[:name]}) state: #{e}")
-          render :json => { :message => e.to_s }, :status => :unprocessable_entity
+          render json: { message: e.to_s }, status: :unprocessable_entity
         end
 
         def metadata_total
@@ -67,7 +68,7 @@ module ForemanSalt
         private
 
         def all_autosign
-          @_autosigns ||= @api.autosign_list.map { |record| OpenStruct.new(:record => record) }
+          @_autosigns ||= @api.autosign_list.map { |record| OpenStruct.new(record: record) }
         end
 
         def find_host
@@ -86,7 +87,7 @@ module ForemanSalt
         end
 
         def setup_proxy
-          @api = ProxyAPI::Salt.new(:url => @proxy.url)
+          @api = ProxyAPI::Salt.new(url: @proxy.url)
         end
       end
     end

data/app/controllers/foreman_salt/api/v2/salt_environments_controller.rb

@@ -4,7 +4,7 @@ module ForemanSalt
       class SaltEnvironmentsController < ::ForemanSalt::Api::V2::BaseController
         include ::ForemanSalt::Concerns::SaltEnvironmentParameters
 
-        before_action :find_resource, :except => [:index, :create]
+        before_action :find_resource, except: %i[index create]
 
         api :GET, '/salt_environments', N_('List all Salt environments')
         param_group :search_and_pagination, ::Api::V2::BaseController
@@ -13,25 +13,25 @@ module ForemanSalt
         end
 
         api :GET, '/salt_environments/:id/', N_('Show a Salt environment')
-        param :id, :identifier_dottable, :required => true
+        param :id, :identifier_dottable, required: true
         def show
         end
 
         def_param_group :environment do
-          param :environment, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true
+          param :environment, Hash, required: true, action_aware: true do
+            param :name, String, required: true
           end
         end
 
         api :POST, '/salt_environments', N_('Create a Salt environment')
-        param_group :environment, :as => :create
+        param_group :environment, as: :create
         def create
           @salt_environment = SaltEnvironment.new(salt_environment_params)
           process_response @salt_environment.save
         end
 
         api :DELETE, '/salt_environments/:id/', N_('Destroy a Salt environment')
-        param :id, :identifier, :required => true
+        param :id, :identifier, required: true
         def destroy
           process_response @salt_environment.destroy
         end

data/app/controllers/foreman_salt/api/v2/salt_hostgroups_controller.rb

@@ -0,0 +1,42 @@
+module ForemanSalt
+  module Api
+    module V2
+      class SaltHostgroupsController < ::ForemanSalt::Api::V2::BaseController
+        include ::ForemanSalt::Concerns::SaltHostgroupParameters
+
+        before_action :find_resource
+
+        api :GET, '/hostgroups/:id', N_('Show the Salt parameters of a host group')
+        param :id, :identifier_dottable, required: true, desc: N_('ID of host group')
+        def show
+          @salt_hostgroup
+        end
+
+        def_param_group :salt_attributes do
+          param :hostgroup, Hash, required: true, action_aware: true do
+            param :salt_environment_id, :number, desc: N_('Salt environment ID')
+            param :salt_proxy_id, :number, desc: N_('Salt master/smart proxy ID')
+            param :salt_state_ids, Array, desc: N_('Array of Salt state IDs')
+          end
+        end
+
+        api :PUT, '/hostgroups/:id', N_('Update the Salt parameters of a host group')
+        param :id, :identifier_dottable, required: true, desc: N_('ID of host group')
+        param_group :salt_attributes
+        def update
+          params.extract!(:salt_hostgroup) if params[:salt_hostgroup]
+          params[:hostgroup][:salt_module_ids] = params[:hostgroup].delete(:salt_state_ids) if params[:hostgroup][:salt_state_ids]
+          process_response @salt_hostgroup.update(salt_hostgroup_params)
+        end
+
+        def controller_permission
+          'hostgroups'
+        end
+
+        def resource_class
+          Hostgroup
+        end
+      end
+    end
+  end
+end

data/app/controllers/foreman_salt/api/v2/salt_keys_controller.rb

@@ -3,23 +3,23 @@ module ForemanSalt
     module V2
       class SaltKeysController < ::ForemanSalt::Api::V2::BaseController
         before_action :find_proxy
-        before_action :find_key, :only => [:update, :destroy]
+        before_action :find_key, only: %i[update destroy]
 
         api :GET, '/salt_keys/:smart_proxy_id', N_('List all Salt keys')
-        param :smart_proxy_id, :identifier_dottable, :required => true
+        param :smart_proxy_id, :identifier_dottable, required: true
         def index
           @salt_keys = all_keys
         end
 
         def_param_group :key do
-          param :smart_proxy_id, :identifier_dottable, :required => true
-          param :name, String, :required => true, :desc => N_('FQDN of host that key belongs to')
+          param :smart_proxy_id, :identifier_dottable, required: true
+          param :name, String, required: true, desc: N_('FQDN of host that key belongs to')
         end
 
         api :PUT, '/salt_keys/:smart_proxy_id/:name', N_('Update a Salt Key')
-        param :name, :identifier_dottable, :required => true
-        param :smart_proxy_id, :identifier_dottable, :required => true
-        param :state, String, :required => true, :desc => N_('State can be "accepted" or "rejected"')
+        param :name, :identifier_dottable, required: true
+        param :smart_proxy_id, :identifier_dottable, required: true
+        param :state, String, required: true, desc: N_('State can be "accepted" or "rejected"')
         def update
           case params[:salt_key][:state]
           when 'accepted'
@@ -32,14 +32,14 @@ module ForemanSalt
         end
 
         api :DELETE, '/salt_keys/:smart_proxy_id/:name', N_('Delete a Salt Key')
-        param_group :key, :as => :destroy
+        param_group :key, as: :destroy
         def destroy
-          if @key.delete
-            message = 'Key successfully deleted.'
-          else
-            message = 'Unable to delete key.'
-          end
-          render :json => { root_node_name => message }
+          message = if @key.delete
+                      'Key successfully deleted.'
+                    else
+                      'Unable to delete key.'
+                    end
+          render json: { root_node_name => message }
         end
 
         def metadata_total

data/app/controllers/foreman_salt/api/v2/salt_minions_controller.rb

@@ -2,7 +2,7 @@ module ForemanSalt
   module Api
     module V2
       class SaltMinionsController < ::ForemanSalt::Api::V2::BaseController
-        before_action :find_resource, :except => [:index]
+        before_action :find_resource, except: [:index]
 
         api :GET, '/salt_minions', N_('List all Salt Minions')
         param_group :search_and_pagination, ::Api::V2::BaseController
@@ -11,25 +11,25 @@ module ForemanSalt
         end
 
         api :GET, '/salt_minions/:id', N_('Show a minion')
-        param :id, :identifier_dottable, :required => true
+        param :id, :identifier_dottable, required: true
         def show
           @salt_states = @salt_minion.salt_modules
         end
 
         def_param_group :minion do
-          param :minion, Hash, :required => true, :action_aware => true do
-            param :salt_environment_id, :number, :desc => N_('Salt environment ID')
-            param :salt_proxy_id, :number, :desc => N_('ID of Salt Proxy')
-            param :salt_state_ids, Array, :desc => N_('Array of State ids')
+          param :minion, Hash, required: true, action_aware: true do
+            param :salt_environment_id, :number, desc: N_('Salt environment ID')
+            param :salt_proxy_id, :number, desc: N_('ID of Salt Proxy')
+            param :salt_state_ids, Array, desc: N_('Array of State ids')
           end
         end
 
         api :PUT, '/salt_minions/:id/', N_('Update a minion')
-        param :id, :identifier_dottable, :required => true
+        param :id, :identifier_dottable, required: true
         param_group :minion
         def update
           params[:minion][:salt_module_ids] = params[:minion].delete(:salt_state_ids) if params[:minion]
-          process_response @salt_minion.update_attributes(params.require(:minion).permit(:salt_proxy_id, :salt_environment_id, :salt_module_ids => []))
+          process_response @salt_minion.update(params.require(:minion).permit(:salt_proxy_id, :salt_environment_id, salt_module_ids: []))
         end
 
         def controller_permission

data/app/controllers/foreman_salt/api/v2/salt_states_controller.rb

@@ -5,60 +5,59 @@ module ForemanSalt
         include ::ForemanSalt::Concerns::SaltModuleParameters
         include StateImporter
 
-        before_action :find_resource, :except => [:index, :create, :import]
-        before_action :find_proxy, :only => :import
-        before_action :find_environment, :only => :index
+        before_action :find_resource, except: %i[index create import]
+        before_action :find_proxy, only: :import
+        before_action :find_environment, only: :index
 
         api :GET, '/salt_states', N_('List all Salt states')
-        param :salt_environment_id, :identifier_dottable, :required => false, :desc => N_('Limit to a specific environment')
+        param :salt_environment_id, :identifier_dottable, required: false, desc: N_('Limit to a specific environment')
         param_group :search_and_pagination, ::Api::V2::BaseController
         def index
-          if @salt_environment
-            @salt_states = resource_scope_for_index.joins(:salt_environments).where('salt_module_environments.salt_environment_id' => @salt_environment)
-          else
-            @salt_states = resource_scope_for_index
-          end
+          @salt_states = if @salt_environment
+                           resource_scope_for_index.joins(:salt_environments)
+                                                   .where('salt_module_environments.salt_environment_id' => @salt_environment)
+                         else
+                           resource_scope_for_index
+                         end
 
           @subtotal = @salt_states.count
         end
 
         api :GET, '/salt_states/:id/', N_('Show a state')
-        param :id, :identifier_dottable, :required => true
+        param :id, :identifier_dottable, required: true
         def show
         end
 
         def_param_group :state do
-          param :state, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true, :desc => N_('Name of the Salt state')
+          param :state, Hash, required: true, action_aware: true do
+            param :name, String, required: true, desc: N_('Name of the Salt state')
           end
         end
 
         api :POST, '/salt_states', N_('Create a state')
-        param_group :state, :as => :create
+        param_group :state, as: :create
         def create
           @salt_state = SaltModule.new(salt_module_params)
           process_response @salt_state.save
         end
 
         api :DELETE, '/salt_states/:id/', N_('Destroy a state')
-        param :id, :identifier_dottable, :required => true
+        param :id, :identifier_dottable, required: true
         def destroy
           process_response @salt_state.destroy
         end
 
         api :POST, '/salt_states/import/:smart_proxy_id', N_('Import states from a salt master')
-        param :smart_proxy_id, :identifier_dottable, :required => true, :desc => N_('Salt Smart Proxy ID')
-        param :salt_environments, Array, :required => false, :desc => N_('Limit to a specific environments')
-        param :actions, Array, :required => false, :desc => N_('Limit to specific actions: i.e. add, remove')
-        param :dryrun, :bool, :required => false, :desc => N_('Dryrun only')
+        param :smart_proxy_id, :identifier_dottable, required: true, desc: N_('Salt Smart Proxy ID')
+        param :salt_environments, Array, required: false, desc: N_('Limit to a specific environments')
+        param :actions, Array, required: false, desc: N_('Limit to specific actions: i.e. add, remove')
+        param :dryrun, :bool, required: false, desc: N_('Dryrun only')
         def import
           states = fetch_states_from_proxy(@proxy, params[:salt_environments])
 
           unless params[:dryrun]
             states[:changes].each do |environment, state|
-              if state[:add].present? && (params[:actions].blank? || params[:actions].include?('add'))
-                add_to_environment(state[:add], environment)
-              end
+              add_to_environment(state[:add], environment) if state[:add].present? && (params[:actions].blank? || params[:actions].include?('add'))
 
               if state[:remove].present? && (params[:actions].blank? || params[:actions].include?('remove'))
                 remove_from_environment(state[:remove], environment)
@@ -66,7 +65,7 @@ module ForemanSalt
             end
             clean_orphans
           end
-          render :plain => states.to_json
+          render plain: states.to_json
         end
 
         def controller_permission
@@ -89,10 +88,9 @@ module ForemanSalt
         private
 
         def find_environment
-          if params[:salt_environment_id]
-            @salt_environment = ForemanSalt::SaltEnvironment.friendly.find(params[:salt_environment_id])
-            fail _('Could not find salt environment with id %s') % params[:salt_environment_id] unless @salt_environment
-          end
+          return unless params[:salt_environment_id]
+          @salt_environment = ForemanSalt::SaltEnvironment.friendly.find(params[:salt_environment_id])
+          raise _('Could not find salt environment with id %s') % params[:salt_environment_id] unless @salt_environment
         end
       end
     end

data/app/controllers/foreman_salt/api/v2/salt_variables_controller.rb

@@ -7,12 +7,13 @@ module ForemanSalt
       class SaltVariablesController < ::ForemanSalt::Api::V2::BaseController
         include ::ForemanSalt::Concerns::SaltVariableParameters
 
-        wrap_parameters :salt_variable, :include => salt_variable_params_filter.accessible_attributes(parameter_filter_context) + ['salt_state_id']
-        before_action :find_resource, :only => [:show, :destroy, :update]
+        wrap_parameters :salt_variable, include: salt_variable_params_filter.accessible_attributes(parameter_filter_context) + ['salt_state_id']
+        before_action :find_resource, only: %i[show destroy update]
 
         api :GET, '/salt_variables/:id', N_('Show variable')
-        param :id, :identifier, :required => true
-        def show; end
+        param :id, :identifier, required: true
+        def show
+        end
 
         api :GET, '/salt_variables', N_('List Salt variables')
         param_group :search_and_pagination, ::Api::V2::BaseController
@@ -21,31 +22,31 @@ module ForemanSalt
         end
 
         api :DELETE, '/salt_variables/:id', N_('Deletes Salt variable')
-        param :id, :identifier, :required => true
+        param :id, :identifier, required: true
         def destroy
           @salt_variable.destroy
           render 'foreman_salt/api/v2/salt_variables/destroy'
         end
 
         def_param_group :salt_variable do
-          param :salt_variable, Hash, :required => true, :action_aware => true do
-            param :variable, String, :required => true, :desc => N_("Name of variable")
-            param :salt_state_id, :number, :required => true, :desc => N_("State ID")
-            param :default_value, :any_type, :of => LookupKey::KEY_TYPES, :desc => N_("Default value of variable")
-            param :hidden_value, :bool, :desc => N_("When enabled the parameter is hidden in the UI")
-            param :override_value_order, String, :desc => N_("The order in which values are resolved")
-            param :description, String, :desc => N_("Description of variable")
-            param :validator_type, LookupKey::VALIDATOR_TYPES, :desc => N_("Types of validation values")
-            param :validator_rule, String, :desc => N_("Used to enforce certain values for the parameter values")
-            param :variable_type, LookupKey::KEY_TYPES, :desc => N_("Types of variable values")
-            param :merge_overrides, :bool, :desc => N_("Merge all matching values (only array/hash type)")
-            param :merge_default, :bool, :desc => N_("Include default value when merging all matching values")
-            param :avoid_duplicates, :bool, :desc => N_("Remove duplicate values (only array type)")
+          param :salt_variable, Hash, required: true, action_aware: true do
+            param :variable, String, required: true, desc: N_('Name of variable')
+            param :salt_state_id, :number, required: true, desc: N_('State ID')
+            param :default_value, :any_type, of: LookupKey::KEY_TYPES, desc: N_('Default value of variable')
+            param :hidden_value, :bool, desc: N_('When enabled the parameter is hidden in the UI')
+            param :override_value_order, String, desc: N_('The order in which values are resolved')
+            param :description, String, desc: N_('Description of variable')
+            param :validator_type, LookupKey::VALIDATOR_TYPES, desc: N_('Types of validation values')
+            param :validator_rule, String, desc: N_('Used to enforce certain values for the parameter values')
+            param :variable_type, LookupKey::KEY_TYPES, desc: N_('Types of variable values')
+            param :merge_overrides, :bool, desc: N_('Merge all matching values (only array/hash type)')
+            param :merge_default, :bool, desc: N_('Include default value when merging all matching values')
+            param :avoid_duplicates, :bool, desc: N_('Remove duplicate values (only array type)')
           end
         end
 
         api :POST, '/salt_variables', N_('Create Salt variable')
-        param_group :salt_variable, :as => :create
+        param_group :salt_variable, as: :create
         def create
           params[:salt_variable][:salt_module_id] = params[:salt_variable].delete(:salt_state_id) if params[:salt_variable]
           @salt_variable = SaltVariable.new(salt_variable_params)
@@ -53,8 +54,8 @@ module ForemanSalt
         end
 
         api :PUT, '/salt_variables/:id', N_('Updates Salt variable')
-        param :id, :identifier, :required => true
-        param_group :salt_variable, :as => :update
+        param :id, :identifier, required: true
+        param_group :salt_variable, as: :update
 
         def update
           @salt_variable.update!(salt_variable_params)

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

@@ -10,7 +10,7 @@ module ForemanSalt
           @salt_environment ||= @hostgroup.salt_environment
 
           if @salt_environment
-            @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @hostgroup.inherited_salt_modules)
+            @inherited_salt_modules = @salt_environment.salt_modules.where(id: @hostgroup.inherited_salt_modules)
             @salt_modules           = @salt_environment.salt_modules - @inherited_salt_modules
           else
             @inherited_salt_modules = @salt_modules = []
@@ -25,12 +25,12 @@ module ForemanSalt
       end
 
       def salt_environment_selected
-        @hostgroup = Hostgroup.authorized(:view_hostgroups, Hostgroup).find_by_id(params[:hostgroup_id]) || Hostgroup.new(params[:hostgroup])
+        @hostgroup = Hostgroup.authorized(:view_hostgroups, Hostgroup).find_by(id: params[:hostgroup_id]) || Hostgroup.new(params[:hostgroup])
 
         if params[:hostgroup][:salt_environment_id].present?
           @salt_environment = ::ForemanSalt::SaltEnvironment.friendly.find(params[:hostgroup][:salt_environment_id])
           load_vars_for_ajax
-          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

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

@@ -2,8 +2,8 @@ module ForemanSalt
   module Concerns
     module HostsControllerExtensions
       extend ActiveSupport::Concern
-      MULTIPLE_EDIT_ACTIONS = %w(select_multiple_salt_environment update_multiple_salt_environment
-                                 select_multiple_salt_master update_multiple_salt_master)
+      MULTIPLE_EDIT_ACTIONS = %w[select_multiple_salt_environment update_multiple_salt_environment
+                                 select_multiple_salt_master update_multiple_salt_master].freeze
 
       module Overrides
         def process_hostgroup
@@ -57,12 +57,12 @@ module ForemanSalt
         end
 
         find_multiple
-        ev = ForemanSalt::SaltEnvironment.find_by_id(id)
+        ev = ForemanSalt::SaltEnvironment.find_by(id: id)
 
         # update the hosts
         @hosts.each do |host|
           host.salt_environment = ev
-          host.save(:validate => false)
+          host.save(validate: false)
         end
 
         success _('Updated hosts: changed salt environment')

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

@@ -6,7 +6,7 @@ module ForemanSalt
       class_methods do
         def salt_environment_params_filter
           Foreman::ParameterFilter.new(::ForemanSalt::SaltEnvironment).tap do |filter|
-            filter.permit(:name, :salt_modules => [], :salt_module_ids => [])
+            filter.permit(:name, salt_modules: [], salt_module_ids: [])
           end
         end
       end

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

@@ -0,0 +1,25 @@
+module ForemanSalt
+  module Concerns
+    module SaltHostgroupParameters
+      extend ActiveSupport::Concern
+      include Foreman::Controller::Parameters::LookupKey
+
+      class_methods do
+        def salt_hostgroup_params_filter
+          Foreman::ParameterFilter.new(Hostgroup).tap do |filter|
+            filter.permit hostgroup: [:salt_environment_id, :salt_proxy_id, { salt_module_ids: [] }]
+            filter.permit_by_context :required, nested: true
+            filter.permit_by_context :id, ui: false, api: true, nested: true
+
+            add_lookup_key_params_filter(filter)
+          end
+        end
+      end
+
+      def salt_hostgroup_params
+        param_name = parameter_filter_context.api? ? 'hostgroup' : 'foreman_salt_salt_hostgroup'
+        self.class.salt_hostgroup_params_filter.filter_params(params, parameter_filter_context, param_name)
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module ForemanSalt
       class_methods do
         def salt_module_params_filter
           Foreman::ParameterFilter.new(::ForemanSalt::SaltEnvironment).tap do |filter|
-            filter.permit(:name, :salt_environments => [], :salt_environment_ids => [])
+            filter.permit(:name, salt_environments: [], salt_environment_ids: [])
           end
         end
       end

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

@@ -9,13 +9,13 @@ module ForemanSalt
       class_methods do
         def lookup_value_params_filter
           Foreman::ParameterFilter.new(::LookupValue).tap do |filter|
-            filter.permit :salt_variable_id, :override_value => {}
+            filter.permit :salt_variable_id, override_value: {}
 
             filter.permit_by_context :hidden_value, :host_or_hostgroup, :lookup_key, :lookup_key_id,
-                                     :match, :omit, :value, :nested => true
+              :match, :omit, :value, nested: true
 
-            filter.permit_by_context :id, :_destroy, :ui => false,
-                                     :api => false, :nested => true
+            filter.permit_by_context :id, :_destroy, ui: false,
+                                                     api: false, nested: true
           end
         end
       end