foreman_rh_cloud 3.0.19 → 3.0.23

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -0,0 +1,66 @@
+require 'rest-client'
+
+module InsightsCloud
+  module Async
+    class InsightsResolutionsSync < ::Actions::EntryAction
+      include ::ForemanRhCloud::CloudAuth
+
+      RULE_ID_REGEX = /[^:]*:(?<id>.*)/
+
+      def run
+        InsightsResolution.transaction do
+          InsightsResolution.delete_all
+          api_response = query_insights_resolutions(relevant_rules)
+          write_resolutions(api_response)
+        end
+      end
+
+      def logger
+        action_logger
+      end
+
+      private
+
+      def query_insights_resolutions(rule_ids)
+        resolutions_response = execute_cloud_request(
+          method: :post,
+          url: InsightsCloud.resolutions_url,
+          headers: {
+            content_type: :json,
+          },
+          payload: {
+            issues: rule_ids,
+          }.to_json
+        )
+
+        JSON.parse(resolutions_response)
+      end
+
+      def relevant_rules
+        InsightsRule.all.pluck(:rule_id).map { |id| InsightsCloud.remediation_rule_id(id) }
+      end
+
+      def to_resolution_hash(rule_id, resolution_hash)
+        {
+          rule_id: rule_id,
+          description: resolution_hash['description'],
+          resolution_type: resolution_hash['id'],
+          needs_reboot: resolution_hash['needs_reboot'],
+          resolution_risk: resolution_hash['resolution_risk'],
+        }
+      end
+
+      def write_resolutions(response)
+        all_resolutions = response.map do |rule_id, rule_details|
+          rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+        end.flatten
+
+        InsightsResolution.create(all_resolutions)
+      end
+
+      def to_rule_id(resolution_rule_id)
+        RULE_ID_REGEX.match(resolution_rule_id).named_captures.fetch('id', resolution_rule_id)
+      end
+    end
+  end
+end

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -2,13 +2,21 @@ require 'rest-client'
 
 module InsightsCloud
   module Async
-    class InsightsRulesSync < ::ApplicationJob
+    class InsightsRulesSync < ::Actions::EntryAction
       include ::ForemanRhCloud::CloudAuth
 
-      def perform
+      def plan
+        plan_self
+        plan_resolutions
+      end
+
+      def plan_resolutions
+        plan_action InsightsResolutionsSync
+      end
+
+      def run
         offset = 0
         InsightsRule.transaction do
-          InsightsResolution.delete_all
           InsightsRule.delete_all
           loop do
             api_response = query_insights_rules(offset)
@@ -16,26 +24,22 @@ module InsightsCloud
             logger.debug("Downloaded #{offset + results.count} of #{results.total}")
             write_rules_page(results.rules)
             offset += results.count
+            output[:rules_count] = results.total
             break if offset >= results.total
           end
         end
       end
 
       def logger
-        Foreman::Logging.logger('background')
+        action_logger
       end
 
       private
 
       def query_insights_rules(offset)
-        rules_response = RestClient::Request.execute(
+        rules_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.rules_url(offset: offset),
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.rules_url(offset: offset)
         )
 
         JSON.parse(rules_response)
@@ -43,12 +47,8 @@ module InsightsCloud
 
       def write_rules_page(rules)
         rules_attributes = rules.map { |rule| to_rule_hash(rule) }
-        resolutions_attributes = rules.map do |rule|
-          rule['resolution_set'].map { |resolution| to_resolution_hash(rule['rule_id'], resolution) }
-        end.flatten
 
         InsightsRule.create(rules_attributes)
-        InsightsResolution.create(resolutions_attributes)
       end
 
       def to_rule_hash(rule_hash)
@@ -66,15 +66,6 @@ module InsightsCloud
           rating:  rule_hash['rating'],
         }
       end
-
-      def to_resolution_hash(rule_id, resolution_hash)
-        {
-          rule_id: rule_id,
-          system_type: resolution_hash['system_type'],
-          resolution: resolution_hash['resolution'],
-          has_playbook: resolution_hash['has_playbook'],
-        }
-      end
     end
   end
 end

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -10,7 +10,7 @@ module InsightsCloud
           return
         end
 
-        InsightsFullSync.perform_later()
+        ForemanTasks.async_task InsightsFullSync
       ensure
         self.class.set(:wait => 24.hours).perform_later
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -24,6 +24,7 @@ module InventorySync
 
         logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
         logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
+        output[:host_statuses] = host_statuses
       end
 
       def update_statuses_batch
@@ -53,7 +54,7 @@ module InventorySync
       end
 
       def host_statuses
-        output[:host_statuses] ||= {
+        @host_statuses ||= {
           sync: 0,
           disconnect: 0,
         }

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -20,14 +20,18 @@ module InventorySync
       private
 
       def add_missing_insights_facets(uuids_hash)
-        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id)
-        missing_facets = uuids_hash.except(*existing_facets).map do |host_id, uuid|
+        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|
           {
             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
       end
     end
   end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -0,0 +1,29 @@
+module InventorySync
+  module Async
+    class InventoryScheduledSync < ::Actions::EntryAction
+      include ::Actions::RecurringAction
+
+      def plan
+        unless Setting[:allow_auto_inventory_upload]
+          logger.debug(
+            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
+            setting being set to false.'
+          )
+          return
+        end
+
+        Organization.unscoped.each do |org|
+          plan_org_sync(org)
+        end
+      end
+
+      def plan_org_sync(org)
+        plan_action InventoryFullSync, org
+      end
+
+      def logger
+        action_logger
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -29,13 +29,10 @@ module InventorySync
       private
 
       def query_inventory(page = 1)
-        hosts_inventory_response = RestClient::Request.execute(
+        hosts_inventory_response = execute_cloud_request(
           method: :get,
           url: ForemanInventoryUpload.inventory_export_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
-            Authorization: "Bearer #{rh_credentials}",
             params: {
               per_page: 100,
               page: page,

data/lib/tasks/insights.rake

@@ -1,15 +1,7 @@
 namespace :rh_cloud_insights do
-  desc "Synchronize Insights inventory"
-  task sync: :environment do
-    if ! ENV['organization_id'].nil?
-      organizations = [ Organization.where(:id => ENV['organization_id']).first ]
-    else
-      organizations = Organization.all
-    end
-
-    organizations.each do |organization|
-      ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, organization)
-      puts "Synchronized inventory for organization '#{organization.name}'"
-    end
+  desc "Synchronize Insights hosts hits"
+  task sync: [:environment, 'dynflow:client'] do
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
+    puts "Synchronized Insights hosts hits data"
   end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -23,8 +23,15 @@ namespace :rh_cloud_inventory do
       organizations = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
 
-      unless portal_user || organizations.empty?
+      unless File.writable?(base_folder)
+        puts "#{base_folder} is not writable by the current process"
+        base_folder = Dir.mktmpdir
+        puts "Using #{base_folder} for the output"
+      end
+
+      if portal_user.empty? && organizations.empty?
         puts "Must specify either portal_user or organization_id"
+        return
       end
 
       User.as_anonymous_admin do
@@ -52,9 +59,17 @@ namespace :rh_cloud_inventory do
     end
   end
 
-  desc "Synchronize Insights hosts hits"
-  task sync: :environment do
-    InsightsCloud::Async::InsightsFullSync.perform_now()
-    puts "Synchronized Insights hosts hits data"
+  desc "Synchronize Hosts inventory"
+  task sync: [:environment, 'dynflow:client'] do
+    if ! ENV['organization_id'].nil?
+      organizations = [ Organization.where(:id => ENV['organization_id']).first ]
+    else
+      organizations = Organization.all
+    end
+
+    organizations.each do |organization|
+      ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, organization)
+      puts "Synchronized inventory for organization '#{organization.name}'"
+    end
   end
 end

data/package.json

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

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -0,0 +1,53 @@
+require 'test_plugin_helper'
+
+module InventoryUpload::Api
+  class InventoryControllerTest < ActionController::TestCase
+    tests Api::V2::RhCloud::InventoryController
+
+    setup do
+      @test_org = FactoryBot.create(:organization)
+    end
+
+    test 'Starts report generation' do
+      Api::V2::RhCloud::InventoryController.any_instance
+        .expects(:start_report_generation)
+        .with(@test_org.id.to_s)
+
+      post :generate_report, params: { organization_id: @test_org.id }
+
+      assert_response :success
+    end
+
+    test 'Starts inventory sync action' do
+      test_task = FactoryBot.create(:some_task)
+
+      Api::V2::RhCloud::InventoryController.any_instance
+        .expects(:start_inventory_sync)
+        .with() { |actual_org| @test_org.id == actual_org.id }
+        .returns(test_task)
+
+      post :sync_inventory_status, params: { organization_id: @test_org.id }
+
+      assert_response :success
+
+      assert_not_nil(actual_task = @response.parsed_body['task'])
+      assert_equal test_task.id.to_s, actual_task['id']
+    end
+
+    test 'Starts cloud connector configuration job' do
+      test_job = FactoryBot.create(:job_invocation)
+
+      ForemanRhCloud::CloudConnector.any_instance
+        .expects(:install)
+        .returns(test_job)
+
+      post :enable_cloud_connector
+
+      assert_response :success
+
+      actual_job = @response.parsed_body
+
+      assert_equal test_job.id, actual_job['id']
+    end
+  end
+end

data/test/factories/insights_factories.rb

@@ -19,6 +19,28 @@ FactoryBot.define do
     sequence(:results_url) { |n| "https://cloud.redhat.com/insights/overview/stability/test_rule%7CTEST_RULE/accdf444-5628-451d-bf3e-cf909ad7275#{n}/" }
     rule_id { "test_rule|TEST_RULE" }
   end
+
+  factory :insights_rule do
+    sequence(:rule_id) { |n| "test_rule#{n}|TEST_RULE#{n}" }
+    description { 'test rule description' }
+    category_name { 'Testing' }
+    impact_name { 'Testing error' }
+    summary { 'Testing summary' }
+    generic { 'Testing generic' }
+    reason { 'No apparent reason' }
+    total_risk { -1 }
+    reboot_required { true }
+    more_info { 'more test info' }
+    rating { 0 }
+  end
+
+  factory :insights_resolution do
+    sequence(:rule_id) { |n| "test_rule#{n}|TEST_RULE#{n}" }
+    description { 'fix the issue on the fly' }
+    needs_reboot { false }
+    resolution_risk { 1 }
+    resolution_type { 'fix' }
+  end
 end
 
 FactoryBot.modify do

data/test/factories/inventory_upload_factories.rb

@@ -49,7 +49,7 @@ end
 
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % {n: n, r: rand(500)} }
     facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/insights_full_sync_test.rb

@@ -1,7 +1,13 @@
 require 'test_helper'
+require 'foreman_tasks/test_helpers'
+
+class InsightsFullSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
-class InsightsFullSyncTest < ActiveJob::TestCase
   setup do
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
+
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')
     FactoryBot.create(:insights_facet, host_id: @host1.id, uuid: uuid1)
@@ -56,8 +62,10 @@ class InsightsFullSyncTest < ActiveJob::TestCase
   test 'Hits data is replaced with data from cloud' do
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
-    ForemanTasks.expects(:sync_task).with(InventorySync::Async::InventoryHostsSync)
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_rules_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_notifications)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload
@@ -68,11 +76,12 @@ class InsightsFullSyncTest < ActiveJob::TestCase
 
   test 'Hits counters are reset correctly' do
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
-    ForemanTasks.stubs(:sync_task)
 
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
     # Invoke again
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload
@@ -101,10 +110,10 @@ class InsightsFullSyncTest < ActiveJob::TestCase
     HITS_JSON
     hits = JSON.parse(hits_json)
 
-    ForemanTasks.stubs(:sync_task)
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(hits)
 
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload