foreman_rh_cloud 4.0.25.1 → 5.0.29

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -24,6 +24,10 @@ module InventorySync
       def logger
         action_logger
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -20,6 +20,10 @@ module InventorySync
         results
       end
 
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
       private
 
       def add_missing_insights_facet(uuids_hash)

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -50,6 +50,10 @@ module InventorySync
       def request_url
         ForemanInventoryUpload.inventory_export_url
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -12,7 +12,7 @@ namespace :rh_cloud_inventory do
 
       User.as_anonymous_admin do
         organizations.each do |organization|
-          ForemanInventoryUpload::Async::GenerateReportJob.perform_now(ForemanInventoryUpload.generated_reports_folder, organization.id)
+          ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization.id)
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end
       end
@@ -47,7 +47,7 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      ForemanInventoryUpload::Async::QueueForUploadJob.perform_now(base_folder, report_file, organization_id)
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id)
       puts "Uploaded #{report_file}"
     end
   end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "4.0.25.1",
+  "version": "5.0.29",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,27 +22,22 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "~4.14.0"
+    "@theforeman/vendor": "~8.16.0"
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
-    "@redhat-cloud-services/frontend-components": "^2.5.0",
-    "@theforeman/builder": "~4.14.0",
-    "@theforeman/stories": "~4.14.0",
-    "@theforeman/test": "~4.14.0",
-    "@theforeman/vendor-dev": "~4.14.0",
-    "@theforeman/eslint-plugin-foreman": "~4.14.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",
+    "jed": "~1.1.1",
     "prettier": "~1.19.1",
     "stylelint": "~9.3.0",
     "stylelint-config-standard": "~18.0.0",
     "surge": "~0.20.3",
     "redux-mock-store": "~1.2.2"
-  },
-  "dependencies": {
-    "jed": "~1.1.1",
-    "react-intl": "~2.8.0"
   }
-}
+}

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

@@ -7,6 +7,8 @@ module InsightsCloud::Api
     end
 
     context '#forward_request' do
+      include MockCerts
+
       setup do
         @body = 'Cloud response body'
         @http_req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
@@ -16,38 +18,9 @@ module InsightsCloud::Api
         User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:upstream_owner).returns({ 'uuid' => 'abcdefg' })
 
-        @cert1 = "-----BEGIN CERTIFICATE-----\r\n" +
-        "MIIFdDCCA1ygAwIBAgIJAM5Uqykb3EAtMA0GCSqGSIb3DQEBCwUAME8xCzAJBgNV\r\n" +
-        "BAYTAklMMREwDwYDVQQIDAhUZWwgQXZpdjEUMBIGA1UECgwLVGhlIEZvcmVtYW4x\r\n" +
-        "FzAVBgNVBAMMDnRoZWZvcmVtYW4ub3JnMB4XDTE4MDMyNDEyMzYyOFoXDTI4MDMy\r\n" +
-        "MTEyMzYyOFowTzELMAkGA1UEBhMCSUwxETAPBgNVBAgMCFRlbCBBdml2MRQwEgYD\r\n" +
-        "VQQKDAtUaGUgRm9yZW1hbjEXMBUGA1UEAwwOdGhlZm9yZW1hbi5vcmcwggIiMA0G\r\n" +
-        "CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF04/s4h+BgHPG1HDZ/sDlYq925pkc\r\n" +
-        "RTVAfnE2EXDAmZ6W4Q9ueDY65MHe3ZWO5Dg72kNSP2sK9kRI7Dk5CAFOgyw1rH8t\r\n" +
-        "Hd1+0xp/lv6e4SvSYghxIL68vFe0ftKkm1usqejBM5ZTgKr7JCI+XSIN36F65Kde\r\n" +
-        "c+vxwBnayuhP04r9/aaE/709SXML4eRVYW8I3qFy9FPtUOm+bY8U2PIv5fHayqbG\r\n" +
-        "cL/4t3+MCtMhHJsLzdBXya+1P5t+HcKjUNlmwoUF961YAktVuEFloGd0RMRlqF3/\r\n" +
-        "itU3QNlXgA5QBIciE5VPr/PiqgMC3zgd5avjF4OribZ+N9AATLiQMW78il5wSfcc\r\n" +
-        "kQjU9ChOLrzku455vQ8KE4bc0qvpCWGfUah6MvL9JB+TQkRl/8kxl0b9ZinIvJDH\r\n" +
-        "ynVMb4cB/TDEjrjOfzn9mWLH0ZJqjmc2bER/G12WQxOaYLxdVwRStD3Yh6PtiFWu\r\n" +
-        "sXOk19UOTVkeuvGFVtvzLfEwQ1lDEo7+VBQz8FG/HBu2Hpq3IwCFrHuicikwjQJk\r\n" +
-        "nfturgD0rBOKEc1qWNZRCvovYOLL6ihvv5Orujsx5ZCHOAtnVNxkvIlFt2RS45LF\r\n" +
-        "MtPJyhAc6SjitllfUEirxprsbmeSZqrIfzcGaEhgOSnyik1WMv6bYiqPfBg8Fzjh\r\n" +
-        "vOCbtiDNPmvgOwIDAQABo1MwUTAdBgNVHQ4EFgQUtkAgQopsTtG9zSG3MgW2IxHD\r\n" +
-        "MDwwHwYDVR0jBBgwFoAUtkAgQopsTtG9zSG3MgW2IxHDMDwwDwYDVR0TAQH/BAUw\r\n" +
-        "AwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAJq7iN+ZroRBweNhvUobxs75bLIV6tNn1\r\n" +
-        "MdNHDRA+hezwf+gxHZhFyaAHfTpst2/9leK5Qe5Zd6gZLr3E5/8ppQuRod72H39B\r\n" +
-        "vxMlG5zxDss0WMo3vZeKZbTY6QhXi/lY2IZ6OGV4feSvCsYxn27GTjjrRUSLFeHH\r\n" +
-        "JVemCwCDMavaE3+OIY4v2P4FcG+MjUvfOB9ahI24TWL7YgrsNVmJjCILq+EeUj0t\r\n" +
-        "Gde1SXVyLkqt7PoxHRJAE0BCEMJSnjxaVB329acJgeehBUxjj4CCPqtDxtbz9HEH\r\n" +
-        "mOKfNdaKpFor+DUeEKUWVGnr9U9xOaC+Ws+oX7MIEUCDM7p2ob4JwcjnFs1jZgHh\r\n" +
-        "Hwig+i7doTlc701PvKWO96fuNHK3B3/jTb1fVvSZ49O/RvY1VWODdUdxWmXGHNh3\r\n" +
-        "LoR8tSPEb46lC2DXGaIQumqQt8PnBG+vL1qkQa1SGTV7dJ8TTbxbv0S+sS+igkk9\r\n" +
-        "zsIEK8Ea3Ep935cXximz0faAAKHSA+It+xHLAyDtqy2KaAEBgGsBuuWlUfK6TaP3\r\n" +
-        "Gwdjct3y4yYUO45lUsUfHqX8vk/4ttW5zYeDiW+HArJz+9VUXNbEdury4kGuHgBj\r\n" +
-        "xHD4Bsul65+hHZ9QywKU26F1A6TLkYpQ2rk/Dx9LGICM4m4IlHjWJPFsQdtkyOor\r\n" +
-        "osxMtcaZZ1E=\r\n" +
-        "-----END CERTIFICATE-----"
+        setup_certs_expectation do
+          InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:candlepin_id_cert)
+        end
       end
 
       test "should respond with response from cloud" do
@@ -67,13 +40,6 @@ module InsightsCloud::Api
         ::ForemanRhCloud::CloudRequestForwarder.any_instance.expects(:execute_cloud_request).with do |opts|
           opts[:headers][:content_type] == 'application/json'
         end.returns(res)
-        InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:candlepin_id_cert)
-          .returns(
-            {
-              cert: @cert1,
-              key: OpenSSL::PKey::RSA.new(1024).to_pem,
-            }
-          )
         InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:cp_owner_id).returns('123')
 
         post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => {"foo" => "bar"} }
@@ -103,6 +69,17 @@ module InsightsCloud::Api
         assert_equal 502, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
+
+      test "should forward errors to the client" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 500, "TEST_RESPONSE")
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::InternalServerError.new(res))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 500, @response.status
+        assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
+        assert_match /#{@body}/, JSON.parse(@response.body)['response']
+      end
     end
 
     context '#branch_info' do

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -4,7 +4,7 @@ class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
 
   test 'should return allow_auto_insights_sync setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_insights_sync', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_insights_sync] = false
 
     assert_equal false, Setting[:allow_auto_insights_sync]
 
@@ -16,7 +16,7 @@ class SettingsControllerTest < ActionController::TestCase
   end
 
   test 'should update allow_auto_insights_sync setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_insights_sync', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_insights_sync] = false
 
     assert_equal false, Setting[:allow_auto_insights_sync]
 

data/test/controllers/uploads_settings_controller_test.rb

@@ -4,7 +4,7 @@ class UploadsSettingsControllerTest < ActionController::TestCase
   tests ForemanInventoryUpload::UploadsSettingsController
 
   test 'should get upload inventory settings' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+    Setting[:allow_auto_inventory_upload] = true
 
     assert_equal true, Setting[:allow_auto_inventory_upload]
 
@@ -17,7 +17,7 @@ class UploadsSettingsControllerTest < ActionController::TestCase
   end
 
   test 'should update allow_auto_inventory_upload setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_inventory_upload] = false
 
     assert_equal false, Setting[:allow_auto_inventory_upload]
 

data/test/factories/inventory_upload_factories.rb

@@ -54,10 +54,24 @@ FactoryBot.define do
   end
 end
 
+FactoryBot.define do
+  factory :katello_subscription, :class => Katello::Subscription do
+  end
+end
+
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
     active { true }
     end_date { Date.today + 1.year }
+    cp_id { 1 }
+
+    association :organization, :factory => :katello_organization
+
+    after(:build) do |pool, _evaluator|
+      pool.subscription.organization = pool.organization
+    end
+
+    association :subscription, :factory => :katello_subscription
   end
 end
 

data/test/jobs/insights_full_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsFullSyncTest < ActiveSupport::TestCase
@@ -7,7 +7,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')

data/test/jobs/insights_resolutions_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsResolutionsSyncTest < ActiveSupport::TestCase
@@ -63,7 +63,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     }
 
     @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Resolutions data is replaced with data from cloud' do
@@ -75,4 +75,13 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 5, InsightsResolution.all.count
     assert_equal 2, @rule.resolutions.count
   end
+
+  test 'Skips pinging the cloud if no rule ids were found' do
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+    InsightsRule.all.delete_all
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
 end

data/test/jobs/insights_rules_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsRulesSyncTest < ActiveSupport::TestCase
@@ -112,7 +112,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
 
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Hits data is replaced with data from cloud' do

data/test/jobs/inventory_full_sync_test.rb

@@ -37,6 +37,18 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host3 = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+
+    @host3.subscription_facet.pools << pool
+
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -151,7 +163,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
         {
           "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
           "rhel_machine_id": null,
-          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
+          "subscription_manager_id": "#{@host3.subscription_facet.uuid}",
           "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
           "ip_addresses": [
@@ -159,7 +171,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
             "fd6e:2298:736e::857",
             "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
           ],
-          "fqdn": "rhel8-demo.oss-lab.net",
+          "fqdn": "#{@host3.fqdn}",
           "mac_addresses": [
             "6e:66:a6:fe:fc:07",
             "00:00:00:00:00:00"
@@ -242,7 +254,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be SYNC for inventory hosts' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
@@ -254,7 +266,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
@@ -265,10 +277,24 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Task should be aborted if token is not present' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: '')
+    Setting[:rh_cloud_token] = ''
 
     InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
   end
+
+  test 'Should skip hosts that are not returned in query' do
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
+    @host2.reload
+
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -6,7 +6,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
@@ -265,4 +265,19 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_equal @host2_inventory_id, @host2.insights.uuid
   end
+
+  test 'Inventory should sync empty facets list' do
+    empty_inventory = @inventory.deep_clone
+    empty_inventory['results'] = []
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(empty_inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
+
+    assert_nil @host2.insights
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync)
+
+    @host2.reload
+
+    assert_nil @host2.insights
+  end
 end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -5,7 +5,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   test 'Schedules an execution if auto upload is enabled' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+    Setting[:allow_auto_inventory_upload] = true
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
 
@@ -13,7 +13,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
   end
 
   test 'Skips execution if auto upload is disabled' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_inventory_upload] = false
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 

data/test/jobs/inventory_self_host_sync_test.rb

@@ -6,7 +6,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(:host)

data/test/jobs/upload_report_job_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
-class UploadReportJobTest < ActiveJob::TestCase
+class UploadReportJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'returns aborted state when disconnected' do
@@ -10,9 +12,9 @@ class UploadReportJobTest < ActiveJob::TestCase
         'idCert' => 'TEST_CERT',
       }
     )
-    FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
+    Setting[:content_disconnected] = true
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
@@ -24,7 +26,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/test_plugin_helper.rb

@@ -32,8 +32,6 @@ module KatelloLocationFix
 
   included do
     setup do
-      FactoryBot.create(:setting, name: 'default_location_subscribed_hosts')
-      FactoryBot.create(:setting, name: 'default_location_puppet_content')
       Setting[:default_location_subscribed_hosts] = Location.first.title
     end
   end

data/test/unit/foreman_rh_cloud_self_host_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class ForemanRhCloudSelfHostTest < ActiveSupport::TestCase
+  setup do
+    # reset cached value
+    ForemanRhCloud.instance_variable_set(:@foreman_host, nil)
+  end
+
+  test 'finds host by fullname' do
+    @domain
+    @host = FactoryBot.create(:host, :managed)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+
+  test 'finds host by shortname' do
+    @host = FactoryBot.create(:host, :managed)
+    Host.where(name: @host.name).update_all(name: @host.shortname)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+end

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -41,7 +41,7 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   end
 
   def setup_global_foreman_proxy
-    FactoryBot.create(:setting, :name => 'http_proxy', :value => @global_foreman_proxy_mock)
+    Setting[:http_proxy] = @global_foreman_proxy_mock
   end
 
   def setup_cdn_proxy

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

@@ -38,7 +38,7 @@ class BranchInfoTest < ActiveSupport::TestCase
   test 'should generate appropriate labels' do
     2.times { FactoryBot.create(:katello_host_collection, :organization_id => @host.organization.id) }
 
-    FactoryBot.create(:setting, :settings_type => 'boolean', :default => true, :name => :include_parameter_tags)
+    Setting[:include_parameter_tags] = true
 
     Katello::HostCollection.all.map do |collection|
       FactoryBot.create(:katello_host_collection_host, :host_id => @host.id, :host_collection_id => collection.id)

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

@@ -17,6 +17,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
       "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
       "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
       "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
+      "/redhat_access/r/insights/" => "https://cert.cloud.redhat.com/api/apicast-tests/ping",
     }
 
     paths.each do |key, value|
@@ -107,4 +108,29 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     )
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
+
+  test 'should reuse BranchInfo identifiers for user_agent' 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 /foo/, actual[:headers][:user_agent]
+    assert_match /bar/, actual[:headers][:user_agent]
+    assert_match /test_app/, actual[:headers][:user_agent]
+    assert_match /test_ver/, actual[:headers][:user_agent]
+    assert_equal 'TEST PAYLOAD', actual[:payload]
+    assert_equal 'GET', actual[:method]
+    assert_equal params, actual[:headers][:params]
+  end
 end

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

@@ -8,7 +8,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/shell_process_job_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
 class ShellProcessJobTest < ActiveSupport::TestCase
   class TestProcessJob < ForemanInventoryUpload::Async::ShellProcess
@@ -13,11 +14,12 @@ class ShellProcessJobTest < ActiveSupport::TestCase
     end
   end
 
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'Runs a process with environment vars' do
     label = Foreman.uuid
-    TestProcessJob.perform_now(label)
+    ForemanTasks.sync_task(TestProcessJob, label)
 
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)