foreman_rh_cloud 4.0.25.1 → 4.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf14938ab96483d5b90b699ad095664ccda999db645f3d0e4b868b8e6066f268
-  data.tar.gz: 90062d9c4bf632a9d856d17e16639d6920e6a9b9d0bbad1334202041122fd19f
+  metadata.gz: 713d1737fd81e7a54efa8a300fe4c0765c1d2a31b796218bcc1f447b473921af
+  data.tar.gz: a47efbe51980f47c71e57af619f73a08d214f7af3bb84632946189a1aabe81f3
 SHA512:
-  metadata.gz: 46eb0bfffd3853da3d4d0254756469e07f6f690166e96732bcb77a027d9cf3370cbe3d3f72e59a801cf85338fd2b2a042e45dd4a74907df3b66969a1006cb8c8
-  data.tar.gz: 1464b0f05e778e6b0a002114175b0c0a3f95b51c78af5fecd00395c42d6cd4196dffb0362724bcc62989403500e9994afe9012552e6e0ad00f0c0fe8f2e2fc5e
+  metadata.gz: c7419f0e5583f02038cf784e38d67f15dd0dfa3a392a72cd19000c0f51f41fc97a29ed2e9387bfee4e1fe7a91addb563db53167c98343b640f52e3b17a729387
+  data.tar.gz: 2eb4fea115c546084e2365807e87933e60a102f1ec7455cfc5a368a1ae5a20587bf7c12206e40816a2893c19d02a035a2cee3c2262982a53f88542599bda629d

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

@@ -7,6 +7,7 @@ module Api
         include InventoryUpload::TaskActions
 
         api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def download_file
           filename, file = report_file(params[:organization_id])
 
@@ -16,6 +17,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def generate_report
           organization_id = params[:organization_id]
 
@@ -27,6 +29,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/inventory_sync", N_("Start inventory synchronization")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def sync_inventory_status
           selected_org = Organization.find(params[:organization_id])
 
@@ -39,7 +42,7 @@ module Api
           render json: { message: error.message }, status: :bad_request
         end
 
-        api :POST, "rh_cloud/enable_connector", N_("Enable cloud connector")
+        api :POST, "/rh_cloud/enable_connector", N_("Enable cloud connector")
         def enable_cloud_connector
           cloud_connector = ForemanRhCloud::CloudConnector.new
           render json: cloud_connector.install.to_json

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -25,6 +25,14 @@ module InsightsCloud::Api
         }, status: :bad_gateway
       end
 
+      if @cloud_response.code >= 300
+        return render json: {
+          :message => 'Cloud request failed',
+          :headers => {},
+          :response => @cloud_response,
+        }, status: @cloud_response.code
+      end
+
       if @cloud_response.headers[:content_disposition]
         return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,6 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
+    rescue RestClient::Exception => error_response
+      error_response.response
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -62,6 +64,12 @@ module ForemanRhCloud
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
         }
+      when connection_test_request?
+        {
+          url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
@@ -76,6 +84,10 @@ module ForemanRhCloud
       ->(request_path) { request_path.include? '/platform' }
     end
 
+    def connection_test_request?
+      ->(request_path) { request_path =~ /redhat_access\/r\/insights\/?$/ }
+    end
+
     def prepare_forward_cloud_url(base_url, request_path)
       cloud_path = request_path.sub('/redhat_access/r/insights/platform/', '')
                                .sub('/redhat_access/r/insights/', '')
@@ -84,11 +96,11 @@ module ForemanRhCloud
     end
 
     def core_app_name
-      'Foreman'
+      BranchInfo.new.core_app_name
     end
 
     def core_app_version
-      Foreman::Version.new
+      BranchInfo.new.core_app_version
     end
 
     def http_user_agent(original_request)

data/config/Gemfile.lock.gh_test

@@ -40,66 +40,66 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.0.3.6)
+      actionpack (= 6.0.3.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionmailbox (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionpack (6.0.3.6)
+      actionview (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actiontext (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.3.6)
+      activesupport (= 6.0.3.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.0.3.6)
+      activesupport (= 6.0.3.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord-import (1.0.7)
+    activemodel (6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activerecord (6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activerecord-import (1.0.8)
       activerecord (>= 3.2)
     activerecord-nulldb-adapter (0.7.0)
       activerecord (>= 5.2.0, < 6.3)
-    activerecord-session_store (1.1.3)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
+    activerecord-session_store (2.0.0)
+      actionpack (>= 5.2.4.1)
+      activerecord (>= 5.2.4.1)
       multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0)
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.4)
+      rack (>= 2.0.8, < 3)
+      railties (>= 5.2.4.1)
+    activestorage (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -108,7 +108,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     algebrick (0.7.5)
-    amazing_print (1.2.2)
+    amazing_print (1.3.0)
     ancestry (3.2.1)
       activerecord (>= 4.2.0)
     anemone (0.7.2)
@@ -135,13 +135,13 @@ GEM
     benchmark-ips (2.8.4)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.7.1)
+    bootsnap (1.7.3)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (6.1.3)
+    bullet (6.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -167,7 +167,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     concurrent-ruby-edge (0.6.0)
       concurrent-ruby (~> 1.1.6)
     connection_pool (2.2.3)
@@ -179,12 +179,12 @@ GEM
     daemons (1.3.1)
     database_cleaner (1.99.0)
     deacon (1.0.0)
-    debug_inspector (1.0.0)
+    debug_inspector (1.1.0)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    deep_cloneable (3.0.0)
+    deep_cloneable (3.1.0)
       activerecord (>= 3.1.0, < 7)
-    deface (1.6.1)
+    deface (1.8.1)
       nokogiri (>= 1.6)
       polyglot
       rails (>= 5.2)
@@ -337,7 +337,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.8)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -368,16 +368,14 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     maruku (0.7.3)
     memoist (0.16.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0225)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
     minitest (5.10.3)
     minitest-reporters (1.4.3)
@@ -403,8 +401,8 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (4.2.0)
     netrc (0.11.0)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth (0.5.5)
@@ -414,7 +412,7 @@ GEM
       json (>= 1, < 3)
     paint (2.2.1)
     parallel (1.20.1)
-    parallel_tests (3.4.0)
+    parallel_tests (3.6.0)
       parallel
     parse-cron (0.1.4)
     parser (3.0.0.0)
@@ -491,20 +489,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    rails (6.0.3.6)
+      actioncable (= 6.0.3.6)
+      actionmailbox (= 6.0.3.6)
+      actionmailer (= 6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actiontext (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.4)
+      railties (= 6.0.3.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -518,9 +516,9 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -620,8 +618,8 @@ GEM
       tilt
     scoped_search (4.1.9)
       activerecord (>= 4.2.0)
-    sd_notify (0.1.0)
-    secure_headers (6.3.1)
+    sd_notify (0.1.1)
+    secure_headers (6.3.2)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -708,7 +706,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-nulldb-adapter
-  activerecord-session_store (>= 1.1.0, < 2)
+  activerecord-session_store (>= 2.0.0, < 3)
   amazing_print (~> 1.1)
   ancestry (>= 3.0.7, < 4, != 3.2.0)
   apipie-dsl (>= 2.2.6)

data/config/routes.rb

@@ -39,7 +39,7 @@ Rails.application.routes.draw do
     end
 
     scope '/r/insights' do
-      match '/*path', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
+      match '(/*path)(/)', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
     end
   end
 

data/lib/foreman_rh_cloud/engine.rb

@@ -42,6 +42,8 @@ module ForemanRhCloud
       Foreman::Plugin.register :foreman_rh_cloud do
         requires_foreman '>= 2.3'
 
+        apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
+
         # Add permissions
         security_block :foreman_rh_cloud do
           permission(

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '4.0.25.1'.freeze
+  VERSION = '4.0.26'.freeze
 end

data/lib/insights_cloud/async/insights_client_status_aging.rb

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

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -118,6 +118,10 @@ module InsightsCloud
 
         match || { id: nil }
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_generate_notifications.rb

@@ -53,6 +53,10 @@ module InsightsCloud
           }
         )
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -19,8 +19,9 @@ module InsightsCloud
       def run
         InsightsResolution.transaction do
           InsightsResolution.delete_all
-          api_response = query_insights_resolutions(relevant_rules)
-          write_resolutions(api_response)
+          rule_ids = relevant_rules
+          api_response = query_insights_resolutions(rule_ids) unless rule_ids.empty?
+          write_resolutions(api_response) if api_response
         end
       end
 
@@ -70,6 +71,10 @@ module InsightsCloud
       def to_rule_id(resolution_rule_id)
         RULE_ID_REGEX.match(resolution_rule_id).named_captures.fetch('id', resolution_rule_id)
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -11,8 +11,12 @@ module InsightsCloud
           return
         end
 
-        plan_self
-        plan_resolutions
+        # since the tasks are not connected, we need to force sequence execution here
+        # to make sure we don't run resolutions until we synced all our rules
+        sequence do
+          plan_self
+          plan_resolutions
+        end
       end
 
       def plan_resolutions
@@ -71,6 +75,10 @@ module InsightsCloud
           rating:  rule_hash['rating'],
         }
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -39,6 +39,10 @@ module InventorySync
         host_statuses[:sync] += results.touched.size
       end
 
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
       private
 
       def update_hosts_status(status_hashes, touched)

data/lib/inventory_sync/async/inventory_hosts_sync.rb

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "4.0.25.1",
+  "version": "4.0.26",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -45,4 +45,4 @@
     "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/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
@@ -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/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/webpack/InsightsCloudSync/Components/InsightsHeader/index.js

@@ -1,12 +1,10 @@
 import React from 'react';
 import { Text, TextVariants } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
-import InsightsSettings from '../InsightsSettings';
 import './InsightsHeader.scss';
 
 const InsightsHeader = () => (
   <div className="insights-header">
-    <InsightsSettings />
     <Text component={TextVariants.p}>
       {__(
         'Insights synchronization process is used to provide Insights recommendations output for hosts managed here.'

data/webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss

@@ -1,3 +1,4 @@
 .insights_settings {
   float: right;
+  margin-top: 22px;
 }

data/webpack/InsightsCloudSync/Components/__tests__/__snapshots__/InsightsHeader.test.js.snap

@@ -4,7 +4,6 @@ exports[`InsightsHeader render 1`] = `
 <div
   className="insights-header"
 >
-  <Connect(InsightsSettings) />
   <Text
     component="p"
   >

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -12,6 +12,7 @@ import {
 import './InsightsCloudSync.scss';
 import Pagination from './Components/InsightsTable/Pagination';
 import ToolbarDropdown from './Components/ToolbarDropdown';
+import InsightsSettings from './Components/InsightsSettings';
 
 const InsightsCloudSync = ({
   syncInsights,
@@ -42,6 +43,7 @@ const InsightsCloudSync = ({
 
   return (
     <div className="rh-cloud-insights">
+      <InsightsSettings />
       <PageLayout
         searchable
         searchProps={INSIGHTS_SEARCH_PROPS}

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -4,6 +4,7 @@ exports[`InsightsCloudSync render 1`] = `
 <div
   className="rh-cloud-insights"
 >
+  <Connect(InsightsSettings) />
   <PageLayout
     beforeToolbarComponent={<InsightsHeader />}
     header="Red Hat Insights"

data/webpack/common/Switcher/HelpLabel.js

@@ -11,7 +11,7 @@ export const HelpLabel = ({ text, id, className }) => {
         onClick={e => e.preventDefault()}
         className={`pf-c-form__group-label-help ${className}`}
       >
-        <HelpIcon noVerticalAlign />
+        <HelpIcon />
       </button>
     </Popover>
   );

data/webpack/common/Switcher/__tests__/__snapshots__/HelpLabel.test.js.snap

@@ -12,7 +12,7 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   >
     <HelpIcon
       color="currentColor"
-      noVerticalAlign={true}
+      noVerticalAlign={false}
       size="sm"
     />
   </button>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.25.1
+  version: 4.0.26
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -657,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.