foreman_rh_cloud 10.0.6 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf5c802bcf566375518a4f83d5a5fae3ec98c5554e89dea57af748af526f998
-  data.tar.gz: 1c8d77163d1cac3161813bf9aab5f70f3a8496ce9351a5e2a4d071aaecfb1ad6
+  metadata.gz: fcd4ee874e42e9236bbc4fae540911c372af73f3a336507c9421693b8fb128da
+  data.tar.gz: da0c96b9b8fb3d737d0f8902da7176adbd2f1a8810260ddeba547c3a22004ec7
 SHA512:
-  metadata.gz: 807e09c7f560217178221cf3a2c7eda52aee500ea50fe18d56b86f53cffee23d0d7ca50e6b4bd174a7b3c038273158a41cb6c5d60339fd121e5d0c06e0010788
-  data.tar.gz: ad3a808a270922e52e25778f9101db3a358fbe99b0ded5f01fab67c5d1a398cc7c997ed816f909b528af579a47f44f5b97a9a6c5621d4fa97d59dc8f43851a3c
+  metadata.gz: 12343eaac2bfb4c666c156a84a868f02a3b684f4a4bf044f7a838d9134d140ec6fb698b356c35efb8b11618fa0c36b3a61c0cc411caf48ff91b8fc9957528074
+  data.tar.gz: 41f578f21a65aee43ade158a99991c1b3b7b37ee2000e0e1c8c7d55cba60ac94d31e734d205e589bfc1bf1850fb98142b91ea975b3d9580361a11803eac8f17b

data/README.md

@@ -15,7 +15,7 @@ for how to install Foreman plugins
 
 #### Inventory upload
 
-In UI: Insights -> Inventory Upload -> select the organization -> Generate and upload report
+In UI: Configure -> Inventory Upload -> Restart
 
 From command-line:
 
@@ -38,7 +38,7 @@ From command-line:
 
 #### Fetch hosts remediation data
 
-In UI: Insights -> Recommendations -> Sync recommendations (under the vertical ellipsis)
+In UI: Configure -> Insights -> Sync now
 
 From command-line:
 
@@ -46,7 +46,7 @@ From command-line:
 
 #### Synchronize inventory status
 
-In UI: Insights -> Inventory Upload -> Sync all inventory status
+In UI: Configure -> Inventory Upload -> Sync inventory status
 
 From command-line:
 

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

@@ -16,41 +16,27 @@ module InsightsCloud::Api
     # The method that "proxies" requests over to Cloud
     def forward_request
       certs = candlepin_id_cert @organization
-      begin
-        @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
-      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'
+      @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
 
+      if @cloud_response.code == 401
         return render json: {
-          :message => message,
-          :error => response_obj.to_s,
+          :message => 'Authentication to the Insights Service failed.',
           :headers => {},
-          :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
+        }, 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
 
       # 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]
@@ -60,8 +46,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 to Content-Type, send the raw data
-        # with proper content type
+        # if there is no Content-Disposition, but the content type is binary according the content type,
+        # forward the request as binry too
         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

@@ -13,15 +13,9 @@ module ForemanRhCloud
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")
 
       response
-    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
+    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
     end
   end
 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)
@@ -49,9 +51,7 @@ module ForemanRhCloud
 
     def prepare_forward_params(original_request, branch_id)
       forward_params = original_request.query_parameters
-      compliance_request = original_request.path.match?(/compliance\/v2(\/.*)?/)
-      user_agent = original_request.user_agent.present? && !original_request.user_agent.include?('redhat_access_cfme')
-      if user_agent && !compliance_request
+      if original_request.user_agent && !original_request.user_agent.include?('redhat_access_cfme')
         forward_params = forward_params.merge(:branch_id => branch_id)
       end
 

data/app/services/foreman_rh_cloud/url_remediations_retriever.rb

@@ -1,5 +1,5 @@
 module ForemanRhCloud
-  class UrlRemediationsRetriever < RemediationsRetriever
+  class URLRemediationsRetriever < RemediationsRetriever
     attr_reader :url, :payload, :headers
 
     def initialize(url:, organization_id:, payload: '', headers: {}, logger: Logger.new(IO::NULL))

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,3 @@
+Rails.autoloaders.main.ignore(
+  ForemanRhCloud::Engine.root.join('lib/foreman_rh_cloud/version.rb')
+)

data/lib/foreman_rh_cloud/engine.rb

@@ -20,15 +20,6 @@ module ForemanRhCloud
     rescue ActiveRecord::TransactionIsolationError
     end
 
-    initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('settings.rb', __dir__)
-    end
-
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -40,109 +31,124 @@ module ForemanRhCloud
       end
     end
 
-    initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 3.7'
-        register_gettext
-
-        apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
-
-        # Add permissions
-        security_block :foreman_rh_cloud do
-          permission(
-            :generate_foreman_rh_cloud,
-            'foreman_inventory_upload/reports': [:generate],
-            'foreman_inventory_upload/tasks': [:create],
-            'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
-            'foreman_inventory_upload/uploads': [:enable_cloud_connector],
-            'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
-            'foreman_inventory_upload/missing_hosts': [:remove_hosts],
-            'insights_cloud/settings': [:update],
-            'insights_cloud/tasks': [:create]
-          )
-          permission(
-            :view_foreman_rh_cloud,
-            'foreman_inventory_upload/accounts': [:index],
-            'foreman_inventory_upload/reports': [:last],
-            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
-            'foreman_inventory_upload/tasks': [:show],
-            'foreman_inventory_upload/cloud_status': [:index],
-            'foreman_inventory_upload/uploads_settings': [:index],
-            'foreman_inventory_upload/missing_hosts': [:index],
-            'react': [:index]
-          )
-          permission(
-            :view_insights_hits,
-            {
-              '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
-              'insights_cloud/hits': [:index, :show, :auto_complete_search, :resolutions],
-              'insights_cloud/settings': [:index, :show],
-              'react': [:index],
-            },
-            :resource_type => ::InsightsHit.name
-          )
-          permission(
-            :dispatch_cloud_requests,
-            'api/v2/rh_cloud/cloud_request': [:update]
-          )
-          permission(
-            :control_organization_insights,
-            'insights_cloud/settings': [:set_org_parameter]
-          )
-        end
+    initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_rh_cloud do
+          requires_foreman '>= 3.13'
+          register_gettext
+
+          apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
+
+          settings do
+            category(:rh_cloud, N_('RHCloud')) do
+              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: false, 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('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'))
+            end
+          end
 
-        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
+          # Add permissions
+          security_block :foreman_rh_cloud do
+            permission(
+              :generate_foreman_rh_cloud,
+              'foreman_inventory_upload/reports': [:generate],
+              'foreman_inventory_upload/tasks': [:create],
+              'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
+              'foreman_inventory_upload/uploads': [:enable_cloud_connector],
+              'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
+              'foreman_inventory_upload/missing_hosts': [:remove_hosts],
+              'insights_cloud/settings': [:update],
+              'insights_cloud/tasks': [:create]
+            )
+            permission(
+              :view_foreman_rh_cloud,
+              'foreman_inventory_upload/accounts': [:index],
+              'foreman_inventory_upload/reports': [:last],
+              'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+              'foreman_inventory_upload/tasks': [:show],
+              'foreman_inventory_upload/cloud_status': [:index],
+              'foreman_inventory_upload/uploads_settings': [:index],
+              'foreman_inventory_upload/missing_hosts': [:index],
+              'react': [:index]
+            )
+            permission(
+              :view_insights_hits,
+              {
+                '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
+                'insights_cloud/hits': [:index, :show, :auto_complete_search, :resolutions],
+                'insights_cloud/settings': [:index, :show],
+                'react': [:index],
+              },
+              :resource_type => ::InsightsHit.name
+            )
+            permission(
+              :dispatch_cloud_requests,
+              'api/v2/rh_cloud/cloud_request': [:update]
+            )
+            permission(
+              :control_organization_insights,
+              'insights_cloud/settings': [:set_org_parameter]
+            )
+          end
+
+          plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
 
-        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
-                                                    generate a report, upload it to the cloud and download it locally'
+          role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                      generate a report, upload it to the cloud and download it locally'
 
-        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
-          Role::MANAGER => plugin_permissions,
-          Role::SYSTEM_ADMIN => plugin_permissions
+          add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+            Role::MANAGER => plugin_permissions,
+            Role::SYSTEM_ADMIN => plugin_permissions
 
-        # Adding a sub menu after hosts menu
-        divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
-        menu :top_menu, :inventory_upload, caption: N_('Inventory Upload'), url: '/foreman_rh_cloud/inventory_upload', url_hash: { controller: :react, action: :index }, parent: :configure_menu
-        menu :top_menu, :insights_hits, caption: N_('Insights'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :configure_menu
+          # Adding a sub menu after hosts menu
+          divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
+          menu :top_menu, :inventory_upload, caption: N_('Inventory Upload'), url: '/foreman_rh_cloud/inventory_upload', url_hash: { controller: :react, action: :index }, parent: :configure_menu
+          menu :top_menu, :insights_hits, caption: N_('Insights'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :configure_menu
 
-        register_facet InsightsFacet, :insights do
-          configure_host do
-            set_dependent_action :destroy
+          register_facet InsightsFacet, :insights do
+            configure_host do
+              set_dependent_action :destroy
+            end
           end
-        end
 
-        register_global_js_file 'global'
+          register_global_js_file 'global'
 
-        register_custom_status InventorySync::InventoryStatus
-        register_custom_status InsightsClientReportStatus
+          register_custom_status InventorySync::InventoryStatus
+          register_custom_status InsightsClientReportStatus
 
-        describe_host do
-          overview_buttons_provider :insights_host_overview_buttons
-        end
+          describe_host do
+            overview_buttons_provider :insights_host_overview_buttons
+          end
 
-        extend_page 'hosts/show' do |context|
-          context.add_pagelet :main_tabs,
-            partial: 'hosts/insights_tab',
-            name: _('Insights'),
-            id: 'insights',
-            onlyif: proc { |host| host.insights }
-        end
+          extend_page 'hosts/show' do |context|
+            context.add_pagelet :main_tabs,
+              partial: 'hosts/insights_tab',
+              name: _('Insights'),
+              id: 'insights',
+              onlyif: proc { |host| host.insights }
+          end
 
-        extend_page 'hosts/_list' do |context|
-          context.with_profile :cloud, _('RH Cloud'), default: true do
-            add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100,
-                        export_data: CsvExporter::ExportDefinition.new(:insights_recommendations_count, callback: ->(host) { host&.insights_hits&.count })
-            add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
+          extend_page 'hosts/_list' do |context|
+            context.with_profile :cloud, _('RH Cloud'), default: true do
+              add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100,
+                          export_data: CsvExporter::ExportDefinition.new(:insights_recommendations_count, callback: ->(host) { host&.insights_hits&.count })
+              add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
+            end
           end
-        end
 
-        extend_template_helpers ForemanRhCloud::TemplateRendererHelper
-        allowed_template_helpers :remediations_playbook, :download_rh_playbook
-      end
+          extend_template_helpers ForemanRhCloud::TemplateRendererHelper
+          allowed_template_helpers :remediations_playbook, :download_rh_playbook
+        end
 
-      ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
+        ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
-      ::Host::Managed.include RhCloudHost
+        ::Host::Managed.include RhCloudHost
+      end
     end
 
     rake_tasks do

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '10.0.6'.freeze
+  VERSION = '11.0.0'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -9,11 +9,10 @@ module InsightsCloud
 
       def plan(organizations)
         organizations = organizations.select do |organization|
-          checker = ::Katello::UpstreamConnectionChecker.new(organization)
-          if cert_auth_available?(organization) && !organization.manifest_expired? && checker.can_connect?
+          if cert_auth_available?(organization)
             true
           else
-            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
+            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
             false
           end
         end
@@ -21,23 +20,19 @@ module InsightsCloud
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host
-          valid_organizations = organizations.reject(&:manifest_expired?)
-          if valid_organizations.any?
-            plan_hosts_sync(organizations)
-            plan_self(organization_ids: organizations.map(&:id))
-            concurrence do
-              plan_rules_sync(organizations)
-              plan_notifications
-            end
+          plan_hosts_sync(organizations)
+          plan_self(organization_ids: organizations.map(&:id))
+          concurrence do
+            plan_rules_sync(organizations)
+            plan_notifications
           end
         end
       end
 
       def try_execute
         organizations.each do |organization|
-          checker = ::Katello::UpstreamConnectionChecker.new(organization)
-          if !cert_auth_available?(organization) && organization.manifest_expired && !checker.can_connect?
-            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
+          unless cert_auth_available?(organization)
+            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
             next
           end
 

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -13,11 +13,7 @@ module InsightsCloud
           InsightsResolution.delete_all
           rule_ids = relevant_rules
           Organization.all.each do |organization|
-            checker = ::Katello::UpstreamConnectionChecker.new(organization)
-            if !cert_auth_available?(organization) || organization.manifest_expired? || !checker.can_connect?
-              logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping resolutions sync")
-              next
-            end
+            next if !cert_auth_available?(organization) || organization.manifest_expired?
             api_response = query_insights_resolutions(rule_ids, organization) unless rule_ids.empty?
             written_rules = write_resolutions(api_response) if api_response
             rule_ids -= Array(written_rules)

data/package.json

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

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

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'rest-client'
 
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
@@ -34,18 +33,6 @@ module InsightsCloud::Api
         assert_equal @body, @response.body
       end
 
-      test "should handle timeout from cloud" do
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.
-          stubs(:forward_request).
-          raises(RestClient::Exceptions::OpenTimeout.new("Timed out connecting to server"))
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        request_response = JSON.parse(@response.body)
-        # I can't get @response.status to take a nil value so I'm not asserting for that
-
-        assert_equal 'Timed out connecting to server', request_response['error']
-      end
-
       test "should respond with the same content type" do
         net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
         net_http_resp.add_field 'Set-Cookie', 'Monster'
@@ -96,46 +83,13 @@ 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(:execute_cloud_request).raises(RestClient::Unauthorized.new(res))
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 401, @response.status
+        assert_equal 502, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
 

data/test/jobs/insights_full_sync_test.rb

@@ -65,8 +65,6 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits data is replaced with data from cloud' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
@@ -81,31 +79,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     assert_equal 1, @host2.insights.hits.count
   end
 
-  test 'Manifest is expired do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(true)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
-
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-  end
-
-  test 'Manifest is deleted do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
-
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-  end
-
   test 'Hits counters are reset correctly' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
 
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
@@ -123,8 +97,6 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits ignoring non-existent hosts' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     hits_json = <<-HITS_JSON
     [
         {

data/test/jobs/insights_resolutions_sync_test.rb

@@ -73,7 +73,6 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
   end
 
   test 'Resolutions data is replaced with data from cloud' do
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
 
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
@@ -83,28 +82,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 2, @rule.resolutions.count
   end
 
-  test 'Manifest is deleted do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
-    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
-
-    assert_equal 0, InsightsResolution.all.count
-  end
-
-  test 'Manifest is expired do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(true)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
-    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
-
-    assert_equal 0, InsightsResolution.all.count
-  end
-
   test 'Skips pinging the cloud if no rule ids were found' do
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
     InsightsRule.all.delete_all
 

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

@@ -112,30 +112,6 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
 
-  test 'should NOT add branch id into forwarded params for compliance urls' do
-    user_agent = { :foo => :bar }
-    params = { :page => 5, :per_page => 42 }
-
-    uris = [
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/policies/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/",
-    ]
-    uris.each do |uri|
-      req = ActionDispatch::Request.new(
-        'REQUEST_URI' => uri,
-        'REQUEST_METHOD' => 'GET',
-        'HTTP_USER_AGENT' => user_agent,
-        'rack.input' => ::Puma::NullIO.new,
-        'action_dispatch.request.query_parameters' => params
-      )
-      req.stubs(:path).returns(uri)
-      refute @forwarder.prepare_forward_params(req, 74).key?(:branch_id), "Branch id should not be added for #{uri}"
-    end
-  end
-
   test 'should reuse BranchInfo identifiers for user_agent' do
     user_agent = { :foo => :bar }
     params = { :page => 5, :per_page => 42 }

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

@@ -1,8 +1,8 @@
 require 'test_plugin_helper'
 
-class UrlRemediationsRetrieverTest < ActiveSupport::TestCase
+class URLRemediationsRetrieverTest < ActiveSupport::TestCase
   test 'Calls the given url' do
-    retreiver = ForemanRhCloud::UrlRemediationsRetriever.new(
+    retreiver = ForemanRhCloud::URLRemediationsRetriever.new(
       organization_id: FactoryBot.create(:organization).id,
       url: 'http://test.example.com',
       payload: 'TEST_PAYLOAD',

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -42,7 +42,7 @@ export const PageDescription = () => (
       {__('For more information about the Subscriptions service, see:')}
        
       <a
-        href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
+        href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
         target="_blank"
         rel="noopener noreferrer"
       >

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap

@@ -40,7 +40,7 @@ exports[`PageDescription rendering render without Props 1`] = `
     For more information about the Subscriptions service, see:
      
     <a
-      href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
+      href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
       rel="noopener noreferrer"
       target="_blank"
     >

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 10.0.6
+  version: 11.0.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '15'
+        version: 15.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '15'
+        version: 15.0.0
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement
@@ -45,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.14.0.rc1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.14.0.rc1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.15'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +144,7 @@ files:
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/database.yml.example
+- config/initializers/zeitwerk.rb
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
 - config/routes.rb
@@ -191,7 +186,6 @@ files:
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/async/exponential_backoff.rb
 - lib/foreman_rh_cloud/engine.rb
-- lib/foreman_rh_cloud/settings.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
 - lib/insights_cloud/async/cloud_connector_announce_task.rb

data/lib/foreman_rh_cloud/settings.rb

@@ -1,12 +0,0 @@
-Foreman::SettingManager.define(:foreman) do
-  category(:rh_cloud, N_('RHCloud')) do
-    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: false, 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('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'))
-  end
-end