foreman_rh_cloud 13.2.9 → 14.0.1

data/lib/foreman_rh_cloud/engine.rb

@@ -40,7 +40,6 @@ module ForemanRhCloud
         ::Host::Managed.include RhCloudHost
 
         ::Katello::Api::Rhsm::CandlepinDynflowProxyController.include InsightsCloud::PackageProfileUploadExtensions
-        ::Katello::Api::Rhsm::CandlepinProxiesController.include InsightsCloud::CandlepinProxiesExtensions
         ::Katello::RegistrationManager.singleton_class.prepend ::ForemanRhCloud::RegistrationManagerExtensions
       end
     end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.9'.freeze
+  VERSION = '14.0.1'.freeze
 end

data/lib/insights_cloud/async/vmaas_reposcan_sync.rb

@@ -6,8 +6,6 @@ module InsightsCloud
     class VmaasReposcanSync < ::Actions::EntryAction
       include ::ForemanRhCloud::CertAuth
 
-      HTTP_TOO_MANY_REQUESTS = 429
-
       # Subscribe to Katello repository sync hook action, if available
       def self.subscribe
         'Actions::Katello::Repository::SyncHook'.constantize
@@ -51,9 +49,15 @@ module InsightsCloud
 
         response
       rescue RestClient::ExceptionWithResponse => e
-        handle_rest_client_error(e)
+        message = "VMaaS reposcan sync failed: #{e.response&.code} - #{e.response&.body}"
+        logger.error(message)
+        output[:message] = message
+        raise
       rescue StandardError => e
-        handle_standard_error(e)
+        message = "Error triggering VMaaS reposcan sync: #{e.message}, response: #{e.respond_to?(:response) ? e.response : nil}"
+        logger.error(message)
+        output[:message] = message
+        raise
       end
 
       def rescue_strategy_for_self
@@ -66,25 +70,6 @@ module InsightsCloud
 
       private
 
-      def handle_rest_client_error(exception)
-        if exception.response&.code == HTTP_TOO_MANY_REQUESTS
-          message = "VMaaS reposcan sync skipped: another sync already in progress (#{HTTP_TOO_MANY_REQUESTS})"
-          logger.warn(message)
-        else
-          message = "VMaaS reposcan sync failed: #{exception.response&.code} - #{exception.response&.body}"
-          logger.error(message)
-        end
-        output[:message] = message
-        # Do NOT raise - let rescue_strategy_for_self Skip handle this
-      end
-
-      def handle_standard_error(exception)
-        message = "Error triggering VMaaS reposcan sync: #{exception.message}"
-        logger.error(message)
-        output[:message] = message
-        # Do NOT raise - let rescue_strategy_for_self Skip handle this
-      end
-
       def logger
         action_logger
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -15,26 +15,16 @@ module InventorySync
 
       def setup_statuses
         @subscribed_hosts_ids = Set.new(affected_host_ids)
-        @omitted_ids = Set.new(user_omitted_host_ids)
-
-        # Remove user-omitted hosts from subscribed set. In normal operation, affected_host_ids
-        # already excludes user-omitted hosts via for_slice, but this handles edge cases like
-        # a host transitioning from uploaded to user-omitted between syncs.
-        @subscribed_hosts_ids.subtract(@omitted_ids)
 
         InventorySync::InventoryStatus.transaction do
           InventorySync::InventoryStatus.where(host_id: @subscribed_hosts_ids).delete_all
-          InventorySync::InventoryStatus.where(host_id: @omitted_ids).delete_all
           yield
-          add_missing_hosts_statuses(@subscribed_hosts_ids) # any remaining hosts after yield are disconnected
-          add_user_omitted_host_statuses(@omitted_ids)
+          add_missing_hosts_statuses(@subscribed_hosts_ids)
           host_statuses[:disconnect] += @subscribed_hosts_ids.size
-          host_statuses[:user_omitted] += @omitted_ids.size
         end
 
-        logger.debug("Synced hosts count: #{host_statuses[:sync]}")
-        logger.debug("Disconnected hosts count: #{host_statuses[:disconnect]}")
-        logger.debug("User-omitted hosts count: #{host_statuses[:user_omitted]}")
+        logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
+        logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
         output[:host_statuses] = host_statuses
       end
 
@@ -54,7 +44,6 @@ module InventorySync
       private
 
       def update_hosts_status(status_hashes)
-        # create Inventory statuses
         InventorySync::InventoryStatus.create(status_hashes)
         updated_ids = status_hashes.map { |hash| hash[:host_id] }
         @subscribed_hosts_ids.subtract(updated_ids)
@@ -72,23 +61,10 @@ module InventorySync
         )
       end
 
-      def add_user_omitted_host_statuses(host_ids)
-        InventorySync::InventoryStatus.create(
-          host_ids.map do |host_id|
-            {
-              host_id: host_id,
-              status: InventorySync::InventoryStatus::USER_OMITTED,
-              reported_at: DateTime.current,
-            }
-          end
-        )
-      end
-
       def host_statuses
         @host_statuses ||= {
           sync: 0,
           disconnect: 0,
-          user_omitted: 0,
         }
       end
 
@@ -97,18 +73,6 @@ module InventorySync
           Host.unscoped.where(organization: organizations)
         ).pluck(:id)
       end
-
-      def user_omitted_host_ids
-        param_name = InsightsCloud.enable_client_param_inventory
-
-        # Use search_for to respect parameter inheritance (global, org, hostgroup, host)
-        # This matches the same logic used by for_slice, ensuring consistency
-        Host.unscoped
-            .where(organization: organizations)
-            .joins(:subscription_facet)
-            .search_for("params.#{param_name} = f")
-            .pluck(:id)
-      end
     end
   end
 end