foreman_rh_cloud 12.0.0 → 12.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3666ab0afa45f6fbf3fbe06ec110cbbf7d7eca432b02686e945afca5b412f31
-  data.tar.gz: ce3380aca30486d23d89c3e9b30d17cbc862e51ba55032b1e60565ec63af1cc2
+  metadata.gz: a42f6e6437d9d99d173939b6ce360e573d40d4dbd2c99ba6aa71bd7c54ad868a
+  data.tar.gz: 811a4d82f96597e833067ce20b0654b90a99a35dd6c8da289272e479c6e83917
 SHA512:
-  metadata.gz: b853fd7fe75e52c4127984c2644feb55fb455d52d68a86b55ed9d96b84e03d05408fc9ddf5190253d2938965c8583b33903682fabfe137f42ce06f57a2d96a09
-  data.tar.gz: fb4777f06aa6d47e0038cc3533b86779a95694c23e4d01b01bc78e10c07196f16df87ead87d4787e8c4dc518813d7ef4e250d8fe955857ebe6811ad5e8b0d3ec
+  metadata.gz: c9d780419f9357ba8a73c40bccb6de50aa892e21ace6d0c5a9ab0c5f49e871e33406ca7b1b2560dd973875b08f229f8d32778699dd2b68aea69e186ce9eba1d8
+  data.tar.gz: 6726d03325a8cf3c5bd1aab3562120252025e4a18d0910d7c3bb08708bd509d8246fe53df87121c3532cb5f1ae2b6debde64b621171af0400b04380ffead6b85

data/README.md

@@ -1,6 +1,9 @@
+[![Ruby tests](https://github.com/theforeman/foreman_rh_cloud/actions/workflows/ruby_tests.yml/badge.svg)](https://github.com/theforeman/foreman_rh_cloud/actions/workflows/ruby_tests.yml)
+[![JS](https://github.com/theforeman/foreman_rh_cloud/actions/workflows/js_tests.yml/badge.svg)](https://github.com/theforeman/foreman_rh_cloud/actions/workflows/js_tests.yml)
+
 # ForemanRhCloud
 
-*Introdction here*
+*Introduction here*
 
 ## Installation
 
@@ -15,7 +18,7 @@ for how to install Foreman plugins
 
 #### Inventory upload
 
-In UI: Configure -> Inventory Upload -> Generate and upload report 
+In UI: Insights -> Inventory Upload -> select the organization -> Generate and upload report
 
 From command-line:
 
@@ -38,7 +41,7 @@ From command-line:
 
 #### Fetch hosts remediation data
 
-In UI: Configure -> Insights -> Sync now
+In UI: Insights -> Recommendations -> Sync recommendations (under the vertical ellipsis)
 
 From command-line:
 
@@ -46,7 +49,7 @@ From command-line:
 
 #### Synchronize inventory status
 
-In UI: Configure -> Inventory Upload -> Sync all inventory status
+In UI: Insights -> Inventory Upload -> Sync all inventory status
 
 From command-line:
 

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -16,7 +16,7 @@ module InventoryUpload
 
     def report_file(organization_id)
       filename = ForemanInventoryUpload.facts_archive_name(organization_id)
-      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
+      files = ForemanInventoryUpload.report_file_paths(organization_id)
 
       raise ReportMissingError.new(filename: filename) if files.empty?
 

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -8,12 +8,14 @@ module ForemanInventoryUpload
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
+          report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [
             label,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
+              report_file_paths: report_file_paths,
               id: id,
             },
           ]

data/app/controllers/foreman_inventory_upload/uploads_settings_controller.rb

@@ -2,7 +2,9 @@ module ForemanInventoryUpload
   class UploadsSettingsController < ::ApplicationController
     def index
       render json: {
+        insightsMinimalDataCollection: Setting[:insights_minimal_data_collection],
         autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+        subscriptionConnectionEnabled: Setting[:subscription_connection_enabled],
         hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
         ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
         excludePackagesEnabled: Setting[:exclude_installed_packages],

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

@@ -18,35 +18,39 @@ module InsightsCloud::Api
       certs = candlepin_id_cert @organization
       begin
         @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
-      rescue RestClient::Exception => e
-        logger.info("Forwarding request failed with exception: #{e}")
-        return render json: { error: e }, status: :bad_gateway
-      rescue RestClient::Timeout => e
-        logger.info("Forwarding request failed with timeout: #{e}")
-        return render json: { error: e }, status: :gateway_timeout
-      end
-
-      return render json: { message: @cloud_response.to_s }, status: :gateway_timeout if @cloud_response.is_a?(RestClient::Exceptions::OpenTimeout)
+      rescue RestClient::Exceptions::Timeout => e
+        response_obj = e.response.presence || e.exception
+        return render json: { message: response_obj.to_s, error: response_obj.to_s }, status: :gateway_timeout
+      rescue RestClient::Unauthorized => e
+        logger.warn("Forwarding request auth error: #{e}")
+        message = 'Authentication to the Insights Service failed.'
+        return render json: { message: message, error: message }, status: :unauthorized
+      rescue RestClient::NotModified => e
+        logger.info("Forwarding request not modified: #{e}")
+        message = 'Cloud request not modified'
+        return render json: { message: message, error: message }, status: :not_modified
+      rescue RestClient::ExceptionWithResponse => e
+        response_obj = e.response.presence || e.exception
+        code = response_obj.try(:code) || response_obj.try(:http_code) || 500
+        message = 'Cloud request failed'
 
-      if @cloud_response.code == 401
         return render json: {
-          :message => 'Authentication to the Insights Service failed.',
+          :message => message,
+          :error => response_obj.to_s,
           :headers => {},
-        }, status: :bad_gateway
-      end
-
-      if @cloud_response.code >= 300
-        return render json: {
-          :message => 'Cloud request failed',
-          :headers => {},
-          :response => @cloud_response,
-        }, status: @cloud_response.code
+          :response => response_obj,
+        }, status: code
+      rescue StandardError => e
+        # Catch any other exceptions here, such as Errno::ECONNREFUSED
+        logger.warn("Cloud request failed with exception: #{e}")
+        return render json: { error: e.to_s }, status: :bad_gateway
       end
 
       # Append redhat-specific headers
       @cloud_response.headers.each do |key, value|
         assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
       end
+
       # Append general headers
       assign_header(response, @cloud_response, :x_resource_count, true)
       headers[Rack::ETAG] = @cloud_response.headers[:etag]
@@ -56,8 +60,8 @@ module InsightsCloud::Api
         # content type
         send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       elsif @cloud_response.headers[:content_type] =~ /zip/
-        # if there is no Content-Disposition, but the content type is binary according the content type,
-        # forward the request as binry too
+        # If there is no Content-Disposition, but the content type is binary according to Content-Type, send the raw data
+        # with proper content type
         send_data @cloud_response, type: @cloud_response.headers[:content_type]
       else
         render json: @cloud_response, status: @cloud_response.code

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -8,14 +8,24 @@ module ForemanRhCloud
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
+      if ForemanRhCloud.with_local_advisor_engine?
+        final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
+      end
+
       response = RestClient::Request.execute(final_params)
 
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")
 
       response
-    rescue RestClient::Exception => ex
-      logger.debug("Failed response with code #{ex.http_code} headers for request url #{final_params[:url]} are: #{ex.http_headers} and body: #{ex.http_body}")
-      raise ex
+    rescue RestClient::Exceptions::Timeout => ex
+      logger.debug("Timeout exception raised for request url #{final_params[:url]}: #{ex}")
+      raise
+    rescue RestClient::ExceptionWithResponse => ex
+      logger.debug("Response headers for request url #{final_params[:url]} with status code #{ex.http_code} are: #{ex.http_headers} and body: #{ex.http_body}")
+      raise
+    rescue StandardError => ex
+      logger.debug("Exception raised for request url #{final_params[:url]}: #{ex}")
+      raise
     end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,8 +17,6 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
-    rescue RestClient::ExceptionWithResponse => error_response
-      error_response.response.presence || error_response.exception
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -34,7 +32,13 @@ module ForemanRhCloud
         ),
       }
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
-      base_params.merge(path_params(requested_url, certs))
+      params = path_params(requested_url, certs)
+
+      if ForemanRhCloud.with_local_advisor_engine?
+        params[:ssl_ca_file] = ForemanRhCloud.ca_cert
+      end
+
+      base_params.merge(params)
     end
 
     def prepare_forward_payload(original_request, controller_name)
@@ -63,6 +67,12 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
+      when lightspeed?
+        {
+          url: ForemanRhCloud.cert_base_url + request_path,
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
+        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -95,6 +105,10 @@ module ForemanRhCloud
       headers
     end
 
+    def lightspeed?
+      ->(request_path) { request_path.include? '/lightspeed' }
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/services/foreman_rh_cloud/rules_ingester.rb

@@ -13,7 +13,18 @@ module ForemanRhCloud
 
     def fetch_rules_data
       advisor_url = "#{ForemanRhCloud.on_premise_url}/r/insights/v1/static/release/content.json"
-      JSON.parse(Net::HTTP.get(URI.parse(advisor_url)), symbolize_names: true)
+      uri = URI.parse(advisor_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      # Set CA certificate
+      http.ca_file = ForemanRhCloud.ca_cert
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = http.request(request)
+      JSON.parse(response.body, symbolize_names: true)
     end
 
     def fetch_rules_and_resolutions

data/config/routes.rb

@@ -49,6 +49,10 @@ Rails.application.routes.draw do
     end
   end
 
+  scope :module => :'insights_cloud/api' do
+    match '/api/lightspeed/*path', to: 'machine_telemetries#forward_request', via: :all
+  end
+
   # API routes
 
   namespace :api, :defaults => { :format => 'json' } do

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -17,6 +17,8 @@ module ForemanInventoryUpload
               'distribution::name',
               'uname::release',
               'lscpu::flags',
+              'hypervisor::type',
+              'hypervisor::version',
               'distribution::version',
               'distribution::id',
               'virt::is_guest',

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -50,56 +50,97 @@ module ForemanInventoryUpload
         @stream.simple_field('success', ActiveModel::Type::Boolean.new.cast(fact_value(host, 'conversions::success')), :last)
       end
 
+      def insights_minimal_data_collection(host)
+        @stream.simple_field('account', account_id(host.organization).to_s)
+        @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+        @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
+        @stream.simple_field('bios_uuid', bios_uuid(host))
+        @stream.simple_field('bios_vendor', fact_value(host, 'dmi::bios::vendor'))
+        @stream.simple_field('bios_version', fact_value(host, 'dmi::bios::version'))
+        @stream.simple_field('arch', host.architecture&.name)
+        @stream.simple_field(
+          'infrastructure_type',
+          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
+        )
+        @stream.object_field('system_profile') do
+          unless (installed_products = host.subscription_facet&.installed_products).empty?
+            @stream.array_field('installed_products') do
+              @stream.raw(installed_products.map do |product|
+                {
+                  'name': product.name,
+                  'id': product.cp_product_id,
+                }.to_json
+              end.join(', '))
+            end
+          end
+          @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i } if fact_value(host, 'cpu::core(s)_per_socket').present?
+          @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) } if fact_value(host, 'memory::memtotal').present?
+          @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)')) { |v| v.to_i } if fact_value(host, 'cpu::cpu(s)').present?
+          @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)'), :last) { |v| v.to_i } if fact_value(host, 'cpu::cpu_socket(s)').present?
+        end
+        if host.subscription_facet.hypervisor?
+          @stream.simple_field('cpu_socket(s)', fact_value(host, 'cpu::cpu_socket(s)'))
+          @stream.simple_field('hypervisor_type', fact_value(host, 'hypervisor::type'))
+          @stream.simple_field('hypervisor_version', fact_value(host, 'hypervisor::version'), :last)
+        else
+          @stream.simple_field('cpu_socket(s)', fact_value(host, 'cpu::cpu_socket(s)'), :last)
+        end
+      end
+
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
-          @stream.simple_field('fqdn', fqdn(host))
-          @stream.simple_field('account', account_id(host.organization).to_s)
-          @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
-          @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
-          if host.subscription_facet&.convert2rhel_through_foreman.present?
-            @stream.object_field('conversions') do
-              @stream.object_field('source_os') do
-                @stream.simple_field('name', fact_value(host, 'conversions::source_os::name'))
-                @stream.simple_field('version', fact_value(host, 'conversions::source_os::version') || 'Unknown - Fact not reported', :last)
-              end
-              @stream.object_field('target_os') do
-                @stream.simple_field('name', fact_value(host, 'conversions::target_os::name'))
-                @stream.simple_field('version', fact_value(host, 'conversions::target_os::version') || 'Unknown - Fact not reported', :last)
+          if Setting[:insights_minimal_data_collection]
+            insights_minimal_data_collection(host)
+          else
+            @stream.simple_field('fqdn', fqdn(host))
+            @stream.simple_field('account', account_id(host.organization).to_s)
+            @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+            @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
+            if host.subscription_facet&.convert2rhel_through_foreman.present?
+              @stream.object_field('conversions') do
+                @stream.object_field('source_os') do
+                  @stream.simple_field('name', fact_value(host, 'conversions::source_os::name'))
+                  @stream.simple_field('version', fact_value(host, 'conversions::source_os::version') || 'Unknown - Fact not reported', :last)
+                end
+                @stream.object_field('target_os') do
+                  @stream.simple_field('name', fact_value(host, 'conversions::target_os::name'))
+                  @stream.simple_field('version', fact_value(host, 'conversions::target_os::version') || 'Unknown - Fact not reported', :last)
+                end
+                report_conversions(host)
               end
-              report_conversions(host)
             end
-          end
-          @stream.simple_field('bios_uuid', bios_uuid(host))
-          @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
-          @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
-          report_ip_addresses(host, host_ips_cache)
-          report_mac_addresses(host)
-          @stream.object_field('system_profile') do
-            report_system_profile(host, host_ips_cache)
-          end
-          @stream.array_field('facts') do
-            @stream.object do
-              @stream.simple_field('namespace', SATELLITE_NAMESPACE)
-              @stream.object_field('facts', :last) do
-                report_satellite_facts(host)
-              end
+            @stream.simple_field('bios_uuid', bios_uuid(host))
+            @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
+            @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
+            report_ip_addresses(host, host_ips_cache)
+            report_mac_addresses(host)
+            @stream.object_field('system_profile') do
+              report_system_profile(host, host_ips_cache)
             end
-          end
 
-          @stream.array_field('tags', :last) do
-            tags_generator = Tags.new(host)
-
-            host_params_tags = tags_generator.generate_parameters
-            host_params_tags.each do |key, value|
-              report_tag(SATELLITE_PARAMS_NAMESPACE, key, value)
+            @stream.array_field('facts') do
+              @stream.object do
+                @stream.simple_field('namespace', SATELLITE_NAMESPACE)
+                @stream.object_field('facts', :last) do
+                  report_satellite_facts(host)
+                end
+              end
             end
 
-            tags = tags_generator.generate
-            last_index = tags.count - 1
-            tags.each_with_index do |pair, index|
-              key, value = pair
-              report_tag(SATELLITE_NAMESPACE, key, value, index == last_index)
+            @stream.array_field('tags', :last) do
+              tags_generator = Tags.new(host)
+              host_params_tags = tags_generator.generate_parameters
+              host_params_tags.each do |key, value|
+                report_tag(SATELLITE_PARAMS_NAMESPACE, key, value)
+              end
+
+              tags = tags_generator.generate
+              last_index = tags.count - 1
+              tags.each_with_index do |pair, index|
+                key, value = pair
+                report_tag(SATELLITE_NAMESPACE, key, value, index == last_index)
+              end
             end
           end
         end
@@ -165,7 +206,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        unless Setting[:exclude_installed_packages]
+        if !Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages]
           @stream.array_field('installed_packages') do
             first = true
             host.installed_packages.each do |package|

data/lib/foreman_inventory_upload.rb

@@ -30,6 +30,11 @@ module ForemanInventoryUpload
     File.join(ForemanInventoryUpload.done_folder, filename)
   end
 
+  def self.report_file_paths(organization_id)
+    filename = facts_archive_name(organization_id)
+    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
+  end
+
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(

data/lib/foreman_rh_cloud/engine.rb

@@ -44,11 +44,12 @@ module ForemanRhCloud
               setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
               setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
               setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
-              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
-              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
-              setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))
+              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and host names are always obfuscated.)'), default: false, full_name: N_('Obfuscate host names'))
+              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored and host ipv4 addresses are always obfuscated.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
+              setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
               setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
               setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+              setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only send the minimum required data to Red Hat cloud, and obfuscate wherever possible. When this is true, hostnames and IPv4 addresses are always obfuscated and installed packages are excluded, regardless of those settings.'))
             end
           end
 
@@ -212,4 +213,15 @@ module ForemanRhCloud
   def self.with_local_advisor_engine?
     SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
   end
+
+  def self.ca_cert
+    # The reference to candlepin ca_cert_file can be removed
+    # once the setting is dropped. Foreman 3.15 introduces
+    # a single CA file that bundles all CAs.
+    if ::SETTINGS.dig(:katello, :candlepin, :ca_cert_file)
+      ::SETTINGS[:katello][:candlepin][:ca_cert_file]
+    else
+      ::SETTINGS[:ssl_ca_file]
+    end
+  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.0.0'.freeze
+  VERSION = '12.1.1'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -47,6 +47,8 @@ module ForemanRhCloud
   end
 
   def self.proxy_string
+    return '' if ForemanRhCloud.with_local_advisor_engine?
+
     HttpProxy.default_global_content_proxy&.full_url ||
     ForemanRhCloud.global_foreman_proxy ||
     ''

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.0.0",
+  "version": "12.1.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

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

@@ -98,13 +98,46 @@ module InsightsCloud::Api
         assert_equal net_http_resp[:content_type], @response.headers['Content-Type']
       end
 
+      test "should handle StandardError" do
+        error_message = "Connection refused"
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(Errno::ECONNREFUSED.new)
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 502, @response.status
+        body = JSON.parse(@response.body)
+        assert_equal error_message, body['error']
+      end
+
+      test "should handle 304 cloud" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 304, "Not Modified")
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotModified.new(res))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 304, @response.status
+        assert_equal 'Cloud request not modified', JSON.parse(@response.body)['message']
+      end
+
+      test "should handle RestClient::Exceptions::Timeout" do
+        timeout_message = "execution expired"
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Exceptions::Timeout.new(timeout_message))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 504, @response.status
+        body = JSON.parse(@response.body)
+        assert_equal timeout_message, body['message']
+        assert_equal timeout_message, body['error']
+      end
+
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Unauthorized.new(res))
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 502, @response.status
+        assert_equal 401, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end