foreman_salt 6.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733c584c01f5f2afb84e13232bee306b925cace6
-  data.tar.gz: c385886527cae97cc54bf19b4d134b810f0379f4
+  metadata.gz: d6086715f9091869bb9b9e4bf8ce55b07737200f
+  data.tar.gz: d1404318a8da0127688638755d3247a1a0b23964
 SHA512:
-  metadata.gz: 01f965af9e691a5ebb3a2471e88be157efe1cf847f255e376764417ef910b20bcbc78acaf1ff1a539478687c21b90808f76816061e41acb5b944035d9d260f56
-  data.tar.gz: 28911d24f528af912c2ed7d8edb8711fb7e5ab9652287337eb70c18d0cb8c9c17a82b5ba49e658e97bdde444ce65520cb71b748f20cea0249a13ad24fd6a3e65
+  metadata.gz: 6f1f0df003e6cb6566e9836ed3161b6c27ef55069b99eb50721c068fa63f6a7e3b45d8617be3ad424454aeeac05485157ae11227c31cf86e18cdf49e6fe21cba
+  data.tar.gz: fe7dc9289fc0f93d234b24e050b60adba1fb215051b9ffee8e7be6cd8ba15949d185991ebd07ac99fb4be4324505f7b77ec11d9a11878e926e2bb64470c9a78b

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

@@ -2,6 +2,8 @@ module ForemanSalt
   module Api
     module V2
       class SaltEnvironmentsController < ::ForemanSalt::Api::V2::BaseController
+        include ::ForemanSalt::Concerns::SaltEnvironmentParameters
+
         before_action :find_resource, :except => [:index, :create]
 
         api :GET, '/salt_environments', N_('List all Salt environments')
@@ -24,7 +26,7 @@ module ForemanSalt
         api :POST, '/salt_environments', N_('Create a Salt environment')
         param_group :environment, :as => :create
         def create
-          @salt_environment = SaltEnvironment.new(params[:environment])
+          @salt_environment = SaltEnvironment.new(salt_environment_params)
           process_response @salt_environment.save
         end
 

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

@@ -2,6 +2,7 @@ module ForemanSalt
   module Api
     module V2
       class SaltStatesController < ::ForemanSalt::Api::V2::BaseController
+        include ::ForemanSalt::Concerns::SaltModuleParameters
         include StateImporter
 
         before_action :find_resource, :except => [:index, :create, :import]
@@ -35,7 +36,7 @@ module ForemanSalt
         api :POST, '/salt_states', N_('Create a state')
         param_group :state, :as => :create
         def create
-          @salt_state = SaltModule.new(params[:state])
+          @salt_state = SaltModule.new(salt_module_params)
           process_response @salt_state.save
         end
 

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

@@ -0,0 +1,20 @@
+module ForemanSalt
+  module Concerns
+    module SaltEnvironmentParameters
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def salt_environment_params_filter
+          Foreman::ParameterFilter.new(::ForemanSalt::SaltEnvironment).tap do |filter|
+            filter.permit(:name, :salt_modules => [], :salt_module_ids => [])
+          end
+        end
+      end
+
+      def salt_environment_params
+        param_name = parameter_filter_context.api? ? 'environment' : 'foreman_salt_salt_environment'
+        self.class.salt_environment_params_filter.filter_params(params, parameter_filter_context, param_name)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module ForemanSalt
+  module Concerns
+    module SaltModuleParameters
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def salt_module_params_filter
+          Foreman::ParameterFilter.new(::ForemanSalt::SaltEnvironment).tap do |filter|
+            filter.permit(:name, :salt_environments => [], :salt_environment_ids => [])
+          end
+        end
+      end
+
+      def salt_module_params
+        param_name = parameter_filter_context.api? ? 'state' : 'foreman_salt_salt_module'
+        self.class.salt_module_params_filter.filter_params(params, parameter_filter_context, param_name)
+      end
+    end
+  end
+end

data/app/controllers/foreman_salt/minions_controller.rb

@@ -1,6 +1,7 @@
 module ForemanSalt
   class MinionsController < ::ForemanSalt::ApplicationController
     include ::Foreman::Controller::SmartProxyAuth
+    include ::Foreman::Controller::Parameters::Host
 
     before_action :find_resource, :only => [:node, :run]
     add_smart_proxy_filters :node, :features => 'Salt'

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -1,6 +1,7 @@
 module ForemanSalt
   class SaltEnvironmentsController < ::ForemanSalt::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
+    include ::ForemanSalt::Concerns::SaltEnvironmentParameters
 
     before_action :find_resource, :only => [:edit, :update, :destroy]
 
@@ -13,8 +14,7 @@ module ForemanSalt
     end
 
     def create
-      logger.info("Params: #{params.inspect}")
-      @salt_environment = SaltEnvironment.new(params[:foreman_salt_salt_environment])
+      @salt_environment = SaltEnvironment.new(salt_environment_params)
       if @salt_environment.save
         process_success
       else
@@ -26,7 +26,7 @@ module ForemanSalt
     end
 
     def update
-      if @salt_environment.update_attributes(params[:foreman_salt_salt_environment])
+      if @salt_environment.update_attributes(salt_environment_params)
         notice _('Successfully updated %s.' % @salt_environment.to_s)
         redirect_to salt_environments_path
       else

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -1,6 +1,7 @@
 module ForemanSalt
   class SaltModulesController < ::ForemanSalt::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
+    include ::ForemanSalt::Concerns::SaltModuleParameters
     include StateImporter
 
     before_action :find_resource, :only => [:edit, :update, :destroy]
@@ -16,7 +17,7 @@ module ForemanSalt
 
     def create
       logger.info("Params: #{params.inspect}")
-      @salt_module = SaltModule.new(params[:foreman_salt_salt_module])
+      @salt_module = SaltModule.new(salt_module_params)
       if @salt_module.save
         process_success
       else
@@ -29,7 +30,7 @@ module ForemanSalt
     end
 
     def update
-      if @salt_module.update_attributes(params[:foreman_salt_salt_module])
+      if @salt_module.update_attributes(salt_module_params)
         notice _('Successfully updated %s.' % @salt_module.to_s)
         redirect_to salt_modules_path
       else

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -24,9 +24,6 @@ module ForemanSalt
         after_build      :delete_salt_key, :if => ->(host) { host.salt_proxy }
         before_provision :accept_salt_key, :if => ->(host) { host.salt_proxy }
         before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
-
-        attr_accessible :salt_proxy_id, :salt_proxy_name, :salt_environment_id,
-          :salt_environment_name, :salt_modules, :salt_module_ids
       end
 
       def configuration_with_salt?

data/app/models/foreman_salt/concerns/hostgroup_extensions.rb

@@ -13,9 +13,6 @@ module ForemanSalt
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
         scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
         scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
-
-        attr_accessible :salt_proxy_id, :salt_proxy_name, :salt_environment_id,
-          :salt_environment_name, :salt_modules, :salt_module_ids
       end
 
       def all_salt_modules

data/app/models/foreman_salt/fact_name.rb

@@ -1,5 +1,4 @@
 module ForemanSalt
   class FactName < ::FactName
-    attr_accessible :parent, :name, :compose, :parent_id
   end
 end

data/app/models/foreman_salt/salt_environment.rb

@@ -4,8 +4,6 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
-    attr_accessible :name, :salt_modules, :salt_module_ids
-
     has_many :hosts, :class_name => '::Host::Managed'
     has_many :hostgroups, :class_name => '::Hostgroup'
 

data/app/models/foreman_salt/salt_module.rb

@@ -4,10 +4,6 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
-    attr_accessible :name, :salt_environments, :salt_environment_ids
-
-    # before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
-
     has_many :hosts, :through => :host_salt_modules, :class_name => '::Host::Managed'
     has_many :host_salt_modules, :foreign_key => :salt_module_id
 

data/lib/foreman_salt/engine.rb

@@ -4,7 +4,7 @@ module ForemanSalt
   class Engine < ::Rails::Engine
     engine_name 'foreman_salt'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_salt/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]

data/lib/foreman_salt/plugin.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_salt do
-  requires_foreman '>= 1.12'
+  requires_foreman '>= 1.13'
 
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 
@@ -131,4 +131,12 @@ Foreman::Plugin.register :foreman_salt do
                       :create_salt_environments, :view_salt_environments,
                       :edit_salt_environments,
                       :destroy_salt_environments]
+
+
+  # Parameter filters
+  parameter_filter Hostgroup, :salt_proxy_id, :salt_proxy_name, :salt_environment_id,
+    :salt_environment_name, :salt_modules => [], :salt_module_ids => []
+  parameter_filter Host::Managed, :salt_proxy_id, :salt_proxy_name,
+    :salt_environment_id, :salt_environment_name, :salt_modules => [],
+    :salt_module_ids => []
 end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '6.0.1'
+  VERSION = '7.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com
@@ -59,6 +59,8 @@ files:
 - app/controllers/foreman_salt/application_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
+- app/controllers/foreman_salt/concerns/salt_environment_parameters.rb
+- app/controllers/foreman_salt/concerns/salt_module_parameters.rb
 - app/controllers/foreman_salt/minions_controller.rb
 - app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
@@ -134,7 +136,6 @@ files:
 - db/migrate/20150411003302_add_environments_to_modules.rb
 - db/migrate/20150509094409_rename_join_tables.rb
 - db/migrate/20150509101505_add_primary_keys.rb
-- db/migrate/20161103104146_add_index_to_join_tables.rb
 - db/seeds.d/75-salt_seeds.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
@@ -186,22 +187,22 @@ signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/factories/foreman_salt_factories.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_environments_controller_test.rb
-- test/functional/api/v2/salt_keys_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/minions_controller_test.rb
-- test/integration/salt_autosign_test.rb
+- test/integration/salt_module_test.rb
 - test/integration/salt_environment_test.rb
+- test/integration/salt_autosign_test.rb
 - test/integration/salt_keys_test.rb
-- test/integration/salt_module_test.rb
+- test/test_plugin_helper.rb
+- test/unit/grains_importer_test.rb
 - test/unit/grains_centos.json
+- test/unit/host_extensions_test.rb
+- test/unit/report_importer_test.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/unit/salt_modules_test.rb
 - test/unit/highstate.json
 - test/unit/salt_keys_test.rb
-- test/unit/salt_modules_test.rb
-- test/unit/hostgroup_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/grains_importer_test.rb
-- test/unit/host_extensions_test.rb
-- test/test_plugin_helper.rb
+- test/functional/minions_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/factories/foreman_salt_factories.rb

data/db/migrate/20161103104146_add_index_to_join_tables.rb

@@ -1,8 +0,0 @@
-class AddIndexToJoinTables < ActiveRecord::Migration
-  def change
-    add_index :host_salt_modules, :host_id
-    add_index :host_salt_modules, :salt_module_id
-    add_index :hostgroup_salt_modules, :hostgroup_id
-    add_index :hostgroup_salt_modules, :salt_module_id
-  end
-end