foreman_rh_cloud 5.0.38 → 6.0.42

data/config/routes.rb

@@ -25,6 +25,8 @@ Rails.application.routes.draw do
       end
     end
     match 'hits/:host_id', to: 'hits#show', via: :get
+
+    post ':organization_id/parameter', to: 'settings#set_org_parameter', constraints: { organization_id: %r{[^\/]+} }
   end
 
   namespace :foreman_rh_cloud do

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -32,6 +32,10 @@ module ForemanInventoryUpload
       def plan_generate_report(folder, organization)
         plan_action(ForemanInventoryUpload::Async::GenerateReportJob, folder, organization.id)
       end
+
+      def logger
+        action_logger
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -13,7 +13,7 @@ module ForemanInventoryUpload
       end
 
       def run
-        if Setting[:content_disconnected]
+        if content_disconnected?
           progress_output do |progress_output|
             progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
             progress_output.status = "Task aborted, exit 1"
@@ -74,6 +74,10 @@ module ForemanInventoryUpload
       def organization
         @organization ||= Organization.find(input[:organization_id])
       end
+
+      def content_disconnected?
+        Setting[:content_disconnected]
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -21,7 +21,7 @@ module ForemanRhCloud
     end
 
     initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
+      require_dependency File.expand_path('settings.rb', __dir__)
     end
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
@@ -29,7 +29,6 @@ module ForemanRhCloud
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -43,7 +42,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 2.3'
+        requires_foreman '>= 3.3'
 
         apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 
@@ -83,9 +82,13 @@ module ForemanRhCloud
             :dispatch_cloud_requests,
             'api/v2/rh_cloud/cloud_request': [:update]
           )
+          permission(
+            :control_organization_insights,
+            'insights_cloud/settings': [:set_org_parameter]
+          )
         end
 
-        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests]
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
 
         role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
                                                     generate a report, upload it to the cloud and download it locally'

data/lib/foreman_rh_cloud/settings.rb

@@ -0,0 +1,11 @@
+Foreman::SettingManager.define(:foreman) do
+  category(:rh_cloud, N_('RHCloud')) do
+    setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
+    setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: false, full_name: N_('Synchronize recommendations Automatically'))
+    setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
+    setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
+    setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))
+    setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
+    setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+  end
+end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.38'.freeze
+  VERSION = '6.0.42'.freeze
 end

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -67,7 +67,6 @@ module InsightsCloud
       private
 
       def connector_playbook_job?(job_invocation)
-        puts "Job invocation id: #{job_invocation&.remote_execution_feature_id}, feature id: #{connector_feature_id}"
         job_invocation&.remote_execution_feature_id == connector_feature_id
       end
 
@@ -137,6 +136,7 @@ module InsightsCloud
 
       def report_job_progress(invocation_status)
         generator = InsightsCloud::Generators::PlaybookProgressGenerator.new(correlation_id)
+        all_hosts_success = true
 
         invocation_status.each do |host_name, status|
           # skip host if the host already reported that it's finished
@@ -151,9 +151,10 @@ module InsightsCloud
           if status['state'] == 'stopped'
             generator.host_finished_message(host_name, status['exit_status'])
             status['report_done'] = true
+            all_hosts_success &&= status['exit_status'] == 0
           end
         end
-        generator.job_finished_message if done?(invocation_status)
+        generator.job_finished_message(all_hosts_success) if done?(invocation_status)
 
         send_report(generator.generate)
       end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'rest-client'
 
 module InsightsCloud
@@ -122,7 +123,7 @@ module InsightsCloud
       end
 
       def to_rule_id(results_url)
-        URI.decode(safe_results_match(results_url)[:id] || '')
+        CGI.unescape(safe_results_match(results_url)[:id] || '')
       end
 
       def safe_results_match(results_url)

data/lib/insights_cloud/generators/playbook_progress_generator.rb

@@ -30,12 +30,12 @@ module InsightsCloud
         }
       end
 
-      def job_finished_message
+      def job_finished_message(success)
         @messages << {
           "type": "playbook_run_completed",
           "version": 3,
           "correlation_id": correlation_id,
-          "status": "success",
+          "status": success ? 'success' : 'failure',
         }
       end
 

data/lib/insights_cloud.rb

@@ -28,4 +28,8 @@ module InsightsCloud
   def self.enable_client_param
     'host_registration_insights'
   end
+
+  def self.enable_cloud_remediations_param
+    'enable_cloud_remediations'
+  end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "5.0.38",
+  "version": "6.0.42",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,14 +22,14 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">=8.16.0"
+    "@theforeman/vendor": ">= 8.16.0"
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
-    "@theforeman/builder": ">=8.16.0",
-    "@theforeman/stories": ">=8.16.0",
-    "@theforeman/test": ">=8.16.0",
-    "@theforeman/eslint-plugin-foreman": ">=8.16.0",
+    "@theforeman/builder": ">= 8.16.0",
+    "@theforeman/stories": ">= 8.16.0",
+    "@theforeman/test": ">= 8.16.0",
+    "@theforeman/eslint-plugin-foreman": ">= 8.16.0",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/test/controllers/insights_cloud/api/cloud_request_controller_test.rb

@@ -40,6 +40,33 @@ module InsightsCloud::Api
       assert_response :success
     end
 
+    test 'Starts playbook run for correct directive with capitalized keys' do
+      host1 = FactoryBot.create(:host, :with_insights_hits)
+      host1.insights.uuid = 'TEST_UUID1'
+      host1.insights.save!
+      host2 = FactoryBot.create(:host, :with_insights_hits)
+      host2.insights.uuid = 'TEST_UUID2'
+      host2.insights.save!
+
+      mock_composer = mock('composer')
+      ::JobInvocationComposer.expects(:for_feature).with do |feature, host_ids, params|
+        feature == :rh_cloud_connector_run_playbook &&
+        host_ids.first == host1.id &&
+        host_ids.last == host2.id
+      end.returns(mock_composer)
+      mock_composer.expects(:trigger!)
+      mock_composer.expects(:job_invocation)
+
+      params = run_playbook_request
+      params['Directive'] = params.delete('directive')
+      params['Metadata'] = params.delete('metadata')
+      params['Content'] = params.delete('content')
+
+      post :update, params: run_playbook_request
+
+      assert_response :success
+    end
+
     private
 
     def run_playbook_request

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -27,4 +27,21 @@ class SettingsControllerTest < ActionController::TestCase
     assert_equal true, actual['insightsSyncEnabled']
     assert_equal true, Setting[:allow_auto_insights_sync]
   end
+
+  test 'Should update an organization parameter' do
+    FactoryBot.create(:common_parameter, name: InsightsCloud.enable_cloud_remediations_param, value: false)
+    host = FactoryBot.create(:host)
+
+    # make sure the parameter is there
+    assert_equal false, host.host_params[InsightsCloud.enable_cloud_remediations_param]
+
+    post :set_org_parameter, params: { parameter: InsightsCloud.enable_cloud_remediations_param, value: true, organization_id: host.organization.id }, session: set_session_user
+
+    # needed for properly access host_params
+    User.as_anonymous_admin do
+      # refresh the host record
+      host = Host.find(host.id)
+      assert_equal true, host.host_params[InsightsCloud.enable_cloud_remediations_param]
+    end
+  end
 end

data/test/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -14,7 +14,7 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
   end
 
   setup do
-    feature = RemoteExecutionFeature.register(
+    RemoteExecutionFeature.register(
       :rh_cloud_connector_run_playbook,
       N_('Run RH Cloud playbook'),
       description: N_('Run playbook genrated by Red Hat remediations app'),
@@ -22,14 +22,10 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
       provided_inputs: ['playbook_url', 'report_url', 'correlation_id', 'report_interval']
     )
 
-    puts "REX Register: #{feature.id}"
-
     @job_invocation = generate_job_invocation
 
     # reset connector feature ID cache
     TestConnectorPlaybookExecutionReporterTask.instance_variable_set(:@connector_feature_id, nil)
-
-    puts RemoteExecutionFeature.all.to_a
   end
 
   test 'It reports finish playbook messages' do
@@ -115,8 +111,6 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     )
     feature = RemoteExecutionFeature.feature!(:rh_cloud_connector_run_playbook).id
 
-    puts "Generated feature: #{feature}"
-
     job_invocation = FactoryBot.create(
       :job_invocation,
       remote_execution_feature_id: feature,

data/test/jobs/upload_report_job_test.rb

@@ -12,7 +12,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
         'idCert' => 'TEST_CERT',
       }
     )
-    Setting[:content_disconnected] = true
+    ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
 
     ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 

data/test/unit/playbook_progress_generator_test.rb

@@ -51,7 +51,7 @@ class PlaybookProgressGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'Outputs job finished message' do
-    @generator.job_finished_message
+    @generator.job_finished_message(true)
 
     actual = @generator.generate
     actual_message = JSON.parse(actual)

data/webpack/ForemanRhCloudFills.js

@@ -18,7 +18,7 @@ const fills = [
     weight: 400,
   },
   {
-    slot: 'details-cards',
+    slot: 'host-overview-cards',
     name: 'insights-total-risk-chart',
     component: props => <InsightsTotalRiskCard {...props} />,
     weight: 1100,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.38
+  version: 6.0.42
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -158,7 +158,6 @@ files:
 - app/models/insights_resolution.rb
 - app/models/insights_rule.rb
 - app/models/inventory_sync/inventory_status.rb
-- app/models/setting/rh_cloud.rb
 - app/models/task_output_line.rb
 - app/models/task_output_status.rb
 - app/overrides/hosts_list.rb
@@ -182,7 +181,6 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
-- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -220,6 +218,7 @@ files:
 - lib/foreman_inventory_upload/scripts/uploader.sh.erb
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/engine.rb
+- lib/foreman_rh_cloud/settings.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
 - lib/insights_cloud/async/cloud_connector_announce_task.rb
@@ -675,7 +674,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.

data/app/models/setting/rh_cloud.rb

@@ -1,29 +0,0 @@
-class Setting::RhCloud < Setting
-  ::Setting::BLANK_ATTRS.concat %w{rhc_instance_id}
-
-  def self.load_defaults
-    return false unless table_exists?
-    transaction do
-      # If the user had auto_upload default setting, we will not surprise him, and force the value to false
-      # for new users, the default will be set to true and the value will remain nil
-      Setting.where(name: 'allow_auto_inventory_upload', value: nil).where("settings.default LIKE '%false%'").update_all(value: "--- false\n...")
-      super
-    end
-  end
-
-  def self.default_settings
-    [
-      set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
-      set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),
-      set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to the Red Hat cloud'), false, N_('Obfuscate host names')),
-      set('obfuscate_inventory_ips', N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), false, N_('Obfuscate host ipv4 addresses')),
-      set('exclude_installed_packages', N_('Exclude installed packages from being uploaded to the Red Hat cloud'), false, N_("Exclude installed Packages")),
-      set('include_parameter_tags', N_('Should import include parameter tags from Foreman?'), false, N_('Include parameters in insights-client reports')),
-      set('rhc_instance_id', N_('RHC daemon id'), nil, N_('ID of the RHC(Yggdrasil) daemon')),
-    ]
-  end
-
-  def self.humanized_category
-    N_('RH Cloud')
-  end
-end