Fixes #22609 - customizable notifications per feature by ares · Pull Request #318 · theforeman/foreman_remote_execution

ares · 2018-02-16T20:55:42Z

This allows defining a custom notification builder for feature, if you want to see example usage, see theforeman/foreman_openscap#326

the fact we now store the feature makes it easy in future to add more customization, e.g. job invocation page, based on it

houndci-bot · 2018-02-16T20:55:52Z

+class AddFeatureIdToJobInvocation < ActiveRecord::Migration[4.2]
+  def change
+    add_column :job_invocations, :remote_execution_feature_id, :integer, :index => true
+    add_foreign_key :job_invocations, :remote_execution_features, :column => :remote_execution_feature_id


Use the new Ruby 1.9 hash syntax.
Line is too long. [105/80]

houndci-bot · 2018-02-16T20:55:52Z

@@ -0,0 +1,6 @@
+class AddFeatureIdToJobInvocation < ActiveRecord::Migration[4.2]
+  def change
+    add_column :job_invocations, :remote_execution_feature_id, :integer, :index => true


Use the new Ruby 1.9 hash syntax.
Line is too long. [87/80]

houndci-bot · 2018-02-16T20:55:53Z

@@ -0,0 +1,6 @@
+class AddFeatureIdToJobInvocation < ActiveRecord::Migration[4.2]


Missing top-level class documentation comment.
Missing magic comment # frozen_string_literal: true.

houndci-bot · 2018-02-16T20:55:53Z

@@ -0,0 +1,5 @@
+class AddNotificationBuilderToRemoteExecutionFeature < ActiveRecord::Migration[4.2]


Missing top-level class documentation comment.
Missing magic comment # frozen_string_literal: true.
Line is too long. [83/80]

houndci-bot · 2018-02-16T20:55:53Z

-      attributes.delete(:host_action_button)
+    attrs = [ :host_action_button, :notification_builder ]
+    attrs.each do |attr|
+      unless self.attribute_names.include?(attr.to_s)


Favor modifier unless usage when having a single-line body. Another good alternative is the usage of control flow &&/||.
Redundant self detected.

houndci-bot · 2018-02-16T20:55:54Z

    options[:host_action_button] = false unless options.key?(:host_action_button)

    feature = self.find_by(label: label)
+    builder = options[:notification_builder] ? options[:notification_builder].to_s : nil


Line is too long. [88/80]

houndci-bot · 2018-02-16T20:55:54Z

@@ -1,5 +1,5 @@
 class RemoteExecutionFeature < ApplicationRecord
-  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button].freeze
+  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button, :notification_builder].freeze


Use %i or %I for an array of symbols.
Line is too long. [101/80]

houndci-bot · 2018-02-16T20:55:54Z

  def compose
    job_invocation.job_category = validate_job_category(params[:job_category])
    job_invocation.job_category ||= available_job_categories.first if @set_defaults
+    job_invocation.remote_execution_feature_id = params[:remote_execution_feature_id]


Line is too long. [85/80]

houndci-bot · 2018-02-16T20:55:54Z


  attr_accessor :params, :job_invocation, :host_ids, :search_query
-  delegate :job_category, :pattern_template_invocations, :template_invocations, :targeting, :triggering, :to => :job_invocation
+  delegate :job_category, :remote_execution_feature_id, :pattern_template_invocations, :template_invocations, :targeting, :triggering, :to => :job_invocation


Line is too long. [157/80]
Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-16T20:55:54Z

        :targeting => targeting_params,
        :triggering => {},
        :concurrency_control => {},
+        :remote_execution_feature_id => @feature.id,


Use the new Ruby 1.9 hash syntax.

adamruzicka · 2018-02-20T09:56:50Z


  def build_notification
-    UINotifications::RemoteExecutionJobs::BaseJobFinish.new(self)
+    # self.remote_execution_feature


Was this left here intentionally?

nope, I'll remove when you'll add more comments :-)

adamruzicka

Looks good code-wise, but Jenkins is not happy

houndci-bot · 2018-02-22T09:28:08Z

+          },
+          :targeting_type => 'static_query',
+          :search_query => 'some hosts',
+          :inputs => {input1.name => 'some_value'}}


Use the new Ruby 1.9 hash syntax.
Space inside { missing.
Space inside } missing.

houndci-bot · 2018-02-22T09:28:09Z

+            :time_span => time_span
+          },
+          :targeting_type => 'static_query',
+          :search_query => 'some hosts',


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+            :concurrency_level => level,
+            :time_span => time_span
+          },
+          :targeting_type => 'static_query',


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {
+            :concurrency_level => level,
+            :time_span => time_span


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {
+            :concurrency_level => level,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+      let(:feature) { FacotryBot.create(:remote_execution_feature) }
+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:09Z

+    context 'with rex feature defined' do
+      let(:feature) { FacotryBot.create(:remote_execution_feature) }
+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:10Z

+          },
+          :targeting_type => 'static_query',
+          :search_query => 'some hosts',
+          :inputs => {input1.name => 'some_value'}}


Use the new Ruby 1.9 hash syntax.
Space inside { missing.
Space inside } missing.

houndci-bot · 2018-02-22T09:28:10Z

+            :time_span => time_span
+          },
+          :targeting_type => 'static_query',
+          :search_query => 'some hosts',


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:10Z

+            :concurrency_level => level,
+            :time_span => time_span
+          },
+          :targeting_type => 'static_query',


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:10Z

+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {
+            :concurrency_level => level,
+            :time_span => time_span


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:10Z

+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {
+            :concurrency_level => level,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:11Z

+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,
+          :concurrency_control => {


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:11Z

+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,
+          :remote_execution_feature_id => feature.id,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:11Z

+      let(:feature) { FacotryBot.create(:remote_execution_feature) }
+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,
+          :job_template_id => trying_job_template_1.id,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-22T09:28:11Z

+    context 'with rex feature defined' do
+      let(:feature) { FacotryBot.create(:remote_execution_feature) }
+      let(:params) do
+        { :job_category => trying_job_template_1.job_category,


Use the new Ruby 1.9 hash syntax.

houndci-bot · 2018-02-23T09:57:37Z

+          :remote_execution_feature_id => feature.id,
+          :targeting_type => 'static_query',
+          :search_query => 'some hosts',
+          :inputs => {input1.name => 'some_value'}}


Use the new Ruby 1.9 hash syntax.
Space inside { missing.
Space inside } missing.

houndci-bot · 2018-02-23T15:28:29Z

  def build_notification
-    UINotifications::RemoteExecutionJobs::BaseJobFinish.new(self)
+    klass = nil
+    if self.remote_execution_feature && self.remote_execution_feature.notification_builder.present?


Use safe navigation (&.) instead of checking if an object exists before calling the method.

houndci-bot · 2018-02-23T15:28:29Z

  def build_notification
-    UINotifications::RemoteExecutionJobs::BaseJobFinish.new(self)
+    klass = nil
+    if self.remote_execution_feature && self.remote_execution_feature.notification_builder.present?


Use safe navigation (&.) instead of checking if an object exists before calling the method.

ares · 2018-02-26T07:51:11Z

cops issues resolved, all should be green this time

iNecas

ACK: waiting for jenkins

adamruzicka · 2018-02-26T10:07:27Z

Mr. J is happy with sqlite and postgresql, but mysql timed out. I'd say this is good to go

ares · 2018-02-26T12:25:55Z

I swear it was green before also on PG :-)

adamruzicka · 2018-02-26T12:28:49Z

Merged, thanks @ares !

theforeman-bot added Needs testing Not yet reviewed labels Feb 16, 2018

houndci-bot reviewed Feb 16, 2018

View reviewed changes

adamruzicka reviewed Feb 20, 2018

View reviewed changes

adamruzicka requested changes Feb 21, 2018

View reviewed changes

theforeman-bot added Waiting on contributor and removed Not yet reviewed labels Feb 21, 2018

ares force-pushed the fix/22609 branch from 50f6ea8 to 96f9725 Compare February 21, 2018 12:40

theforeman-bot added Needs re-review Needs testing and removed Waiting on contributor labels Feb 21, 2018

ares force-pushed the fix/22609 branch from 96f9725 to 100bdf7 Compare February 22, 2018 09:27

houndci-bot reviewed Feb 22, 2018

View reviewed changes

ares force-pushed the fix/22609 branch 2 times, most recently from 3d9bf8b to 183f51d Compare February 23, 2018 09:57

houndci-bot reviewed Feb 23, 2018

View reviewed changes

ares force-pushed the fix/22609 branch from 183f51d to efb5a89 Compare February 23, 2018 15:28

houndci-bot reviewed Feb 23, 2018

View reviewed changes

ares force-pushed the fix/22609 branch from efb5a89 to f169ce9 Compare February 26, 2018 07:50

Fixes #22609 - customizable notifications per feature

0851249

ares force-pushed the fix/22609 branch from f169ce9 to 0851249 Compare February 26, 2018 07:53

iNecas approved these changes Feb 26, 2018

View reviewed changes

theforeman-bot removed the Needs re-review label Feb 26, 2018

adamruzicka approved these changes Feb 26, 2018

View reviewed changes

adamruzicka merged commit 0b9bbd9 into theforeman:master Feb 26, 2018

		@@ -0,0 +1,6 @@
		class AddFeatureIdToJobInvocation < ActiveRecord::Migration[4.2]

		@@ -0,0 +1,5 @@
		class AddNotificationBuilderToRemoteExecutionFeature < ActiveRecord::Migration[4.2]

Uh oh!

Conversation

ares commented Feb 16, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamruzicka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ares commented Feb 26, 2018

Uh oh!

iNecas left a comment

Choose a reason for hiding this comment

Uh oh!

adamruzicka commented Feb 26, 2018

Uh oh!