foreman_rh_cloud 3.0.21 → 3.0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f19ab6e45bf75f915a43c8db5e829f77fe6e5e7b62998d42fe4207ce37dcc062
-  data.tar.gz: c2bf184dcdfaefe41c1d13116ede5236c381c1f0bc8e71353d2875eee9cb289e
+  metadata.gz: d87599d8ef67eeeaa3e17e720dc990b58d4085caf7fb6491dab093c54770c8fd
+  data.tar.gz: 04b52a7412dddf8e6829d61555ec9315c7f3856fde32e976eb8c50638082a3bc
 SHA512:
-  metadata.gz: 7f2e16294caeae0098b8b8367082d75af4a706f74022dba22c040d9f545b4c99ca3c31be0d3db568c2a2dfc3de5509590a9602b026caad6ea0fb1b53a3ccc9f2
-  data.tar.gz: 9cc8d2349b5879d84bb9d2e95157c3eaafbff04823ea6704889b2678dc9a6a1f8fe300f09d28eef47c62cbbeccd94d96b0bbd7518969f8edbdbfb338a2fff1c7
+  metadata.gz: 4ca381e6bcbf74d21a23ae825ebb6556be1afbe98c193fb33e58ef7fee6027142a809ed79b8cbcb3c8dce95200b0bd4528d497597a1f0411f703172ce1f9c123
+  data.tar.gz: 945faf0852d9ebce259e4da1bcebd079ef5a4fad87f503fc9ee694f4eae7e3ab36a7dc2390d54879a7da57d176aa22d8030a168d2715fe1f54a521b2258fbb37

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -10,28 +10,27 @@ module InsightsCloud::Api
 
     skip_after_action :log_response_body, :only => [:forward_request]
     skip_before_action :check_media_type, :only => [:forward_request]
-    after_action :update_host_insights_status, only: [:forward_request]
 
     # The method that "proxies" requests over to Cloud
     def forward_request
       certs = candlepin_id_cert @organization
-      @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
+      cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
 
-      if @cloud_response.code == 401
+      if cloud_response.code == 401
         return render json: {
           :message => 'Authentication to the Insights Service failed.',
           :headers => {},
         }, status: :bad_gateway
       end
 
-      if @cloud_response.headers[:content_disposition]
-        return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
+      if cloud_response.headers[:content_disposition]
+        return send_data cloud_response, disposition: cloud_response.headers[:content_disposition], type: cloud_response.headers[:content_type]
       end
 
-      assign_header(response, @cloud_response, :x_resource_count, true)
-      assign_header(response, @cloud_response, :x_rh_insights_request_id, false)
+      assign_header(response, cloud_response, :x_resource_count, true)
+      assign_header(response, cloud_response, :x_rh_insights_request_id, false)
 
-      render json: @cloud_response, status: @cloud_response.code
+      render json: cloud_response, status: cloud_response.code
     end
 
     def branch_info
@@ -70,14 +69,5 @@ module InsightsCloud::Api
       @branch_id = cp_owner_id(@organization)
       return render_message "Branch ID not found for organization #{@organization.title}", :status => 400 unless @branch_id
     end
-
-    def update_host_insights_status
-      return unless request.path == '/redhat_access/r/insights/platform/ingress/v1/upload' ||
-                    request.path.include?('/redhat_access/r/insights/uploads/')
-
-      data = @cloud_response.code.to_s.start_with?('2')
-      host_status = @host.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: Time.now.utc, status: host_status.to_status(data: data))
-    end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -78,10 +78,7 @@ module ForemanRhCloud
 
         register_global_js_file 'global'
 
-        register_custom_status InventorySync::InventoryStatus
-        register_custom_status InsightsClientReportStatus
-
-        subscribe 'host_created.event.foreman', ForemanRhCloud::InsightsSubscriber
+        register_custom_status(InventorySync::InventoryStatus)
 
         extend_page 'hosts/show' do |context|
           context.add_pagelet :main_tabs,
@@ -133,13 +130,15 @@ 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?
-          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)
+          ::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
           end
         end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.21'.freeze
+  VERSION = '3.0.21.1'.freeze
 end

data/package.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.21
+  version: 3.0.21.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -160,7 +160,6 @@ files:
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
 - app/models/concerns/rh_cloud_host.rb
-- app/models/insights_client_report_status.rb
 - app/models/insights_facet.rb
 - app/models/insights_hit.rb
 - app/models/insights_resolution.rb
@@ -175,7 +174,6 @@ files:
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
-- app/subscribers/foreman_rh_cloud/insights_subscriber.rb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
@@ -247,7 +245,6 @@ files:
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/upload_report_job_test.rb
-- test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
@@ -651,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -669,7 +666,6 @@ test_files:
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/upload_report_job_test.rb
-- test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb

data/app/models/insights_client_report_status.rb

@@ -1,58 +0,0 @@
-class InsightsClientReportStatus < HostStatus::Status
-  REPORT_INTERVAL = 48.hours
-
-  REPORTING             = 0 # host_registration_insights = true & getting data
-  NO_REPORT             = 1 # host_registration_insights = true & not getting data
-  NOT_MANAGED           = 2 # host_registration_insights = false
-  NOT_MANAGED_WITH_DATA = 3 # host_registration_insights = false & getting data
-
-  def self.status_name
-    N_('Insights')
-  end
-
-  def to_label(_options = {})
-    case status
-      when REPORTING
-        N_('Reporting')
-      when NO_REPORT
-        N_('Not reporting')
-      when NOT_MANAGED
-        N_('Not reporting (not set by registration)')
-      when NOT_MANAGED_WITH_DATA
-        N_('Reporting (not set by registration)')
-    end
-  end
-
-  def to_global(_options = {})
-    case status
-      when REPORTING
-        ::HostStatus::Global::OK
-      when NO_REPORT
-        ::HostStatus::Global::ERROR
-      when NOT_MANAGED
-        ::HostStatus::Global::OK
-      when NOT_MANAGED_WITH_DATA
-        ::HostStatus::Global::WARN
-    end
-  end
-
-  def to_status(data: false)
-    if insights_param
-      return REPORTING if data
-      return in_interval? ? REPORTING : NO_REPORT
-    end
-
-    data ? NOT_MANAGED_WITH_DATA : NOT_MANAGED
-  end
-
-  private
-
-  def in_interval?
-    return false unless reported_at
-    (Time.now.utc - reported_at).to_i < REPORT_INTERVAL.to_i
-  end
-
-  def insights_param
-    host.host_params_hash.dig('host_registration_insights', :value)
-  end
-end

data/app/subscribers/foreman_rh_cloud/insights_subscriber.rb

@@ -1,9 +0,0 @@
-module ForemanRhCloud
-  class InsightsSubscriber < ::Foreman::BaseSubscriber
-    def call(*args)
-      host = args.first.payload[:object]
-      host_status = host.get_status(InsightsClientReportStatus)
-      host_status.update(status: host_status.to_status)
-    end
-  end
-end

data/test/models/insights_client_report_status_test.rb

@@ -1,77 +0,0 @@
-require 'test_plugin_helper'
-
-class InsightsClientReportStatusTest < ActiveSupport::TestCase
-  describe 'to_status' do
-    let(:host) { FactoryBot.create(:host, :managed) }
-
-    setup do
-      CommonParameter.where(name: 'host_registration_insights').destroy_all
-    end
-
-    test 'host_registration_insights = true & is getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = true & no data in less than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 0, host_status.to_status
-    end
-
-    test 'host_registration_insights = true & no data in more than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 1, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & no data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & is getting data' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & no data in less than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = nil & no data in more than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'override param on host level from `false` to `true`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'override param on host level from `true` to `false`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
-  end
-end