foreman_rh_cloud 1.0.18 → 2.0.4

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -26,13 +26,8 @@ module ForemanInventoryUpload
         @out << string
       end
 
-      def simple_field(name, value, last = false, &block)
-        return if value.nil? || value.try(:empty?)
-        return if value.kind_of?(Array) && value.compact.empty?
-
-        block ||= ->(value) { value }
-
-        @out << "\"#{name}\": #{stringify_value(block.call(value))}#{last ? '' : ','}"
+      def simple_field(name, value, last = false)
+        @out << "\"#{name}\": #{stringify_value(value)}#{last ? '' : ','}" unless value.nil?
       end
 
       def array_field(name, last = false, &block)
@@ -41,16 +36,6 @@ module ForemanInventoryUpload
         @out << ',' unless last
       end
 
-      def string_array_value(name, value, last = false)
-        return if value.empty?
-
-        string_value = value.map { |v| stringify_value(v) }
-
-        array_field(name, last) do
-          raw(string_value.join(', '))
-        end
-      end
-
       def object_field(name, last = false, &block)
         @out << "\"#{name}\": "
         object(&block)
@@ -63,7 +48,7 @@ module ForemanInventoryUpload
         return value if value.is_a?(FalseClass)
         return value.to_json if value.is_a?(Hash)
 
-        ActiveSupport::JSON.encode(value)
+        "\"#{value}\""
       end
     end
   end

data/lib/foreman_inventory_upload/generators/metadata.rb

@@ -21,9 +21,6 @@ module ForemanInventoryUpload
       private
 
       def render_report(metadata)
-        metadata ||= {}
-        metadata['foreman_rh_cloud_version'] = ForemanRhCloud::VERSION
-
         @stream.object do
           @stream.simple_field('report_id', Foreman.uuid)
           @stream.simple_field('host_inventory_api_version', '1.0')

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -18,35 +18,28 @@ module ForemanInventoryUpload
               'uname::release',
               'lscpu::flags',
               'distribution::version',
-              'distribution::id',
-              'virt::is_guest',
-              'dmi::system::manufacturer',
-              'dmi::system::product_name',
-              'dmi::chassis::asset_tag',
-              'insights_client::obfuscate_hostname_enabled',
-              'insights_client::obfuscate_ip_enabled',
-              'insights_client::hostname',
-              'insights_client::ips',
             ]).pluck(:name, :id)
           ]
       end
 
       def self.for_slice(base)
+        fact_values = FactValue.where(fact_name_id: fact_names.values)
         base
           .joins(:subscription_facet)
+          .eager_load(:fact_values)
           .preload(
             :interfaces,
             :installed_packages,
             :content_facet,
             :host_statuses,
-            :inventory_upload_facts,
             subscription_facet: [:pools, :installed_products, :hypervisor_host]
           )
+          .merge(fact_values)
       end
 
       def self.for_report(portal_user)
         org_ids = organizations_for_user(portal_user).pluck(:id)
-        for_org(org_ids)
+        for_slice(Host.unscoped.where(organization_id: org_ids)).in_batches(of: 1_000)
       end
 
       def self.for_org(organization_id)

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -3,16 +3,12 @@ module ForemanInventoryUpload
     class Slice
       include FactHelpers
 
-      SATELLITE_NAMESPACE = 'satellite'
-
       attr_accessor :slice_id
-      attr_reader :hosts_count
 
       def initialize(hosts, output = [], slice_id = Foreman.uuid)
         @stream = JsonStream.new(output)
         @hosts = hosts
         @slice_id = slice_id
-        @hosts_count = 0
       end
 
       def render
@@ -28,34 +24,39 @@ module ForemanInventoryUpload
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
-              next unless host&.subscription_facet
+              next unless host&.subscription_facet&.pools&.first
               @stream.comma unless first
-              if report_host(host)
-                first = false
-                @hosts_count += 1
-              end
+              first = false if report_host(host)
             end
           end
         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', host.subscription_facet&.uuid)
-          @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
+          @stream.simple_field('display_name', host.name)
+          @stream.simple_field('fqdn', host.fqdn)
+          @stream.simple_field('account', host.subscription_facet.pools.first.account_number.to_s)
+          @stream.simple_field('subscription_manager_id', host.subscription_facet.uuid)
+          @stream.simple_field('satellite_id', host.subscription_facet.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
-          report_ip_addresses(host, host_ips_cache)
-          report_mac_addresses(host)
+          @stream.array_field('ip_addresses') do
+            @stream.raw(host.interfaces.map do |nic|
+              @stream.stringify_value(nic.ip) if nic.ip
+            end.compact.join(', '))
+          end
+          @stream.array_field('mac_addresses') do
+            @stream.raw(host.interfaces.map do |nic|
+              @stream.stringify_value(nic.mac) if nic.mac
+            end.compact.join(', '))
+          end
           @stream.object_field('system_profile') do
-            report_system_profile(host, host_ips_cache)
+            report_system_profile(host)
           end
           @stream.array_field('facts') do
             @stream.object do
-              @stream.simple_field('namespace', SATELLITE_NAMESPACE)
+              @stream.simple_field('namespace', 'satellite')
               @stream.object_field('facts', :last) do
                 report_satellite_facts(host)
               end
@@ -63,15 +64,8 @@ module ForemanInventoryUpload
           end
 
           @stream.array_field('tags', :last) do
-            report_satellite_tag('satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_satellite_tag('lifecycle_environment', host.lifecycle_environment&.name)
-            report_satellite_tag('content_view', host.content_view&.name)
-            report_satellite_tag('activation_key', host.activation_keys) { |key| key.name }
-            report_satellite_tag('host_collection', host.host_collections) { |collection| collection.name }
-            report_satellite_tag('location', host.location.name)
-            report_satellite_tag('organization', host.organization.name)
-            report_satellite_tag('hostgroup', host.hostgroup&.name)
-            report_satellite_tag('organization_id', host.organization_id.to_s, :last)
+            report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
+            report_tag('satellite', 'organization_id', host.organization_id, :last)
           end
         end
       end
@@ -85,29 +79,17 @@ module ForemanInventoryUpload
         @stream.comma unless last
       end
 
-      def report_satellite_tag(key, value, last = nil)
-        return if value.nil?
-
-        array_value = Array(value)
-        last_index = array_value.count - 1
-
-        array_value.each_with_index do |value, index|
-          value = yield(value) if block_given?
-          report_tag(SATELLITE_NAMESPACE, key, value, last && index == last_index)
-        end
-      end
-
-      def report_system_profile(host, host_ips_cache)
-        @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)')) { |v| v.to_i }
-        @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)')) { |v| v.to_i }
-        @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i }
-        @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) }
+      def report_system_profile(host)
+        @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)').to_i)
+        @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)').to_i)
+        @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket').to_i)
+        @stream.simple_field('system_memory_bytes', kilobytes_to_bytes(fact_value(host, 'memory::memtotal').to_i))
         @stream.array_field('network_interfaces') do
-          @stream.raw(host.interfaces.reject { |nic| nic.identifier.empty? }.map do |nic|
+          @stream.raw(host.interfaces.map do |nic|
             {
-              'ipv4_addresses': [host_ips_cache[nic.ip]].reject(&:empty?),
-              'ipv6_addresses': [nic.ip6].reject(&:empty?),
-              'mtu': nic.try(:mtu) && nic.mtu.to_i,
+              'ipv4_addresses': [nic.ip].compact,
+              'ipv6_addresses': [nic.ip6].compact,
+              'mtu': nic.try(:mtu),
               'mac_address': nic.mac,
               'name': nic.identifier,
             }.compact.to_json
@@ -123,22 +105,12 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        @stream.simple_field(
-          'os_release', [
-            fact_value(host, 'distribution::name'),
-            fact_value(host, 'distribution::version'),
-            fact_value(host, 'distribution::id'),
-          ]
-        ) { |v| os_release_value(*v) }
+        @stream.simple_field('os_release', fact_value(host, 'distribution::name'))
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
         @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?)
-        @stream.simple_field(
-          'infrastructure_type',
-          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
-        )
-        @stream.simple_field('cloud_provider', cloud_provider(host))
+        @stream.simple_field('satellite_managed', true)
         unless (installed_products = host.subscription_facet&.installed_products).empty?
           @stream.array_field('installed_products') do
             @stream.raw(installed_products.map do |product|
@@ -149,49 +121,27 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        unless Setting[:exclude_installed_packages]
-          @stream.array_field('installed_packages') do
-            first = true
-            host.installed_packages.each do |package|
-              @stream.raw("#{first ? '' : ', '}#{@stream.stringify_value(package.nvra)}")
-              first = false
-            end
+        @stream.array_field('installed_packages', :last) do
+          first = true
+          host.installed_packages.each do |package|
+            @stream.raw("#{first ? '' : ', '}#{@stream.stringify_value(package.nvra)}")
+            first = false
           end
         end
-        @stream.simple_field('satellite_managed', true, :last)
       end
 
       def report_satellite_facts(host)
-        @stream.simple_field('virtual_host_name', host.subscription_facet&.hypervisor_host&.name)
-        @stream.simple_field('virtual_host_uuid', host.subscription_facet&.hypervisor_host&.subscription_facet&.uuid)
+        @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
+        @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
         if defined?(ForemanThemeSatellite)
           @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
         end
         @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
         @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
-        @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_hostname_obfuscated', !!obfuscate_hostname?(host))
+        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
-
-      def report_ip_addresses(host, host_ips_cache)
-        ip_addresses = host.interfaces.map { |nic| host_ips_cache[nic.ip] }.compact
-
-        @stream.string_array_value('ip_addresses', ip_addresses)
-      end
-
-      def report_mac_addresses(host)
-        macs = host.interfaces.map { |nic| nic.mac }.compact
-
-        @stream.string_array_value('mac_addresses', macs)
-      end
-
-      def os_release_value(name, version, codename)
-        "#{name} #{version} (#{codename})"
-      end
     end
   end
 end

data/lib/foreman_rh_cloud.rb

@@ -1,72 +1,4 @@
 require 'foreman_rh_cloud/engine.rb'
-require 'cgi'
-require 'uri'
 
 module ForemanRhCloud
-  def self.base_url
-    # for testing set ENV to 'https://ci.cloud.redhat.com'
-    @base_url ||= ENV['SATELLITE_RH_CLOUD_URL'] || 'https://cloud.redhat.com'
-  end
-
-  def self.authentication_url
-    # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-    @authentication_url ||= ENV['SATELLITE_RH_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
-  end
-
-  def self.verify_ssl_method
-    @verify_ssl_method ||= ENV['SATELLITE_RH_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
-  end
-
-  def self.http_proxy_string(logger: Foreman::Logging.logger('background'))
-    ForemanRhCloud.proxy_setting(logger: logger)
-  end
-
-  def self.transformed_http_proxy_string(logger: Foreman::Logging.logger('background'))
-    ForemanRhCloud.transform_scheme(ForemanRhCloud.proxy_setting(logger: logger))
-  end
-
-  def self.proxy_setting(logger: Foreman::Logging.logger('background'))
-    HttpProxy.default_global_content_proxy&.full_url ||
-    ForemanRhCloud.cdn_proxy(logger: logger) ||
-    ForemanRhCloud.global_foreman_proxy ||
-    ''
-  end
-
-  def self.cdn_proxy(logger: Foreman::Logging.logger('app'))
-    proxy_config = SETTINGS[:katello][:cdn_proxy]
-    return nil unless proxy_config
-
-    uri = URI('')
-    uri.host = proxy_config[:host]
-    uri.port = proxy_config[:port]
-    uri.scheme = proxy_config[:scheme] || 'http'
-
-    if proxy_config[:user]
-      uri.user = CGI.escape(proxy_config[:user])
-      uri.password = CGI.escape(proxy_config[:password])
-    end
-    uri.to_s
-  rescue URI::Error => e
-    logger.warn("cdn_proxy parsing failed: #{e}")
-    nil
-  end
-
-  def self.global_foreman_proxy
-    Setting[:http_proxy]
-  end
-
-  # This method assumes uri_string contains uri-encoded username and p@$$word:
-  # http://user:p%40%24%24word@localhost:8888
-  def self.transform_scheme(uri_string)
-    transformed_uri = URI.parse(uri_string)
-
-    case transformed_uri.scheme
-    when "http"
-      transformed_uri.scheme = 'proxy'
-    when "https"
-      transformed_uri.scheme = 'proxys'
-    end
-
-    transformed_uri.to_s
-  end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -5,15 +5,10 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
-    initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/setting/rh_cloud.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/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -27,65 +22,27 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '~> 1.24.0'
+        requires_foreman '> 1.24'
 
         # Add permissions
         security_block :foreman_rh_cloud do
-          permission(
-            :generate_foreman_rh_cloud,
-            'foreman_inventory_upload/reports': [:generate]
-          )
-          permission(
-            :view_foreman_rh_cloud,
-            'foreman_inventory_upload/accounts': [:index],
-            'foreman_inventory_upload/reports': [:last],
-            'foreman_inventory_upload/uploads': [:auto_upload, :download_file, :last],
-            'foreman_rh_cloud/react': [:inventory_upload]
-          )
+          permission :view_foreman_rh_cloud, :'foreman_rh_cloud/reports' => [:last]
         end
 
-        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
-
-        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 a new role called 'Discovery' if it doesn't exist
+        role 'ForemanRhCloud', [:view_foreman_rh_cloud]
 
         # 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_hash: { controller: :'foreman_rh_cloud/react', action: :inventory_upload }, parent: :configure_menu
-        menu :top_menu, :insights_hits_import, caption: N_('Insights'), url_hash: { controller: :'foreman_rh_cloud/react', action: :insights_cloud }, parent: :configure_menu
-
-        register_facet InsightsFacet, :insights do
-          configure_host do
-            set_dependent_action :destroy
-          end
-        end
-
-        register_global_js_file 'subscriptions_extension'
-
-        register_custom_status(InventorySync::InventoryStatus)
-
-        extend_page 'hosts/show' do |context|
-          context.add_pagelet :main_tabs,
-            partial: 'hosts/insights_tab',
-            name: _('Insights'),
-            onlyif: proc { |host| host.insights }
+        sub_menu :top_menu, :foreman_rh_cloud, :caption => N_('RH Cloud'), :icon => 'fa fa-cloud-upload' do
+          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_inventory_upload/react', :action => :index}
         end
       end
-
-      ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
-
-      ::Host::Managed.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|
       unless Rails.env.test?
         ForemanTasks.dynflow.config.on_init do |world|
           ForemanInventoryUpload::Async::GenerateAllReportsJob.spawn_if_missing(world)
-          InsightsCloud::Async::InsightsScheduledSync.spawn_if_missing(world)
         end
       end
     end