foreman_remote_execution 1.4.1 → 1.4.2

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -140,7 +140,7 @@ module Actions
         # we don't want to load all template_invocations to verify so we construct Authorizer object manually and set
         # the base collection to current template
         authorizer = Authorizer.new(User.current, :collection => [ template_invocation.id ])
-        raise _('User can not execute this job template on %s') % host.name unless authorizer.can?(:execute_template_invocation, template_invocation)
+        raise _('User can not execute this job template on %s') % host.name unless authorizer.can?(:create_template_invocations, template_invocation)
 
         true
       end

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

@@ -6,6 +6,8 @@ module ForemanRemoteExecution
 
     def flattened_errors
       errors = Hash.new { |h, k| h[k] = [] }
+      # self.errors is ActiveModel::Errors, not Hash and doesn't have the #each_key method
+      # rubocop:disable Performance/HashEachMethods
       self.errors.keys.each do |key|
         messages = self.errors[key]
         invalid_objects = invalid_objects_for_attribute(key)
@@ -17,6 +19,7 @@ module ForemanRemoteExecution
           end
         end
       end
+      # rubocop:enable Performance/HashEachMethods
       errors.map { |key, messages| self.errors.full_message(key, messages.join(', ')) }
     end
 

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

@@ -5,7 +5,7 @@ module ForemanRemoteExecution
       base.instance_eval do
         has_many :targeting_hosts, :dependent => :destroy, :foreign_key => 'host_id'
         has_many :template_invocations, :dependent => :destroy, :foreign_key => 'host_id'
-        has_one :execution_status_object, :class_name => 'HostStatus::ExecutionStatus', :foreign_key => 'host_id'
+        has_one :execution_status_object, :class_name => 'HostStatus::ExecutionStatus', :foreign_key => 'host_id', :dependent => :destroy
         has_many :run_host_job_tasks, :through => :template_invocations
 
         scoped_search :relation => :run_host_job_tasks, :on => :result, :rename => 'job_invocation.result',

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

@@ -3,7 +3,7 @@ module ForemanRemoteExecution
     extend ActiveSupport::Concern
 
     included do
-      has_many :target_remote_execution_proxies, :as => :target
+      has_many :target_remote_execution_proxies, :as => :target, :dependent => :destroy
       has_many :remote_execution_proxies, :dependent => :destroy, :through => :target_remote_execution_proxies
     end
   end

data/app/models/foreign_input_set.rb

@@ -1,4 +1,4 @@
-class ForeignInputSet < ActiveRecord::Base
+class ForeignInputSet < ApplicationRecord
   include ForemanRemoteExecution::Exportable
 
   class CircularDependencyError < Foreman::Exception

data/app/models/job_invocation.rb

@@ -1,4 +1,4 @@
-class JobInvocation < ActiveRecord::Base
+class JobInvocation < ApplicationRecord
   include Authorizable
   audited :except => [ :task_id, :targeting_id, :task_group_id, :triggering_id ]
 

data/app/models/job_invocation_composer.rb

@@ -130,7 +130,7 @@ class JobInvocationComposer
 
     def template_invocations_params
       template_invocation_params = { :template_id => template.id, :effective_user => api_params[:effective_user] }
-      template_invocation_params[:input_values] = api_params.fetch(:inputs, {}).map do |name, value|
+      template_invocation_params[:input_values] = api_params.fetch(:inputs, {}).to_h.map do |name, value|
         input = template.template_inputs_with_foreign.find { |i| i.name == name }
         unless input
           raise ::Foreman::Exception, _('Unknown input %{input_name} for template %{template_name}') %
@@ -149,7 +149,7 @@ class JobInvocationComposer
 
     def format_datetime(datetime)
       return datetime if datetime.blank?
-      DateTime.parse(datetime).strftime('%Y-%m-%d %H:%M')
+      Time.parse(datetime).strftime('%Y-%m-%d %H:%M')
     end
   end
 

data/app/models/job_invocation_task_group.rb

@@ -1,6 +1,6 @@
 class JobInvocationTaskGroup < ::ForemanTasks::TaskGroup
 
-  has_one :job_invocation, :foreign_key => :task_group_id
+  has_one :job_invocation, :foreign_key => :task_group_id, :dependent => :nullify
 
   alias resource job_invocation
 

data/app/models/job_template.rb

@@ -13,7 +13,7 @@ class JobTemplate < ::Template
   include Parameterizable::ByIdName
 
   audited :allow_mass_assignment => true
-  has_many :audits, :as => :auditable, :class_name => Audited.audit_class.name
+  has_many :audits, :as => :auditable, :class_name => Audited.audit_class.name, :dependent => :nullify
   has_many :all_template_invocations, :dependent => :destroy, :foreign_key => 'template_id', :class_name => 'TemplateInvocation'
   has_many :template_invocations, -> { where('host_id IS NOT NULL') }, :foreign_key => 'template_id'
   has_many :pattern_template_invocations, -> { where('host_id IS NULL') }, :foreign_key => 'template_id', :class_name => 'TemplateInvocation'
@@ -184,7 +184,7 @@ class JobTemplate < ::Template
     end
 
     # Create new inputs
-    inputs.values.each { |new_input| template_inputs.build(new_input) }
+    inputs.each_value { |new_input| template_inputs.build(new_input) }
   end
 
   def sync_foreign_input_sets(input_sets)
@@ -206,7 +206,7 @@ class JobTemplate < ::Template
     end
 
     # Create new input_sets
-    input_sets.values.each { |input_set| self.foreign_input_sets.build(input_set) }
+    input_sets.each_value { |input_set| self.foreign_input_sets.build(input_set) }
   end
 
   def sync_feature(feature_name)

data/app/models/job_template_effective_user.rb

@@ -1,4 +1,4 @@
-class JobTemplateEffectiveUser < ActiveRecord::Base
+class JobTemplateEffectiveUser < ApplicationRecord
 
   belongs_to :job_template
 

data/app/models/remote_execution_feature.rb

@@ -1,4 +1,4 @@
-class RemoteExecutionFeature < ActiveRecord::Base
+class RemoteExecutionFeature < ApplicationRecord
   VALID_OPTIONS = [:provided_inputs, :description, :host_action_button].freeze
   validates :label, :name, :presence => true, :uniqueness => true
 

data/app/models/target_remote_execution_proxy.rb

@@ -1,4 +1,4 @@
-class TargetRemoteExecutionProxy < ActiveRecord::Base
+class TargetRemoteExecutionProxy < ApplicationRecord
   belongs_to :remote_execution_proxy, :class_name => 'SmartProxy'
   belongs_to :target, :polymorphic => true
 end

data/app/models/targeting.rb

@@ -1,4 +1,4 @@
-class Targeting < ActiveRecord::Base
+class Targeting < ApplicationRecord
 
   STATIC_TYPE = 'static_query'.freeze
   DYNAMIC_TYPE = 'dynamic_query'.freeze
@@ -10,7 +10,7 @@ class Targeting < ActiveRecord::Base
 
   has_many :targeting_hosts, :dependent => :destroy
   has_many :hosts, :through => :targeting_hosts
-  has_one :job_invocation
+  has_one :job_invocation, :dependent => :delete
   has_many :template_invocations, :through => :job_invocation
 
   validates :targeting_type, :presence => true, :inclusion => Targeting::TYPES.keys

data/app/models/targeting_host.rb

@@ -1,4 +1,4 @@
-class TargetingHost < ActiveRecord::Base
+class TargetingHost < ApplicationRecord
 
   belongs_to :targeting
   belongs_to_host

data/app/models/template_input.rb

@@ -1,4 +1,4 @@
-class TemplateInput < ActiveRecord::Base
+class TemplateInput < ApplicationRecord
   include ForemanRemoteExecution::Exportable
 
   class ValueNotReady < ::Foreman::Exception

data/app/models/template_invocation.rb

@@ -1,4 +1,4 @@
-class TemplateInvocation < ActiveRecord::Base
+class TemplateInvocation < ApplicationRecord
   include Authorizable
   include ForemanTasks::Concerns::ActionSubject
 

data/app/models/template_invocation_input_value.rb

@@ -1,4 +1,4 @@
-class TemplateInvocationInputValue < ActiveRecord::Base
+class TemplateInvocationInputValue < ApplicationRecord
 
   belongs_to :template_invocation
   belongs_to :template_input

data/db/migrate/20150612121541_add_job_template_to_template.rb

@@ -1,4 +1,4 @@
-class AddJobTemplateToTemplate < ActiveRecord::Migration
+class AddJobTemplateToTemplate < ActiveRecord::Migration[4.2]
   def change
     add_column :templates, :job_name, :string, :limit => 255
     add_column :templates, :provider_type, :string, :limit => 255

data/db/migrate/20150616080015_create_template_input.rb

@@ -1,4 +1,4 @@
-class CreateTemplateInput < ActiveRecord::Migration
+class CreateTemplateInput < ActiveRecord::Migration[4.2]
   def change
     create_table :template_inputs do |t|
       t.string :name, :null => false, :limit => 255

data/db/migrate/20150708133241_add_targeting.rb

@@ -1,4 +1,4 @@
-class AddTargeting < ActiveRecord::Migration
+class AddTargeting < ActiveRecord::Migration[4.2]
   def change
     create_table :targetings do |t|
       t.string :search_query, :limit => 255

data/db/migrate/20150708133242_add_invocation.rb

@@ -1,4 +1,4 @@
-class AddInvocation< ActiveRecord::Migration
+class AddInvocation< ActiveRecord::Migration[4.2]
   def change
     create_table :job_invocations do |t|
       t.references :targeting, :null => false

data/db/migrate/20150708133305_add_template_invocation.rb

@@ -1,4 +1,4 @@
-class AddTemplateInvocation < ActiveRecord::Migration
+class AddTemplateInvocation < ActiveRecord::Migration[4.2]
   def change
     create_table :template_invocations do |t|
       t.references :template, :null => false

data/db/migrate/20150812110800_add_resolved_at_to_targeting.rb

@@ -1,4 +1,4 @@
-class AddResolvedAtToTargeting < ActiveRecord::Migration
+class AddResolvedAtToTargeting < ActiveRecord::Migration[4.2]
   def change
     add_column :targetings, :resolved_at, :datetime
   end

data/db/migrate/20150812145900_add_last_task_id_to_job_invocation.rb

@@ -1,4 +1,4 @@
-class AddLastTaskIdToJobInvocation < ActiveRecord::Migration
+class AddLastTaskIdToJobInvocation < ActiveRecord::Migration[4.2]
   def change
     add_column :job_invocations, :last_task_id, :string, :limit => 255
     add_index :job_invocations, [:last_task_id], :name => 'job_invocations_last_task_id'

data/db/migrate/20150826191632_create_target_remote_execution_proxies.rb

@@ -1,4 +1,4 @@
-class CreateTargetRemoteExecutionProxies < ActiveRecord::Migration
+class CreateTargetRemoteExecutionProxies < ActiveRecord::Migration[4.2]
   def change
     create_table :target_remote_execution_proxies do |t|
       t.integer :remote_execution_proxy_id

data/db/migrate/20150827144500_change_targeting_search_query_type.rb

@@ -1,4 +1,4 @@
-class ChangeTargetingSearchQueryType < ActiveRecord::Migration
+class ChangeTargetingSearchQueryType < ActiveRecord::Migration[4.2]
   def change
     change_column :targetings, :search_query, :text
   end

data/db/migrate/20150827152730_add_options_to_template_input.rb

@@ -1,4 +1,4 @@
-class AddOptionsToTemplateInput < ActiveRecord::Migration
+class AddOptionsToTemplateInput < ActiveRecord::Migration[4.2]
   def change
     add_column :template_inputs, :options, :text
   end

data/db/migrate/20150903192731_add_execution_to_interface.rb

@@ -1,5 +1,5 @@
-class AddExecutionToInterface < ActiveRecord::Migration
-  class FakeNic < ActiveRecord::Base
+class AddExecutionToInterface < ActiveRecord::Migration[4.2]
+  class FakeNic < ApplicationRecord
     self.table_name = 'nics'
 
     def type

data/db/migrate/20150923125825_add_job_invocation_task_group.rb

@@ -1,4 +1,4 @@
-class AddJobInvocationTaskGroup < ActiveRecord::Migration
+class AddJobInvocationTaskGroup < ActiveRecord::Migration[4.2]
   def up
     add_column :job_invocations, :task_group_id, :integer, :index => true
     add_foreign_key :job_invocations, :foreman_tasks_task_groups, :column => :task_group_id

data/db/migrate/20151013135415_add_pub_key_to_smart_proxy.rb

@@ -1,4 +1,4 @@
-class AddPubKeyToSmartProxy < ActiveRecord::Migration
+class AddPubKeyToSmartProxy < ActiveRecord::Migration[4.2]
   def change
     add_column :smart_proxies, :pubkey, :text
   end

data/db/migrate/20151022105508_rename_last_task_id_column.rb

@@ -1,4 +1,4 @@
-class RenameLastTaskIdColumn < ActiveRecord::Migration
+class RenameLastTaskIdColumn < ActiveRecord::Migration[4.2]
   def change
     rename_column :job_invocations, :last_task_id, :task_id
     rename_index :job_invocations, 'job_invocations_last_task_id', 'job_invocations_task_id'

data/db/migrate/20151116105412_add_triggering_to_job_invocation.rb

@@ -1,4 +1,4 @@
-class AddTriggeringToJobInvocation < ActiveRecord::Migration
+class AddTriggeringToJobInvocation < ActiveRecord::Migration[4.2]
   def up
     add_column :job_invocations, :triggering_id, :integer, :index => true
     add_foreign_key :job_invocations, :foreman_tasks_triggerings, :column => :triggering_id

data/db/migrate/20151120171100_add_effective_user_to_template_invocation.rb

@@ -1,4 +1,4 @@
-class AddEffectiveUserToTemplateInvocation < ActiveRecord::Migration
+class AddEffectiveUserToTemplateInvocation < ActiveRecord::Migration[4.2]
   def change
     add_column :template_invocations, :effective_user, :string, :limit => 255
   end

data/db/migrate/20151124162300_create_job_template_effective_users.rb

@@ -1,4 +1,4 @@
-class CreateJobTemplateEffectiveUsers < ActiveRecord::Migration
+class CreateJobTemplateEffectiveUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :job_template_effective_users do |t|
       t.integer :job_template_id

data/db/migrate/20151203100824_add_description_to_job_invocation.rb

@@ -1,4 +1,4 @@
-class AddDescriptionToJobInvocation < ActiveRecord::Migration
+class AddDescriptionToJobInvocation < ActiveRecord::Migration[4.2]
   def up
     add_column :job_invocations, :description, :string, :limit => 255
     add_column :templates, :description_format, :string, :limit => 255

data/db/migrate/20151215114631_add_host_id_to_template_invocation.rb

@@ -1,5 +1,5 @@
-class AddHostIdToTemplateInvocation < ActiveRecord::Migration
-  class FakeTemplateInvocation < ActiveRecord::Base
+class AddHostIdToTemplateInvocation < ActiveRecord::Migration[4.2]
+  class FakeTemplateInvocation < ApplicationRecord
     self.table_name = 'template_invocations'
   end
 

data/db/migrate/20151217092555_migrate_to_task_groups.rb

@@ -1,5 +1,5 @@
-class MigrateToTaskGroups < ActiveRecord::Migration
-  class FakeJobInvocation < ActiveRecord::Base
+class MigrateToTaskGroups < ActiveRecord::Migration[4.2]
+  class FakeJobInvocation < ApplicationRecord
     self.table_name = 'job_invocations'
   end
 

data/db/migrate/20160108134600_create_template_input_sets.rb

@@ -1,4 +1,4 @@
-class CreateTemplateInputSets < ActiveRecord::Migration
+class CreateTemplateInputSets < ActiveRecord::Migration[4.2]
   def change
     create_table :foreign_input_sets do |t|
       t.integer :template_id, :null => false

data/db/migrate/20160108141144_make_job_name_default_to_something.rb

@@ -1,4 +1,4 @@
-class MakeJobNameDefaultToSomething < ActiveRecord::Migration
+class MakeJobNameDefaultToSomething < ActiveRecord::Migration[4.2]
   def up
     change_column :templates, :job_name, :string, :default => 'Miscellaneous', :limit => 255
   end

data/db/migrate/20160111113032_upcase_ssh_feature.rb

@@ -1,5 +1,5 @@
-class UpcaseSshFeature < ActiveRecord::Migration
-  class FakeFeature < ActiveRecord::Base
+class UpcaseSshFeature < ActiveRecord::Migration[4.2]
+  class FakeFeature < ApplicationRecord
     self.table_name = 'features'
   end
 

data/db/migrate/20160113161916_add_run_host_job_task_id_to_template_invocation.rb

@@ -1,4 +1,4 @@
-class AddRunHostJobTaskIdToTemplateInvocation < ActiveRecord::Migration
+class AddRunHostJobTaskIdToTemplateInvocation < ActiveRecord::Migration[4.2]
   def change
     add_column :template_invocations, :run_host_job_task_id, :string, :limit => 255
     add_index :template_invocations, [:run_host_job_task_id], :name => 'template_invocations_run_host_job_task_id'

data/db/migrate/20160113162007_expand_all_template_invocations.rb

@@ -1,11 +1,11 @@
-class ExpandAllTemplateInvocations < ActiveRecord::Migration
-  class FakeTemplateInvocation < ActiveRecord::Base
+class ExpandAllTemplateInvocations < ActiveRecord::Migration[4.2]
+  class FakeTemplateInvocation < ApplicationRecord
     self.table_name = 'template_invocations'
 
     has_many :input_values, :class_name => 'FakeInputValue', :foreign_key => 'template_invocation_id'
   end
 
-  class FakeInputValue < ActiveRecord::Base
+  class FakeInputValue < ApplicationRecord
     self.table_name = 'template_invocation_input_values'
   end
 

data/db/migrate/20160114120200_rename_job_categories.rb

@@ -1,4 +1,4 @@
-class RenameJobCategories < ActiveRecord::Migration
+class RenameJobCategories < ActiveRecord::Migration[4.2]
   MAP = {
     'Package Action - SSH Default' => ['Package Action', 'Packages'],
     'Puppet Run Once - SSH Default' => ['Puppet Run Once', 'Puppet'],

data/db/migrate/20160114125628_rename_job_name_to_job_category.rb

@@ -1,4 +1,4 @@
-class RenameJobNameToJobCategory < ActiveRecord::Migration
+class RenameJobNameToJobCategory < ActiveRecord::Migration[4.2]
   def up
     rename_column :templates, :job_name, :job_category
     rename_column :job_invocations, :job_name, :job_category

data/db/migrate/20160118124600_create_remote_execution_features.rb

@@ -1,4 +1,4 @@
-class CreateRemoteExecutionFeatures < ActiveRecord::Migration
+class CreateRemoteExecutionFeatures < ActiveRecord::Migration[4.2]
   def change
     create_table :remote_execution_features do |t|
       t.string :label, :index => true, :null => false, :limit => 255

data/db/migrate/20160125155108_make_job_template_name_unique.rb

@@ -1,4 +1,4 @@
-class MakeJobTemplateNameUnique < ActiveRecord::Migration
+class MakeJobTemplateNameUnique < ActiveRecord::Migration[4.2]
   def up
     duplicates = JobTemplate.unscoped.group(:name).count.delete_if { |_name, value| value == 1 }
     duplicates.each_key do |duplicated_name|

data/db/migrate/20160127134031_add_advanced_to_template_input.rb

@@ -1,4 +1,4 @@
-class AddAdvancedToTemplateInput < ActiveRecord::Migration
+class AddAdvancedToTemplateInput < ActiveRecord::Migration[4.2]
   def up
     add_column :template_inputs, :advanced, :boolean, :default => false, :null => false
     template = JobTemplate.find_by(name: 'Package Action - SSH Default')

data/db/migrate/20160127162711_reword_puppet_template_description.rb

@@ -1,4 +1,4 @@
-class RewordPuppetTemplateDescription < ActiveRecord::Migration
+class RewordPuppetTemplateDescription < ActiveRecord::Migration[4.2]
   def up
     JobTemplate.where(:name => 'Puppet Run Once - SSH Default').update_all(:description_format => 'Run Puppet once with "%{puppet_options}"')
   end

data/db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb

@@ -1,4 +1,4 @@
-class AddConcurrencyOptionsToJobInvocation < ActiveRecord::Migration
+class AddConcurrencyOptionsToJobInvocation < ActiveRecord::Migration[4.2]
   def change
     add_column :job_invocations, :concurrency_level, :integer, :null => true
     add_column :job_invocations, :time_span, :integer, :null => true

data/db/migrate/20160926225841_update_template_input_value.rb

@@ -1,4 +1,4 @@
-class UpdateTemplateInputValue < ActiveRecord::Migration
+class UpdateTemplateInputValue < ActiveRecord::Migration[4.2]
   def change
     change_column :template_invocation_input_values, :value, :text, :limit => 16.megabytes - 1
   end

data/db/migrate/20170110145641_add_host_action_button_to_remote_execution_feature.rb

@@ -1,4 +1,4 @@
-class AddHostActionButtonToRemoteExecutionFeature < ActiveRecord::Migration
+class AddHostActionButtonToRemoteExecutionFeature < ActiveRecord::Migration[4.2]
   def change
     add_column :remote_execution_features, :host_action_button, :boolean, :null => false, :default => false
   end

data/db/migrate/20170613101039_add_timeout_to_job_templates_and_job_invocations.rb

@@ -1,4 +1,4 @@
-class AddTimeoutToJobTemplatesAndJobInvocations < ActiveRecord::Migration
+class AddTimeoutToJobTemplatesAndJobInvocations < ActiveRecord::Migration[4.2]
   def change
     add_column :templates, :execution_timeout_interval, :integer
     add_column :job_invocations, :execution_timeout_interval, :integer

data/db/migrate/20180110104432_rename_template_invocation_permission.rb

@@ -0,0 +1,25 @@
+class RenameTemplateInvocationPermission < ActiveRecord::Migration[4.2]
+  PERMISSION_NAMES = %w(execute_template_invocation create_template_invocations).freeze
+
+  def up
+    switch_filtering_permission!(*PERMISSION_NAMES)
+  end
+
+  def down
+    switch_filtering_permission!(*PERMISSION_NAMES.reverse)
+  end
+
+  private
+
+  def switch_filtering_permission!(old, new)
+    old_permission = Permission.find_by(:name => old)
+    return if old_permission.nil?
+    new_permission = Permission.find_or_create_by(:name => new,
+                                                  :resource_type => 'TemplateInvocation')
+    old_permission.filterings.each do |filtering|
+      filtering.permission_id = new_permission.id
+      filtering.save!
+    end
+    old_permission.destroy!
+  end
+end