foreman_rh_cloud 3.0.23 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 408212bb105f87e7d683c1c288f2b7d4b0c0c307a1b7e71c98433a15b8540ea5
-  data.tar.gz: 3fde56133d829bc2d77e2ce82dd09bf9a2f68482c761ae8527db93d62f47baba
+  metadata.gz: a770469a80b05e6f28d320292ff14ec760b24a5b2a564f5bee625adcb1c3589d
+  data.tar.gz: 0fb9dc4b88422fc28cbf68002e565e49c2deec51eb1edc7e6ecfbfe397f0335b
 SHA512:
-  metadata.gz: 00c0437d4448aac1a2126fc7d4229983891520d82fe326edf1cb0b11b3498ddf995ebe3a7d35a9a6801e91d5577f5d7089e30026c458048c65bdc2d47749e538
-  data.tar.gz: f113f8f3e98a12fdc123890708795a7c89533f3af16808d2f6175948502be1991f4e652a635ec01638c4300890cb1f06ff89b5a1b63775421d85b918ebc23bca
+  metadata.gz: a79f98d8fe9e2883bde293b96eb138c68d01fa2e8fffdb2843b8d5a1fefa09d65f76b7ff18a09961c914ab81d0b65e8232c51066ab1729bfcf4a6fd127e0948d
+  data.tar.gz: e6e8e67014a16817cd4a1b86611541b133b86bc1ef7f588ecc0293f2b81e6682d43a4118a5bec03a3fe8de4c7e4a39dafc7c9c0d223cdc217e01ee97fa400d42

data/app/helpers/foreman_insights_deprecations_helper.rb

@@ -0,0 +1,9 @@
+module ForemanInsightsDeprecationsHelper
+  def old_plugin_deprecation_warning
+    alert(
+      class: 'alert-warning',
+      close: false,
+      text: _('redhat_access plugin is deprecated and will be removed in Satellite 6.10. You can find recommendations for your hosts on hosts index and details pages.')
+    )
+  end
+end

data/app/models/insights_client_report_status.rb

@@ -6,6 +6,10 @@ class InsightsClientReportStatus < HostStatus::Status
   NOT_MANAGED           = 2 # host_registration_insights = false
   NOT_MANAGED_WITH_DATA = 3 # host_registration_insights = false & getting data
 
+  scope :stale, -> { where.not(reported_at: (Time.now - REPORT_INTERVAL)..Time.now) }
+  scope :reporting, -> { where(status: REPORTING) }
+  scope :not_managed_with_data, -> { where(status: NOT_MANAGED_WITH_DATA) }
+
   def self.status_name
     N_('Insights')
   end

data/app/overrides/old_plugin_deprecation.rb

@@ -0,0 +1,20 @@
+Deface::Override.new(
+  virtual_path: 'redhat_access/analytics_dashboard/welcome',
+  name: 'deprecation_warning',
+  insert_before: 'div#welcome',
+  text: '<%= old_plugin_deprecation_warning %>'
+)
+
+Deface::Override.new(
+  virtual_path: 'redhat_access/analytics_dashboard/index',
+  name: 'deprecation_warning_index_not_met',
+  insert_before: 'article#content',
+  text: '<%= old_plugin_deprecation_warning %>'
+)
+
+Deface::Override.new(
+  virtual_path: 'redhat_access/analytics_dashboard/index',
+  name: 'deprecation_warning_index_met',
+  insert_before: 'div.main-content',
+  text: '<%= old_plugin_deprecation_warning %>'
+)

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -56,10 +56,6 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
-      when metadata_request?
-        {
-          url: ForemanRhCloud.base_url + request_path.sub('/redhat_access/r/insights', '/api'),
-        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -76,10 +72,6 @@ module ForemanRhCloud
       end
     end
 
-    def metadata_request?
-      ->(request_path) { request_path.include? '/static' }
-    end
-
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/lib/foreman_inventory_upload.rb

@@ -70,8 +70,16 @@ module ForemanInventoryUpload
     folder
   end
 
+  def self.inventory_base_url
+    ForemanRhCloud.base_url + "/api/inventory/v1/hosts"
+  end
+
   def self.inventory_export_url
     tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
-    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
+    inventory_base_url + "?tags=#{tags}"
+  end
+
+  def self.inventory_self_url
+    inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
   end
 end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -27,6 +27,7 @@ module ForemanInventoryUpload
               'insights_client::obfuscate_ip_enabled',
               'insights_client::hostname',
               'insights_client::ips',
+              'insights_id',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -49,6 +49,7 @@ module ForemanInventoryUpload
           @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
           @stream.simple_field('bios_uuid', bios_uuid(host))
           @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
+          @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
           report_ip_addresses(host, host_ips_cache)
           report_mac_addresses(host)
           @stream.object_field('system_profile') do

data/lib/foreman_rh_cloud/engine.rb

@@ -6,6 +6,18 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
+    def self.register_scheduled_task(task_class, cronline)
+      return if ForemanTasks::RecurringLogic.joins(:tasks)
+                .merge(ForemanTasks::Task.where(label: task_class.name))
+                .exists?
+
+      User.as_anonymous_admin do
+        recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline(cronline)
+        recurring_logic.save!
+        recurring_logic.start(task_class)
+      end
+    end
+
     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
@@ -138,15 +150,8 @@ module ForemanRhCloud
         # skip object creation when admin user is not present, for example in test DB
         if User.unscoped.find_by_login(User::ANONYMOUS_ADMIN).present?
           ::ForemanTasks.dynflow.config.on_init(false) do |world|
-            unless ForemanTasks::RecurringLogic.joins(:tasks).merge(
-              ForemanTasks::Task.where(label: 'InventorySync::Async::InventoryScheduledSync')
-            ).exists?
-              User.as_anonymous_admin do
-                recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline("0 0 * * *")
-                recurring_logic.save!
-                recurring_logic.start(InventorySync::Async::InventoryScheduledSync)
-              end
-            end
+            ForemanRhCloud::Engine.register_scheduled_task(InventorySync::Async::InventoryScheduledSync, '0 0 * * *')
+            ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsClientStatusAging, '0 0 * * *')
           end
         end
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.23'.freeze
+  VERSION = '3.0.24'.freeze
 end

data/lib/insights_cloud/async/insights_client_status_aging.rb

@@ -0,0 +1,17 @@
+module InsightsCloud
+  module Async
+    class InsightsClientStatusAging < ::Actions::EntryAction
+      include ::Actions::RecurringAction
+
+      def run
+        # update all stale records to "not reporting" counterpart
+        InsightsClientReportStatus.stale.reporting.update_all(status: InsightsClientReportStatus::NO_REPORT)
+        InsightsClientReportStatus.stale.not_managed_with_data.update_all(status: InsightsClientReportStatus::NOT_MANAGED)
+      end
+
+      def logger
+        action_logger
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/host_result.rb

@@ -1,6 +1,8 @@
 module InventorySync
   module Async
     class HostResult
+      attr_reader :uuid_by_fqdn
+
       def initialize(result)
         @total = result['total']
         @count = result['count']
@@ -8,6 +10,7 @@ module InventorySync
         @per_page = result['per_page']
         @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
         @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
+        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn'].downcase, host['id']] }]
       end
 
       def status_hashes
@@ -19,6 +22,7 @@ module InventorySync
               host_id: host_id,
               status: InventorySync::InventoryStatus::SYNC,
               reported_at: DateTime.current,
+              type: InventorySync::InventoryStatus.name,
             }
           end
         end.compact

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -4,6 +4,12 @@ module InventorySync
       set_callback :iteration, :around, :setup_facet_transaction
       set_callback :step, :around, :create_facets
 
+      def plan
+        # by default the tasks will be executed concurrently
+        plan_self
+        plan_self_host_sync
+      end
+
       def setup_facet_transaction
         InsightsFacet.transaction do
           yield
@@ -33,6 +39,10 @@ module InventorySync
           InsightsFacet.where(host_id: host_id).update_all(uuid: uuids_hash[host_id])
         end
       end
+
+      def plan_self_host_sync
+        plan_action InventorySync::Async::InventorySelfHostSync
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -0,0 +1,30 @@
+module InventorySync
+  module Async
+    class InventorySelfHostSync < QueryInventoryJob
+      set_callback :step, :around, :create_facets
+
+      def create_facets
+        # get the results from the event
+        results = yield
+
+        add_missing_insights_facet(results.uuid_by_fqdn) unless results.uuid_by_fqdn.empty?
+        results
+      end
+
+      private
+
+      def add_missing_insights_facet(uuids_hash)
+        facet = InsightsFacet.find_or_create_by(host_id: ForemanRhCloud.foreman_host.id) do |facet|
+          facet.uuid = uuids_hash.values.first
+        end
+
+        # fix empty uuid in case the facet already exists
+        facet.update(uuid: uuids_hash.values.first) unless facet.uuid
+      end
+
+      def request_url
+        ForemanInventoryUpload.inventory_self_url
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -31,7 +31,7 @@ module InventorySync
       def query_inventory(page = 1)
         hosts_inventory_response = execute_cloud_request(
           method: :get,
-          url: ForemanInventoryUpload.inventory_export_url,
+          url: request_url,
           headers: {
             params: {
               per_page: 100,
@@ -46,6 +46,10 @@ module InventorySync
       def logger
         action_logger
       end
+
+      def request_url
+        ForemanInventoryUpload.inventory_export_url
+      end
     end
   end
 end

data/package.json

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

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

@@ -11,6 +11,39 @@ module InsightsCloud::Api
         host = FactoryBot.create(:host, :with_subscription, :organization => org)
         User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:upstream_owner).returns({ 'uuid' => 'abcdefg' })
+
+        @cert1 = "-----BEGIN CERTIFICATE-----\r\n" +
+        "MIIFdDCCA1ygAwIBAgIJAM5Uqykb3EAtMA0GCSqGSIb3DQEBCwUAME8xCzAJBgNV\r\n" +
+        "BAYTAklMMREwDwYDVQQIDAhUZWwgQXZpdjEUMBIGA1UECgwLVGhlIEZvcmVtYW4x\r\n" +
+        "FzAVBgNVBAMMDnRoZWZvcmVtYW4ub3JnMB4XDTE4MDMyNDEyMzYyOFoXDTI4MDMy\r\n" +
+        "MTEyMzYyOFowTzELMAkGA1UEBhMCSUwxETAPBgNVBAgMCFRlbCBBdml2MRQwEgYD\r\n" +
+        "VQQKDAtUaGUgRm9yZW1hbjEXMBUGA1UEAwwOdGhlZm9yZW1hbi5vcmcwggIiMA0G\r\n" +
+        "CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF04/s4h+BgHPG1HDZ/sDlYq925pkc\r\n" +
+        "RTVAfnE2EXDAmZ6W4Q9ueDY65MHe3ZWO5Dg72kNSP2sK9kRI7Dk5CAFOgyw1rH8t\r\n" +
+        "Hd1+0xp/lv6e4SvSYghxIL68vFe0ftKkm1usqejBM5ZTgKr7JCI+XSIN36F65Kde\r\n" +
+        "c+vxwBnayuhP04r9/aaE/709SXML4eRVYW8I3qFy9FPtUOm+bY8U2PIv5fHayqbG\r\n" +
+        "cL/4t3+MCtMhHJsLzdBXya+1P5t+HcKjUNlmwoUF961YAktVuEFloGd0RMRlqF3/\r\n" +
+        "itU3QNlXgA5QBIciE5VPr/PiqgMC3zgd5avjF4OribZ+N9AATLiQMW78il5wSfcc\r\n" +
+        "kQjU9ChOLrzku455vQ8KE4bc0qvpCWGfUah6MvL9JB+TQkRl/8kxl0b9ZinIvJDH\r\n" +
+        "ynVMb4cB/TDEjrjOfzn9mWLH0ZJqjmc2bER/G12WQxOaYLxdVwRStD3Yh6PtiFWu\r\n" +
+        "sXOk19UOTVkeuvGFVtvzLfEwQ1lDEo7+VBQz8FG/HBu2Hpq3IwCFrHuicikwjQJk\r\n" +
+        "nfturgD0rBOKEc1qWNZRCvovYOLL6ihvv5Orujsx5ZCHOAtnVNxkvIlFt2RS45LF\r\n" +
+        "MtPJyhAc6SjitllfUEirxprsbmeSZqrIfzcGaEhgOSnyik1WMv6bYiqPfBg8Fzjh\r\n" +
+        "vOCbtiDNPmvgOwIDAQABo1MwUTAdBgNVHQ4EFgQUtkAgQopsTtG9zSG3MgW2IxHD\r\n" +
+        "MDwwHwYDVR0jBBgwFoAUtkAgQopsTtG9zSG3MgW2IxHDMDwwDwYDVR0TAQH/BAUw\r\n" +
+        "AwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAJq7iN+ZroRBweNhvUobxs75bLIV6tNn1\r\n" +
+        "MdNHDRA+hezwf+gxHZhFyaAHfTpst2/9leK5Qe5Zd6gZLr3E5/8ppQuRod72H39B\r\n" +
+        "vxMlG5zxDss0WMo3vZeKZbTY6QhXi/lY2IZ6OGV4feSvCsYxn27GTjjrRUSLFeHH\r\n" +
+        "JVemCwCDMavaE3+OIY4v2P4FcG+MjUvfOB9ahI24TWL7YgrsNVmJjCILq+EeUj0t\r\n" +
+        "Gde1SXVyLkqt7PoxHRJAE0BCEMJSnjxaVB329acJgeehBUxjj4CCPqtDxtbz9HEH\r\n" +
+        "mOKfNdaKpFor+DUeEKUWVGnr9U9xOaC+Ws+oX7MIEUCDM7p2ob4JwcjnFs1jZgHh\r\n" +
+        "Hwig+i7doTlc701PvKWO96fuNHK3B3/jTb1fVvSZ49O/RvY1VWODdUdxWmXGHNh3\r\n" +
+        "LoR8tSPEb46lC2DXGaIQumqQt8PnBG+vL1qkQa1SGTV7dJ8TTbxbv0S+sS+igkk9\r\n" +
+        "zsIEK8Ea3Ep935cXximz0faAAKHSA+It+xHLAyDtqy2KaAEBgGsBuuWlUfK6TaP3\r\n" +
+        "Gwdjct3y4yYUO45lUsUfHqX8vk/4ttW5zYeDiW+HArJz+9VUXNbEdury4kGuHgBj\r\n" +
+        "xHD4Bsul65+hHZ9QywKU26F1A6TLkYpQ2rk/Dx9LGICM4m4IlHjWJPFsQdtkyOor\r\n" +
+        "osxMtcaZZ1E=\r\n" +
+        "-----END CERTIFICATE-----"
       end
 
       test "should respond with response from cloud" do
@@ -30,6 +63,14 @@ module InsightsCloud::Api
         ::ForemanRhCloud::CloudRequestForwarder.any_instance.expects(:execute_cloud_request).with do |opts|
           opts[:headers][:content_type] == 'application/json'
         end.returns(res)
+        InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:candlepin_id_cert)
+          .returns(
+            {
+              cert: @cert1,
+              key: OpenSSL::PKey::RSA.new(1024).to_pem,
+            }
+          )
+        InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:cp_owner_id).returns('123')
 
         post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => {"foo" => "bar"} }
         assert_equal @body, @response.body

data/test/jobs/insights_client_status_aging_test.rb

@@ -0,0 +1,33 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class InsightsClientStatusAgingTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    @host1 = FactoryBot.create(:host)
+    @host2 = FactoryBot.create(:host)
+    @host3 = FactoryBot.create(:host)
+    @host4 = FactoryBot.create(:host)
+
+    @hosts = [@host1, @host2, @host3, @host4]
+  end
+
+  test 'stale statuses should change' do
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host1.id).update(status: InsightsClientReportStatus::REPORTING, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host2.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host3.id).update(status: InsightsClientReportStatus::NOT_MANAGED, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host4.id).update(status: InsightsClientReportStatus::NOT_MANAGED_WITH_DATA, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsClientStatusAging)
+
+    @hosts.each(&:reload)
+
+    assert_equal InsightsClientReportStatus::NO_REPORT, @host1.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::NO_REPORT, @host2.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::NOT_MANAGED, @host3.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::NOT_MANAGED, @host4.get_status(InsightsClientReportStatus).status
+  end
+end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -243,6 +243,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   test 'Inventory should sync UUID for existing Insights Facets' do
     InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
 
     @host2.build_insights.save
 
@@ -255,6 +256,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   test 'Inventory should sync UUID for new Insights Facets' do
     InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync)
 

data/test/jobs/inventory_self_host_sync_test.rb

@@ -0,0 +1,103 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class InventorySelfHostSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host1 = FactoryBot.create(:host)
+    @host1_inventory_id = '3255d080-e6c1-44e2-8d72-b044b9a38d8f'
+
+    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
+
+    ForemanRhCloud.stubs(:foreman_host).returns(@host1)
+
+    inventory_json = <<-INVENTORY_JSON
+    {
+      "total": 1,
+      "count": 1,
+      "page": 1,
+      "per_page": 1,
+      "results": [
+        {
+          "insights_id": "e0dc5144-d78e-43ed-97be-a7a21d1b6946",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "satellite_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "bios_uuid": "6a0b199a-8225-4ade-ae44-3b18cfc84a01",
+          "ip_addresses": [
+            "192.168.122.136"
+          ],
+          "fqdn": "#{@host1.fqdn}",
+          "mac_addresses": [
+            "52:54:00:02:d1:2a",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "#{@host1_inventory_id}",
+          "account": "1460290",
+          "display_name": "insights-rh8.example.com",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "virtual_host_name": "virt-who-nobody.home-1",
+                "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
+                "is_simple_content_access": false,
+                "distribution_version": "8.3",
+                "satellite_version": "6.8.4",
+                "organization_id": 1,
+                "is_hostname_obfuscated": false,
+                "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
+                "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
+                "source": "Satellite",
+                "yupana_host_id": "78c62486-0ac4-406c-a4c0-3a1f81112a2d",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T06:05:12.092136+00:00",
+          "stale_warning_timestamp": "2021-03-26T06:05:12.092136+00:00",
+          "culled_timestamp": "2021-04-02T06:05:12.092136+00:00",
+          "created": "2021-02-08T13:22:50.555671+00:00",
+          "updated": "2021-03-18T01:05:12.131847+00:00"
+        }
+      ]
+    }
+    INVENTORY_JSON
+    @inventory = JSON.parse(inventory_json)
+  end
+
+  test 'Inventory should sync UUID for existing Insights Facets' do
+    InventorySync::Async::InventorySelfHostSync.any_instance.expects(:query_inventory).returns(@inventory)
+
+    @host1.build_insights.save
+
+    ForemanTasks.sync_task(InventorySync::Async::InventorySelfHostSync)
+
+    @host1.reload
+
+    assert_equal @host1_inventory_id, @host1.insights.uuid
+  end
+
+  test 'Inventory should sync UUID for new Insights Facets' do
+    InventorySync::Async::InventorySelfHostSync.any_instance.expects(:query_inventory).returns(@inventory)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventorySelfHostSync)
+
+    @host1.reload
+
+    assert_equal @host1_inventory_id, @host1.insights.uuid
+  end
+end

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

@@ -42,9 +42,9 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
   test 'should prepare correct cloud url' do
     paths = {
       "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
-      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cloud.redhat.com/api/v1/static/release/insights-core.egg",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json.asc",
+      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.redhat.com/r/insights/v1/static/release/insights-core.egg",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json.asc",
       "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
       "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
       "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",

data/test/unit/slice_generator_test.rb

@@ -53,6 +53,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'insights_client::hostname',
       'insights_client::obfuscate_ip_enabled',
       'insights_client::ips',
+      'insights_id',
     ]
   end
 
@@ -657,6 +658,20 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_not_nil actual_host['bios_uuid']
   end
 
+  test 'passes valid insights_id field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_id'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['insights_id']
+  end
+
   private
 
   def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.0.24
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -160,6 +160,7 @@ files:
 - app/controllers/insights_cloud/hits_controller.rb
 - app/controllers/insights_cloud/settings_controller.rb
 - app/controllers/insights_cloud/tasks_controller.rb
+- app/helpers/foreman_insights_deprecations_helper.rb
 - app/helpers/foreman_insights_host_helper.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
@@ -173,6 +174,7 @@ files:
 - app/models/setting/rh_cloud.rb
 - app/overrides/hosts_list.rb
 - app/overrides/layouts/base/styles.html.erb.deface
+- app/overrides/old_plugin_deprecation.rb
 - app/services/foreman_rh_cloud/branch_info.rb
 - app/services/foreman_rh_cloud/cloud_auth.rb
 - app/services/foreman_rh_cloud/cloud_connector.rb
@@ -221,6 +223,7 @@ files:
 - lib/foreman_rh_cloud/engine.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
+- lib/insights_cloud/async/insights_client_status_aging.rb
 - lib/insights_cloud/async/insights_full_sync.rb
 - lib/insights_cloud/async/insights_generate_notifications.rb
 - lib/insights_cloud/async/insights_resolutions_sync.rb
@@ -231,6 +234,7 @@ files:
 - lib/inventory_sync/async/inventory_full_sync.rb
 - lib/inventory_sync/async/inventory_hosts_sync.rb
 - lib/inventory_sync/async/inventory_scheduled_sync.rb
+- lib/inventory_sync/async/inventory_self_host_sync.rb
 - lib/inventory_sync/async/query_inventory_job.rb
 - lib/tasks/foreman_rh_cloud_tasks.rake
 - lib/tasks/insights.rake
@@ -249,12 +253,14 @@ files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
+- test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
+- test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -677,12 +683,14 @@ test_files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
+- test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
+- test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb