foreman_rh_cloud 5.0.38 → 5.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb7932e40d6ef999b5266897539d444e9ab7a38606e6f66dff58fb568d70fdc
-  data.tar.gz: f6e6a8ae8ddfb3544fbe31c807f9917fe7aa2d5d1d05014055528bb193290109
+  metadata.gz: ee0416cdf8e5d2ed1315759fe70b9d5328754afbf676cecff442f20f835cde2c
+  data.tar.gz: c32a6486106d8dd395860f2ba956ef06980e8e8115a55b1f8731e3d7db440ffb
 SHA512:
-  metadata.gz: dcc37dffd7f108e1687b671ea0f5b157644c6a9576310d917daafefd4011ad01ccced6d48941823873a3da076ab20da2db33fe2c463cc0e962f69a79ea565400
-  data.tar.gz: 72f7a08cc3f30d0bddaaf63e0198df2761a40153c7185d1e30328a1c00b9496e7ce33b34ceec44ecf69989ab570001173524cfc49e5a9e127a540bf4684f9d02
+  metadata.gz: 1afe5ccd1f0704428ac26ff319491e737e04acd28cc8bfc2e2e77acba7195657ecd89a078aadc3e892f5953680d2da9113f52562847cf9839b28c2d9e4507f9c
+  data.tar.gz: 6e78ebbbd8a9e833aadb15b95673fe57f99a60daab0ca3c48d1829dfd055e7f7744c0189e63b51077d03c2dd5d0084d95ecf87a745796afc2965dc016bef2132

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_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.39'.freeze
 end

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -137,6 +137,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 +152,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/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.39",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

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/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.39
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello