foreman_rh_cloud 5.0.38 → 5.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb7932e40d6ef999b5266897539d444e9ab7a38606e6f66dff58fb568d70fdc
-  data.tar.gz: f6e6a8ae8ddfb3544fbe31c807f9917fe7aa2d5d1d05014055528bb193290109
+  metadata.gz: 21744025612c50afc1aa1c943e33a0c2dd6e76e8a2ee778ae74068d57c8d971f
+  data.tar.gz: 491d74b6e3ad554de98c2ce45c5b95806547855ab8794aa9a51e3e08bc6e3bca
 SHA512:
-  metadata.gz: dcc37dffd7f108e1687b671ea0f5b157644c6a9576310d917daafefd4011ad01ccced6d48941823873a3da076ab20da2db33fe2c463cc0e962f69a79ea565400
-  data.tar.gz: 72f7a08cc3f30d0bddaaf63e0198df2761a40153c7185d1e30328a1c00b9496e7ce33b34ceec44ecf69989ab570001173524cfc49e5a9e127a540bf4684f9d02
+  metadata.gz: a4e8097f9923909d623e445a0b0ca604e737409ee6ce06962e0ae9122f9d8a95d568a41b8e5b2061d2629e6290605f72209f861a9dd7c709661703a927bb5cdf
+  data.tar.gz: 6c62744629566595c8f2ddb4e6b649ac6131efe177666455c97d9dc7353c1f7e2102f90938c2828f95ddfc57fa65a11244cf0a7cc2641595df429948ce01117e

data/app/controllers/api/v2/rh_cloud/cloud_request_controller.rb

@@ -27,16 +27,18 @@ module Api::V2::RhCloud
     private
 
     def metadata
-      params['metadata']
+      params['Metadata'] || params['metadata']
     end
 
     def content
+      content = params['Content'] || params['content']
+
       # the content received as base 64 of the string in double quotes
-      Base64.decode64(params['content']).tr('"', '')
+      Base64.decode64(content).tr('"', '')
     end
 
     def directive
-      params['directive']
+      params['Directive'] || params['directive']
     end
 
     def handle_run_playbook_request
@@ -44,9 +46,13 @@ module Api::V2::RhCloud
       logger.error("Reporting URL is not valid: #{metadata['return_url']}") && return unless valid_url?(metadata['return_url'])
 
       hosts = metadata['hosts'].split(',')
-      host_ids = host_ids(hosts)
 
-      logger.warn("Some hosts were not found. Looked for: #{hosts}, found ids: #{host_ids}") unless host_ids.length == hosts.length
+      # select hosts from the metadata list that are not disabled by the parameter.
+      host_ids = Host.search_for("not params.#{InsightsCloud.enable_cloud_remediations_param} = f")
+                     .where(id: host_ids(hosts))
+                     .pluck(:id)
+
+      logger.warn("Some hosts were not found/ignored. Looked for: #{hosts}, found ids: #{host_ids}") unless host_ids.length == hosts.length
 
       logger.error("sat_org_id is not present in the metadata") && return unless metadata['sat_org_id']
       org_id = metadata['sat_org_id'].to_i

data/app/controllers/insights_cloud/settings_controller.rb

@@ -9,6 +9,20 @@ module InsightsCloud
       render_setting(:insightsSyncEnabled, :allow_auto_insights_sync)
     end
 
+    def set_org_parameter
+      parameter = params.require(:parameter)
+      new_value = ActiveModel::Type::Boolean.new.cast(params.require(:value))
+      org_id = params.require(:organization_id)
+
+      organization = Organization.authorized.find(org_id)
+
+      org_param = organization.organization_parameters.find_or_create_by(name: parameter) do |org_param|
+        org_param.name = parameter
+      end
+      org_param.value = new_value
+      org_param.save!
+    end
+
     private
 
     def render_setting(node_name, setting)

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_rh_cloud/engine.rb

@@ -83,9 +83,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/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.38'.freeze
+  VERSION = '5.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": "5.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/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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.38
+  version: 5.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-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -182,7 +182,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
@@ -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.