foreman_rh_cloud 4.0.26 → 4.0.31

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -34,6 +34,7 @@ module ForemanInventoryUpload
 
       def self.for_slice(base)
         base
+          .search_for("not params.#{InsightsCloud.enable_client_param} = f")
           .joins(:subscription_facet)
           .preload(
             :interfaces,

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -13,15 +13,15 @@ module ForemanInventoryUpload
           organizations +
           content_data +
           satellite_server_data
-        ).reject { |key, value| value.empty? }
+        ).reject { |key, value| value.empty? }.map { |key, value| [key, truncated_value(value)] }
       end
 
       def generate_parameters
         return [] unless Setting[:include_parameter_tags]
 
-        (@host.host_inherited_params_objects || [])
-          .map { |item| [item.name, item.value] }
+        (@host.host_params || {})
           .select { |_name, value| value.present? || value.is_a?(FalseClass) }
+          .map { |key, value| [key, truncated_value(value)] }
       end
 
       private
@@ -58,6 +58,12 @@ module ForemanInventoryUpload
           ['organization_id', @host.organization_id.to_s],
         ]
       end
+
+      def truncated_value(value)
+        return 'Original value exceeds 250 characters' if value.to_s.length > 250
+
+        value
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '4.0.26'.freeze
+  VERSION = '4.0.31'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -98,7 +98,18 @@ module ForemanRhCloud
 
   # For testing purposes we can override the default hostname with an environment variable SATELLITE_RH_CLOUD_FOREMAN_HOST
   def self.foreman_host
-    @foreman_host ||= ::Host.unscoped.friendly.find(ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || ::SmartProxy.default_capsule.name)
+    @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.unscoped.friendly.find(shortname)
+                      end
+  end
+
+  def self.foreman_host_name
+    ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || ::SmartProxy.default_capsule.name
   end
 
   def self.legacy_insights_ca

data/lib/inventory_sync/async/host_result.rb

@@ -17,7 +17,6 @@ module InventorySync
         @sub_ids.map do |sub_id|
           host_id = host_id(sub_id)
           if host_id
-            touched << host_id
             {
               host_id: host_id,
               status: InventorySync::InventoryStatus::SYNC,
@@ -28,10 +27,6 @@ module InventorySync
         end.compact
       end
 
-      def touched
-        @touched ||= []
-      end
-
       def host_id(sub_id)
         hosts[sub_id]
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -14,11 +14,7 @@ module InventorySync
       end
 
       def setup_statuses
-        @subscribed_hosts_ids = Set.new(
-          ForemanInventoryUpload::Generators::Queries.for_slice(
-            Host.unscoped.where(organization: input[:organization_id])
-          ).pluck(:id)
-        )
+        @subscribed_hosts_ids = Set.new(affected_host_ids)
 
         InventorySync::InventoryStatus.transaction do
           InventorySync::InventoryStatus.where(host_id: @subscribed_hosts_ids).delete_all
@@ -35,8 +31,10 @@ module InventorySync
       def update_statuses_batch
         results = yield
 
-        update_hosts_status(results.status_hashes, results.touched)
-        host_statuses[:sync] += results.touched.size
+        existing_hosts = results.status_hashes.select { |hash| @subscribed_hosts_ids.include?(hash[:host_id]) }
+
+        update_hosts_status(existing_hosts)
+        host_statuses[:sync] += existing_hosts.size
       end
 
       def rescue_strategy_for_self
@@ -45,9 +43,10 @@ module InventorySync
 
       private
 
-      def update_hosts_status(status_hashes, touched)
+      def update_hosts_status(status_hashes)
         InventorySync::InventoryStatus.create(status_hashes)
-        @subscribed_hosts_ids.subtract(touched)
+        updated_ids = status_hashes.map { |hash| hash[:host_id] }
+        @subscribed_hosts_ids.subtract(updated_ids)
       end
 
       def add_missing_hosts_statuses(hosts_ids)
@@ -68,6 +67,12 @@ module InventorySync
           disconnect: 0,
         }
       end
+
+      def affected_host_ids
+        ForemanInventoryUpload::Generators::Queries.for_slice(
+          Host.unscoped.where(organization: input[:organization_id])
+        ).pluck(:id)
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -35,18 +35,14 @@ module InventorySync
       private
 
       def add_missing_insights_facets(uuids_hash)
-        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id, :uuid)
-        missing_facets = uuids_hash.except(*existing_facets.map(&:first)).map do |host_id, uuid|
+        all_facets = uuids_hash.map do |host_id, uuid|
           {
             host_id: host_id,
             uuid: uuid,
           }
         end
-        InsightsFacet.create(missing_facets)
 
-        existing_facets.select { |host_id, uuid| uuid.empty? }.each do |host_id, _uuid|
-          InsightsFacet.where(host_id: host_id).update_all(uuid: uuids_hash[host_id])
-        end
+        InsightsFacet.upsert_all(all_facets, unique_by: :host_id) unless all_facets.empty?
       end
 
       def plan_self_host_sync

data/package.json

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

data/test/factories/inventory_upload_factories.rb

@@ -54,10 +54,24 @@ FactoryBot.define do
   end
 end
 
+FactoryBot.define do
+  factory :katello_subscription, :class => Katello::Subscription do
+  end
+end
+
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
     active { true }
     end_date { Date.today + 1.year }
+    cp_id { 1 }
+
+    association :organization, :factory => :katello_organization
+
+    after(:build) do |pool, _evaluator|
+      pool.subscription.organization = pool.organization
+    end
+
+    association :subscription, :factory => :katello_subscription
   end
 end
 

data/test/jobs/inventory_full_sync_test.rb

@@ -37,6 +37,18 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host3 = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+
+    @host3.subscription_facet.pools << pool
+
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -151,7 +163,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
         {
           "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
           "rhel_machine_id": null,
-          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
+          "subscription_manager_id": "#{@host3.subscription_facet.uuid}",
           "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
           "ip_addresses": [
@@ -159,7 +171,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
             "fd6e:2298:736e::857",
             "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
           ],
-          "fqdn": "rhel8-demo.oss-lab.net",
+          "fqdn": "#{@host3.fqdn}",
           "mac_addresses": [
             "6e:66:a6:fe:fc:07",
             "00:00:00:00:00:00"
@@ -271,4 +283,18 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
   end
+
+  test 'Should skip hosts that are not returned in query' do
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
+    @host2.reload
+
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -265,4 +265,19 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_equal @host2_inventory_id, @host2.insights.uuid
   end
+
+  test 'Inventory should sync empty facets list' do
+    empty_inventory = @inventory.deep_clone
+    empty_inventory['results'] = []
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(empty_inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
+
+    assert_nil @host2.insights
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync)
+
+    @host2.reload
+
+    assert_nil @host2.insights
+  end
 end

data/test/unit/foreman_rh_cloud_self_host_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class ForemanRhCloudSelfHostTest < ActiveSupport::TestCase
+  setup do
+    # reset cached value
+    ForemanRhCloud.instance_variable_set(:@foreman_host, nil)
+  end
+
+  test 'finds host by fullname' do
+    @domain
+    @host = FactoryBot.create(:host, :managed)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+
+  test 'finds host by shortname' do
+    @host = FactoryBot.create(:host, :managed)
+    Host.where(name: @host.name).update_all(name: @host.shortname)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+end

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

@@ -133,4 +133,23 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal 'GET', actual[:method]
     assert_equal params, actual[:headers][:params]
   end
+
+  test 'should forward content type correctly' do
+    user_agent = { :foo => :bar }
+    params = { :page => 5, :per_page => 42 }
+    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_name).returns('test_app')
+    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_version).returns('test_ver')
+
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_USER_AGENT' => user_agent,
+      'rack.input' => ::Puma::NullIO.new,
+      'action_dispatch.request.query_parameters' => params
+    )
+
+    actual = @forwarder.prepare_request_opts(req, 'TEST PAYLOAD', params, generate_certs_hash)
+
+    assert_match /text\/html/, actual[:headers][:content_type]
+  end
 end

data/test/unit/slice_generator_test.rb

@@ -22,7 +22,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       location: location
     )
 
-    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(
+      :katello_pool,
+      account_number: '1234',
+      cp_id: 1,
+      organization: env.organization,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: env.organization.id)
+    )
     @host.interfaces.first.identifier = 'test_nic1'
     @host.save!
 
@@ -441,6 +447,18 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'excludes hosts with host_registration_insights set to false' do
+    @host.host_parameters << HostParameter.create(
+      name: 'host_registration_insights',
+      value: "false",
+      parameter_type: 'boolean'
+    )
+
+    count = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).count
+
+    assert_equal 0, count
+  end
+
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 
@@ -457,9 +475,23 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports an account for hosts with multiple pools' do
-    first_pool = @host.organization.pools.first
-    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
-    new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
+    new_org = FactoryBot.create(:organization)
+    first_pool = FactoryBot.create(
+      :katello_pool,
+      account_number: '5678',
+      cp_id: 2,
+      organization: new_org,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: new_org.id)
+    )
+    second_pool = FactoryBot.create(
+      :katello_pool,
+      account_number: '9012',
+      cp_id: 3,
+      organization: new_org,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: new_org.id)
+    )
+    new_org.pools << first_pool
+    new_org.pools << second_pool
 
     another_host = FactoryBot.create(
       :host,

data/test/unit/tags_generator_test.rb

@@ -65,14 +65,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'generates parameter tags' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -87,14 +87,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'skips parameter tags if include_parameter_tags setting is off' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -103,6 +103,21 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, actual.count
   end
 
+  test 'truncates parameter tags' do
+    Setting[:include_parameter_tags] = true
+
+    @host.stubs(:host_params).returns(
+      {
+        'str_param' => 'a' * 251,
+      }
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 'Original value exceeds 250 characters', actual['str_param']
+  end
+
   private
 
   def create_generator

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.26
+  version: 4.0.31
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -174,6 +174,7 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
+- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -255,6 +256,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
@@ -685,6 +687,7 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb