foreman_rh_cloud 13.2.10 → 14.0.1

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -28,14 +28,6 @@ module ForemanInventoryUpload
         @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
       end
 
-      def golden_ticket?(organization)
-        result = organization.try(:golden_ticket?)
-        result = organization.content_access_mode == 'org_environment' if result.nil?
-
-        @organization_golden_tickets ||= {}
-        @organization_golden_tickets[organization.id] ||= result
-      end
-
       def cloud_provider(host)
         bios_version = fact_value(host, 'dmi::bios::version')
 
@@ -114,7 +106,6 @@ module ForemanInventoryUpload
 
       def host_ips(host)
         # Determines and returns the IP addresses associated with a host, applying obfuscation if enabled.
-        return {} if host.nil?
 
         # If IP obfuscation is enabled for the host return a representation of obfuscated IP addresses.
         return obfuscated_ips(host) if obfuscate_ips?(host)
@@ -164,29 +155,10 @@ module ForemanInventoryUpload
 
       def hostname_match
         bash_hostname = `uname -n`.chomp
-        foreman_host = ForemanRhCloud.foreman_host
-
-        # If bash hostname matches foreman_host, use fqdn
-        if foreman_host && bash_hostname == foreman_host.name
-          return fqdn(foreman_host)
-        end
-
-        # If no foreman_host, try foreman_host_name from Setting[:foreman_url]
-        unless foreman_host
-          foreman_hostname_from_setting = ForemanRhCloud.foreman_host_name
-          if foreman_hostname_from_setting
-            # Apply obfuscation if enabled
-            return obfuscate_fqdn(foreman_hostname_from_setting) if Setting[:obfuscate_inventory_hostnames]
-
-            return foreman_hostname_from_setting
-          end
-          # Otherwise fall through to bash_hostname below
-          # NOTE: Containerized foremanctl setups must configure Setting[:foreman_url]
-          # as bash hostname may not be available or meaningful in containers
-        end
-
-        # Fallback to bash hostname (with obfuscation if enabled)
-        if Setting[:obfuscate_inventory_hostnames]
+        foreman_hostname = ForemanRhCloud.foreman_host&.name
+        if bash_hostname == foreman_hostname
+          fqdn(ForemanRhCloud.foreman_host)
+        elsif Setting[:obfuscate_inventory_hostnames]
           obfuscate_fqdn(bash_hostname)
         else
           bash_hostname
@@ -194,8 +166,6 @@ module ForemanInventoryUpload
       end
 
       def bios_uuid(host)
-        return nil if host.nil?
-
         value = fact_value(host, 'dmi::system::uuid') || ''
         uuid_value(value)
       end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -62,7 +62,7 @@ module ForemanInventoryUpload
             :content_facet,
             :host_statuses,
             :inventory_upload_facts,
-            subscription_facet: [:pools, :installed_products, :hypervisor_host]
+            subscription_facet: [:installed_products, :hypervisor_host]
           )
       end
 

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -230,7 +230,7 @@ module ForemanInventoryUpload
         @stream.simple_field('system_purpose_sla', host.subscription_facet.service_level)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
-        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_simple_content_access', true)
         @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end

data/lib/foreman_inventory_upload.rb

@@ -96,14 +96,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_self_url
-    host = ForemanRhCloud.foreman_host
-    hostname = host ? host.fqdn : ForemanRhCloud.foreman_host_name
-    if hostname.nil?
-      Rails.logger.warn("Cannot determine Foreman hostname for inventory sync. " \
-                        "Please configure Setting[:foreman_url]. " \
-                        "Containerized setups must explicitly set this.")
-    end
-    inventory_base_url + "?hostname_or_id=#{hostname}"
+    inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
   end
 
   def self.host_by_id_url(host_uuid)

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.10'.freeze
+  VERSION = '14.0.1'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -84,50 +84,23 @@ module ForemanRhCloud
 
   # For testing purposes we can override the default hostname with an environment variable SATELLITE_RH_CLOUD_FOREMAN_HOST
   def self.foreman_host
-    return @foreman_host if defined?(@foreman_host)
-
-    fullname = foreman_host_name
-    return @foreman_host = nil unless fullname
-
-    # Try fullname first
-    host = ::Host.unscoped.friendly.where(name: fullname).first
-
-    # If not found, try shortname
-    if host.nil?
+    @foreman_host ||= begin
+      fullname = foreman_host_name
+      ::Host.unscoped.friendly.find(fullname)
+    rescue ActiveRecord::RecordNotFound
+      # fullname didn't work. Let's try shortname
       shortname = /(?<shortname>[^\.]*)\.?.*/.match(fullname)[:shortname]
-      host = ::Host.unscoped.friendly.where(name: shortname).first
+      ::Host.unscoped.friendly.find(shortname)
     end
-
-    @foreman_host = host
   end
 
   def self.foreman_host_name
-    ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || marked_foreman_host&.name || foreman_url_hostname
-  end
-
-  def self.foreman_url_hostname
-    return nil unless Setting[:foreman_url]
-
-    begin
-      # Ensure setting is a string to avoid TypeError from URI.parse
-      url = Setting[:foreman_url].to_s
-      URI.parse(url).host
-    rescue URI::InvalidURIError, ArgumentError, TypeError => e
-      Rails.logger.warn("Invalid foreman_url setting: #{e.message}")
-      nil
-    end
+    ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || marked_foreman_host&.name || ::SmartProxy.default_capsule.name
   end
 
   def self.marked_foreman_host
-    # Find host with infrastructure_facet.foreman_instance = true
-    # Facets use a special mechanism in Foreman, so we query the facet table directly
-    return nil unless defined?(HostFacets::InfrastructureFacet)
-
-    facet = HostFacets::InfrastructureFacet.find_by(foreman_instance: true)
-    facet&.host
-  rescue ActiveRecord::StatementInvalid => e
-    # Table might not exist yet during migrations
-    Rails.logger.debug("Could not query marked foreman host: #{e.message}")
+    ::Host.unscoped.search_for('infrastructure_facet.foreman = true').first
+  rescue ScopedSearch::QueryNotSupported
     nil
   end
 

data/lib/insights_cloud/async/insights_generate_notifications.rb

@@ -13,16 +13,7 @@ module InsightsCloud
       end
 
       def add_satellite_notifications
-        host = foreman_host
-
-        # Skip if no Foreman host record exists
-        unless host
-          logger.debug("Skipping Insights notifications: no Foreman host record found")
-          blueprint&.notifications&.destroy_all
-          return
-        end
-
-        hits_count = InsightsHit.where(host_id: host.id).count
+        hits_count = InsightsHit.where(host_id: foreman_host.id).count
 
         # Remove stale notifications
         blueprint.notifications.destroy_all

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

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -4,14 +4,7 @@ module InventorySync
       set_callback :step, :around, :create_facets
 
       def plan
-        host = ForemanRhCloud.foreman_host
-
-        if host.nil?
-          logger.warn("Skipping self-host inventory sync: no Foreman host record found.")
-          return
-        end
-
-        super(host.organization)
+        super(ForemanRhCloud.foreman_host.organization)
       end
 
       def create_facets
@@ -29,10 +22,7 @@ module InventorySync
       private
 
       def add_missing_insights_facet(uuids_hash)
-        host = ForemanRhCloud.foreman_host
-        return unless host # Guard against nil
-
-        facet = InsightsFacet.find_or_create_by(host_id: host.id) do |facet|
+        facet = InsightsFacet.find_or_create_by(host_id: ForemanRhCloud.foreman_host.id) do |facet|
           facet.uuid = uuids_hash.values.first
         end