foreman_remote_execution 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0446f3fb6c5f2d4640bbe0e15ddee61123fd03
-  data.tar.gz: 49de19a88a35ff89dd770be96886a75600634012
+  metadata.gz: 8cf728e4ad2b40152dbac2f4f9db31707da17ed6
+  data.tar.gz: 0a74247993db625f0f22321d917569a9073b55ce
 SHA512:
-  metadata.gz: 777c28e28ab17cc1e5db620faff516f3b350cb6ae4acb3361e7fecd99821919d1a2ad5ca3706c79e4df246a7f6c92a78e6a0500de52c8fcbb4ac02411e747dab
-  data.tar.gz: cde19bd5f565b9d823f7668ddb7dbb4458d3d31f1607bef4a685f580bcfd0f340c9fcaef1916b1c9543419f11d6aa794cb7027ee0fa1534f768aefc7fbf9e6b4
+  metadata.gz: 0c0893d6c932bb942f330dd37f43bc8edc5bb9d37f0de1baec580e7e73d13b36f35b53349bda05fbe29c72db42419e9bdcdbf30deb27f8945e0fbaeb0521df1f
+  data.tar.gz: 102c655a3149a5b5ce5f3372ba384e6a9bf5dc83adbd926b98f960f1cef674e937ce4f8953ef198d95b3d22f27be73762d177f1b863db8d05348c6cca4d3f4fe

data/app/controllers/api/v2/foreign_input_sets_controller.rb

@@ -3,6 +3,7 @@ module Api
     class ForeignInputSetsController < ::Api::V2::BaseController
       include ::Api::Version2
       include ::Foreman::Renderer
+      include ::Foreman::Controller::Parameters::ForeignInputSet
 
       before_filter :find_required_nested_object
       before_filter :find_resource, :only => %w{show update destroy}
@@ -34,7 +35,7 @@ module Api
       param :template_id, :identifier, :required => true
       param_group :foreign_input_set, :as => :create
       def create
-        @foreign_input_set = resource_class.new(params[:foreign_input_set].merge(:template_id => @nested_obj.id))
+        @foreign_input_set = resource_class.new(foreign_input_set_params.merge(:template_id => @nested_obj.id))
         process_response @foreign_input_set.save
       end
 
@@ -50,7 +51,7 @@ module Api
       param :id, :identifier, :required => true
       param_group :foreign_input_set
       def update
-        process_response @foreign_input_set.update_attributes(params[:foreign_input_set])
+        process_response @foreign_input_set.update_attributes(foreign_input_set_params)
       end
 
       def resource_name(nested_resource = nil)

data/app/controllers/api/v2/job_templates_controller.rb

@@ -5,6 +5,7 @@ module Api
       include ::Api::TaxonomyScope
       include ::Foreman::Renderer
       include ::Foreman::Controller::ProvisioningTemplates
+      include ::Foreman::Controller::Parameters::JobTemplate
 
       before_filter :find_optional_nested_object
       before_filter :find_resource, :only => %w{show update destroy clone export}
@@ -118,9 +119,10 @@ module Api
       private
 
       def job_template_params
-        job_template_params = params[:job_template].dup
+        job_template_params = params[:job_template]
         effective_user_attributes = (job_template_params.delete(:ssh) || {}).fetch(:effective_user, {})
         job_template_params.merge(:effective_user_attributes => effective_user_attributes)
+        super
       end
 
       def action_permission

data/app/controllers/api/v2/remote_execution_features_controller.rb

@@ -2,6 +2,7 @@ module Api
   module V2
     class RemoteExecutionFeaturesController < ::Api::V2::BaseController
       include ::Api::Version2
+      include ::Foreman::Controller::Parameters::RemoteExecutionFeature
 
       before_filter :find_resource, :only => %w{show update}
 
@@ -25,7 +26,7 @@ module Api
       param :id, :identifier, :required => true
       param_group :remote_execution_feature
       def update
-        process_response @remote_execution_feature.update_attributes(params[:remote_execution_feature])
+        process_response @remote_execution_feature.update_attributes(remote_execution_feature_params)
       end
 
       private

data/app/controllers/api/v2/template_inputs_controller.rb

@@ -3,6 +3,7 @@ module Api
     class TemplateInputsController < ::Api::V2::BaseController
       include ::Api::Version2
       include ::Foreman::Renderer
+      include ::Foreman::Controller::Parameters::TemplateInput
 
       before_filter :find_required_nested_object
       before_filter :find_resource, :only => %w{show update destroy}
@@ -40,7 +41,7 @@ module Api
       param :template_id, :identifier, :required => true
       param_group :template_input, :as => :create
       def create
-        @template_input = resource_class.new(params[:template_input].merge(:template_id => @nested_obj.id))
+        @template_input = resource_class.new(template_input_params.merge(:template_id => @nested_obj.id))
         process_response @template_input.save
       end
 
@@ -56,7 +57,7 @@ module Api
       param :id, :identifier, :required => true
       param_group :template_input
       def update
-        process_response @template_input.update_attributes(params[:template_input])
+        process_response @template_input.update_attributes(template_input_params)
       end
 
       def resource_name(nested_resource = nil)

data/app/controllers/concerns/foreman/controller/parameters/foreign_input_set.rb

@@ -0,0 +1,16 @@
+module ::Foreman::Controller::Parameters::ForeignInputSet
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def foreign_input_set_params_filter
+      Foreman::ParameterFilter.new(::ForeignInputSet).tap do |filter|
+        filter.permit_by_context(:id, :_destroy, :template_id, :target_template_id, :include_all, :include, :exclude,
+                                 :nested => true)
+      end
+    end
+  end
+
+  def foreign_input_set_params
+    self.class.foreign_input_set_params_filter.filter_params(params, parameter_filter_context, :foreign_input_set)
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/job_template.rb

@@ -0,0 +1,31 @@
+module Foreman::Controller::Parameters::JobTemplate
+  extend ActiveSupport::Concern
+  include Foreman::Controller::Parameters::Taxonomix
+  include Foreman::Controller::Parameters::Template
+  include Foreman::Controller::Parameters::TemplateInput
+  include Foreman::Controller::Parameters::ForeignInputSet
+
+  class_methods do
+    def job_template_effective_user_filter
+      Foreman::ParameterFilter.new(::JobTemplateEffectiveUser).tap do |filter|
+        filter.permit_by_context(:value, :current_user, :overridable,
+                                 :nested => true)
+      end
+    end
+
+    def job_template_params_filter
+      Foreman::ParameterFilter.new(::TemplateInput).tap do |filter|
+        filter.permit :job_category, :provider_type, :description_format,
+            :effective_user_attributes => [job_template_effective_user_filter],
+            :template_inputs_attributes => [template_input_params_filter],
+            :foreign_input_sets_attributes => [foreign_input_set_params_filter]
+        add_template_params_filter(filter)
+        add_taxonomix_params_filter(filter)
+      end
+    end
+  end
+
+  def job_template_params
+    self.class.job_template_params_filter.filter_params(params, parameter_filter_context, :job_template)
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb

@@ -0,0 +1,15 @@
+module Foreman::Controller::Parameters::RemoteExecutionFeature
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def remote_execution_feature_params_filter
+      ::Foreman::ParameterFilter.new(::RemoteExecutionFeature).tap do |filter|
+        filter.permit :label, :name, :provided_input_names, :description, :job_template_id
+      end
+    end
+  end
+
+  def remote_execution_feature_params
+    self.class.remote_execution_feature_params_filter.filter_params(params, parameter_filter_context, :remote_execution_feature)
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/targeting.rb

@@ -0,0 +1,11 @@
+module Foreman::Controller::Parameters::Targeting
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def targeting_params_filter
+      Foreman::ParameterFilter.new(::Targeting).tap do |filter|
+        filter.permit_by_context :targeting_type, :bookmark_id, :user, :search_query, :nested => true
+      end
+    end
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/template_input.rb

@@ -0,0 +1,17 @@
+module Foreman::Controller::Parameters::TemplateInput
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def template_input_params_filter
+      Foreman::ParameterFilter.new(::TemplateInput).tap do |filter|
+        filter.permit_by_context :id, :_destroy, :name, :required, :input_type, :fact_name,
+            :variable_name, :puppet_class_name, :puppet_parameter_name, :description, :template_id,
+            :options, :advanced, :nested => true
+      end
+    end
+  end
+
+  def template_input_params
+    self.class.template_input_params_filter.filter_params(params, parameter_filter_context, :template_input)
+  end
+end

data/app/controllers/job_invocations_controller.rb

@@ -1,5 +1,6 @@
 class JobInvocationsController < ApplicationController
-  include Foreman::Controller::AutoCompleteSearch
+  include ::Foreman::Controller::AutoCompleteSearch
+  include ::ForemanTasks::Concerns::Parameters::Triggering
 
   def new
     ui_params = {
@@ -34,7 +35,7 @@ class JobInvocationsController < ApplicationController
   end
 
   def create
-    @composer = JobInvocationComposer.from_ui_params(params)
+    @composer = JobInvocationComposer.from_ui_params(params.merge(:triggering => triggering_params))
     if @composer.trigger
       redirect_to job_invocation_path(@composer.job_invocation)
     else

data/app/controllers/job_templates_controller.rb

@@ -1,4 +1,6 @@
 class JobTemplatesController < ::TemplatesController
+  include ::Foreman::Controller::Parameters::JobTemplate
+
   def load_vars_from_template
     return unless @template
 

data/app/controllers/remote_execution_features_controller.rb

@@ -1,5 +1,6 @@
 class RemoteExecutionFeaturesController < ::ApplicationController
   before_filter :find_resource, :only => [:show, :update]
+  include ::Foreman::Controller::Parameters::RemoteExecutionFeature
 
   def index
     @remote_execution_features = resource_base.all
@@ -9,7 +10,7 @@ class RemoteExecutionFeaturesController < ::ApplicationController
   end
 
   def update
-    if @remote_execution_feature.update_attributes(params[:remote_execution_feature])
+    if @remote_execution_feature.update_attributes(remote_execution_feature_params)
       process_success :object => @remote_execution_feature
     else
       process_error :object => @remote_execution_feature

data/app/models/concerns/foreman_remote_execution/nic_extensions.rb

@@ -4,7 +4,6 @@ module ForemanRemoteExecution
 
     included do
       before_validation :set_execution_flag
-      attr_accessible :execution
       validate :exclusive_execution_interface
     end
 

data/app/models/concerns/foreman_remote_execution/subnet_extensions.rb

@@ -5,7 +5,6 @@ module ForemanRemoteExecution
     included do
       has_many :target_remote_execution_proxies, :as => :target
       has_many :remote_execution_proxies, :dependent => :destroy, :through => :target_remote_execution_proxies
-      attr_accessible :remote_execution_proxies, :remote_execution_proxy_ids
     end
   end
 end

data/app/models/concerns/foreman_remote_execution/template_extensions.rb

@@ -12,7 +12,6 @@ module ForemanRemoteExecution
       end
       accepts_nested_attributes_for :template_inputs, :allow_destroy => true
       accepts_nested_attributes_for :foreign_input_sets, :allow_destroy => true
-      attr_accessible :template_inputs_attributes, :foreign_input_sets_attributes
     end
 
     # create or overwrite instance methods...

data/app/models/foreign_input_set.rb

@@ -4,7 +4,6 @@ class ForeignInputSet < ActiveRecord::Base
   class CircularDependencyError < Foreman::Exception
   end
 
-  attr_accessible :template_id, :target_template_id, :include_all, :include, :exclude
   attr_exportable :exclude, :include, :include_all, :template => ->(input_set) { input_set.template.name }
 
   belongs_to :template

data/app/models/job_template.rb

@@ -4,7 +4,6 @@ class JobTemplate < ::Template
   class NonUniqueInputsError < Foreman::Exception
   end
 
-  attr_accessible :job_category, :provider_type, :description_format, :effective_user_attributes
   attr_exportable :name, :job_category, :description_format, :snippet, :template_inputs,
                   :foreign_input_sets, :provider_type, :kind => ->(template) { template.class.name.underscore }
 

data/app/models/job_template_effective_user.rb

@@ -1,7 +1,5 @@
 class JobTemplateEffectiveUser < ActiveRecord::Base
 
-  attr_accessible :value, :current_user, :overridable
-
   belongs_to :job_template
 
   before_validation :set_defaults

data/app/models/remote_execution_feature.rb

@@ -1,6 +1,4 @@
 class RemoteExecutionFeature < ActiveRecord::Base
-  attr_accessible :label, :name, :provided_input_names, :description, :job_template_id
-
   validates :label, :name, :presence => true, :uniqueness => true
 
   belongs_to :job_template

data/app/models/targeting.rb

@@ -16,8 +16,6 @@ class Targeting < ActiveRecord::Base
   validates :targeting_type, :presence => true, :inclusion => Targeting::TYPES.keys
   validate :bookmark_or_query_is_present
 
-  attr_accessible :targeting_type, :bookmark_id, :user, :search_query
-
   before_create :assign_search_query, :if => :static?
 
   def clone

data/app/models/template_input.rb

@@ -9,11 +9,8 @@ class TemplateInput < ActiveRecord::Base
   TYPES = { :user => N_('User input'), :fact => N_('Fact value'), :variable => N_('Variable'),
             :puppet_parameter => N_('Puppet parameter') }.with_indifferent_access
 
-  attr_accessible :name, :required, :input_type, :fact_name, :variable_name,
-                  :puppet_class_name, :puppet_parameter_name, :description, :template_id,
-                  :options, :advanced
-
-  attr_exportable(*self.accessible_attributes - %w(template_id))
+  attr_exportable(:name, :required, :input_type, :fact_name, :variable_name, :puppet_class_name,
+                  :puppet_parameter_name, :description, :options, :advanced)
 
   belongs_to :template
   has_many :template_invocation_input_values, :dependent => :destroy

data/app/views/api/v2/job_invocations/base.json.rabl

@@ -11,6 +11,6 @@ node do |invocation|
   }
 end
 
-child :task do
+child :task => :dynflow_task do
   attributes :id, :state
 end

data/app/views/overrides/subnets/_rex_tab_pane.html.erb

@@ -1,5 +1,5 @@
 <div class="tab-pane" id="rex_proxies">
   <%= fields_for :subnet do |f| %>
-    <%= multiple_selects f, :remote_execution_proxies, SmartProxy.authorized.with_features(RemoteExecutionProvider.provider_names), @subnet.remote_execution_proxy_ids, {:label => _("Proxies"), :help_inline => _("Select as many remote execution proxies as applicable for this subnet.  When multiple proxies with the same provider are added, actions will be load balanced among them.")} %>
+    <%= multiple_selects f, :remote_execution_proxies, SmartProxy.authorized.with_features(*RemoteExecutionProvider.provider_names), @subnet.remote_execution_proxy_ids, {:label => _("Proxies"), :help_inline => _("Select as many remote execution proxies as applicable for this subnet.  When multiple proxies with the same provider are added, actions will be load balanced among them.")} %>
   <% end %>
 </div>

data/foreman_remote_execution.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '~> 0.8.10'
-  s.add_dependency 'foreman-tasks', '~> 0.7.11'
+  s.add_dependency 'foreman-tasks', '~> 0.8.0'
 
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rdoc'

data/lib/foreman_remote_execution/engine.rb

@@ -29,7 +29,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 1.12'
+        requires_foreman '>= 1.13'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -103,6 +103,9 @@ module ForemanRemoteExecution
         register_custom_status HostStatus::ExecutionStatus
         # add dashboard widget
         # widget 'foreman_remote_execution_widget', name: N_('Foreman plugin template widget'), sizex: 4, sizey: 1
+
+        parameter_filter Subnet, :remote_execution_proxies, :remote_execution_proxy_ids
+        parameter_filter Nic, :execution
       end
     end
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/tasks/foreman_remote_execution_tasks.rake

@@ -16,6 +16,7 @@ namespace :test do
     t.libs << ['test', test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
+    t.warning = false
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.11
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.11
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,11 @@ files:
 - app/controllers/api/v2/job_templates_controller.rb
 - app/controllers/api/v2/remote_execution_features_controller.rb
 - app/controllers/api/v2/template_inputs_controller.rb
+- app/controllers/concerns/foreman/controller/parameters/foreign_input_set.rb
+- app/controllers/concerns/foreman/controller/parameters/job_template.rb
+- app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb
+- app/controllers/concerns/foreman/controller/parameters/targeting.rb
+- app/controllers/concerns/foreman/controller/parameters/template_input.rb
 - app/controllers/job_invocations_controller.rb
 - app/controllers/job_templates_controller.rb
 - app/controllers/remote_execution_features_controller.rb
@@ -394,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config