foreman_rh_cloud 5.0.30 → 5.0.33

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -133,4 +133,23 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal 'GET', actual[:method]
     assert_equal params, actual[:headers][:params]
   end
+
+  test 'should forward content type correctly' do
+    user_agent = { :foo => :bar }
+    params = { :page => 5, :per_page => 42 }
+    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_name).returns('test_app')
+    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_version).returns('test_ver')
+
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_USER_AGENT' => user_agent,
+      'rack.input' => ::Puma::NullIO.new,
+      'action_dispatch.request.query_parameters' => params
+    )
+
+    actual = @forwarder.prepare_request_opts(req, 'TEST PAYLOAD', params, generate_certs_hash)
+
+    assert_match /text\/html/, actual[:headers][:content_type]
+  end
 end

data/test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb

@@ -28,6 +28,8 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       RestClient::Response.new('TEST RESPONSE ORG 1')
     )
 
+    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).twice.returns(true)
+
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 
@@ -55,6 +57,8 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       'TEST RESPONSE ORG 0'
     )
 
+    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).returns(true)
+
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 

data/test/unit/services/foreman_rh_cloud/{remediations_retriever_test.rb → hit_remediations_retriever_test.rb}

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class RemediationsRetrieverTest < ActiveSupport::TestCase
+class HitRemediationsRetrieverTest < ActiveSupport::TestCase
   setup do
     @host1 = FactoryBot.create(:host)
     @host2 = FactoryBot.create(:host)
@@ -16,7 +16,7 @@ class RemediationsRetrieverTest < ActiveSupport::TestCase
     host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
 
     pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation1.id}]
-    retriever = ForemanRhCloud::RemediationsRetriever.new(pairs)
+    retriever = ForemanRhCloud::HitRemediationsRetriever.new(pairs)
 
     actual_request = retriever.send(:playbook_request)
 
@@ -39,7 +39,7 @@ class RemediationsRetrieverTest < ActiveSupport::TestCase
     host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
 
     pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation2.id}]
-    retriever = ForemanRhCloud::RemediationsRetriever.new(pairs)
+    retriever = ForemanRhCloud::HitRemediationsRetriever.new(pairs)
 
     actual_request = retriever.send(:playbook_request)
 

data/test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb

@@ -0,0 +1,27 @@
+require 'test_plugin_helper'
+
+class UrlRemediationsRetrieverTest < ActiveSupport::TestCase
+  test 'Calls the given url' do
+    Setting[:rh_cloud_token] = 'TEST_TOKEN'
+    retreiver = ForemanRhCloud::UrlRemediationsRetriever.new(
+      url: 'http://test.example.com',
+      payload: 'TEST_PAYLOAD',
+      headers: {
+        custom1: 'TEST_HEADER',
+      }
+    )
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_RESPONSE')
+    retreiver.expects(:execute_cloud_request).with do |params|
+      params[:method] == :get &&
+      params[:url] == 'http://test.example.com' &&
+      params[:headers][:custom1] == 'TEST_HEADER' &&
+      params[:payload] == "\"TEST_PAYLOAD\""
+    end.returns(response)
+
+    actual = retreiver.create_playbook
+
+    assert_equal 'TEST_RESPONSE', actual
+  end
+end

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -46,7 +46,7 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
                       isPending={status === STATUS.PENDING}
                       authStatus={cert}
                     />{' '}
-                    {cert.org_name}
+                    {cert.org_name} {cert.error}
                   </>
                 ),
               },

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -25,7 +25,7 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   } = useAPI('get', insightsCloudUrl(`hits/${id}`), API_OPTIONS);
 
   useEffect(() => {
-    if (status !== STATUS.PENDING) {
+    if (status === STATUS.RESOLVED) {
       const risks = getInitialRisks();
       hits.forEach(({ total_risk: risk }) => {
         risks[risk].value += 1;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.30
+  version: 5.0.33
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -132,6 +132,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/api/v2/rh_cloud/cloud_request_controller.rb
 - app/controllers/api/v2/rh_cloud/inventory_controller.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
@@ -166,12 +167,16 @@ files:
 - app/services/foreman_rh_cloud/cloud_auth.rb
 - app/services/foreman_rh_cloud/cloud_connector.rb
 - app/services/foreman_rh_cloud/cloud_ping_service.rb
+- app/services/foreman_rh_cloud/cloud_presence.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
+- app/services/foreman_rh_cloud/hit_remediations_retriever.rb
 - app/services/foreman_rh_cloud/insights_status_cleaner.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
+- app/services/foreman_rh_cloud/url_remediations_retriever.rb
 - app/views/hosts/_insights_tab.html.erb
+- app/views/job_templates/rh_cloud_download_playbook.erb
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
@@ -215,6 +220,7 @@ files:
 - lib/foreman_rh_cloud/engine.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
+- lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb
 - lib/insights_cloud/async/insights_client_status_aging.rb
 - lib/insights_cloud/async/insights_full_sync.rb
 - lib/insights_cloud/async/insights_generate_notifications.rb
@@ -222,6 +228,7 @@ files:
 - lib/insights_cloud/async/insights_rules_sync.rb
 - lib/insights_cloud/async/insights_scheduled_sync.rb
 - lib/insights_cloud/async/rules_result.rb
+- lib/insights_cloud/generators/playbook_progress_generator.rb
 - lib/inventory_sync/async/host_result.rb
 - lib/inventory_sync/async/inventory_full_sync.rb
 - lib/inventory_sync/async/inventory_hosts_sync.rb
@@ -237,6 +244,7 @@ files:
 - locale/gemspec.rb
 - package.json
 - test/controllers/accounts_controller_test.rb
+- test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
@@ -246,6 +254,7 @@ files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
+- test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -262,14 +271,16 @@ files:
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
+- test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
-- test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
+- test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb
@@ -672,6 +683,7 @@ specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
 - test/controllers/accounts_controller_test.rb
+- test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
@@ -681,6 +693,7 @@ test_files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
+- test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -697,14 +710,16 @@ test_files:
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
+- test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
-- test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
+- test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb