address comments and rubocop

Author: jeremylenz

lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -0,0 +1,28 @@
+module ForemanInventoryUpload
+  module Async
+    class CreateMissingInsightsFacets < ::Actions::EntryAction
+      def plan(organization_id)
+        plan_self(organization_id: organization_id)
+      end
+
+      def finalize
+        organization = ::Organization.find(input[:organization_id])
+        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+        facet_count = hosts_without_facets.count
+        hosts_without_facets.each do |batch|
+          facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
+            {
+              host_id: host_id,
+              uuid: uuid,
+            }
+          end
+          # We don't need to validate the facets here as we create the necessary fields.
+          # rubocop:disable Rails/SkipsModelValidations
+          InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+        Rails.logger.info "Missing Insights facets created: #{facet_count}" unless facet_count.zero?
+      end
+    end
+  end
+end

…oad/async/generate_single_host_report.rb …ory_upload/async/generate_host_report.rblib/foreman_inventory_upload/async/generate_single_host_report.rb renamed to lib/foreman_inventory_upload/async/generate_host_report.rb lib/foreman_inventory_upload/async/generate_single_host_report.rb renamed to lib/foreman_inventory_upload/async/generate_host_report.rb

@@ -1,17 +1,20 @@
 module ForemanInventoryUpload
   module Async
-    class GenerateSingleHostReport < ::Actions::EntryAction
+    class GenerateHostReport < ::Actions::EntryAction
       def plan(base_folder, organization_id, filter)
         plan_self(
           base_folder: base_folder,
           organization_id: organization_id,
-          filter: filter,
+          filter: filter
         )
         input[:target] = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(input[:organization_id], input[:filter]))
+      end
+
+      def run
         archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(input[:target])
         archived_report_generator.render(organization: input[:organization_id], filter: input[:filter])
       end
-      
+
       def finalize
         output[:result] = "Generated #{input[:target]} for organization id #{input[:organization_id]}"
       end

lib/foreman_inventory_upload/async/host_inventory_report_job.rb

@@ -0,0 +1,38 @@
+module ForemanInventoryUpload
+  module Async
+    class HostInventoryReportJob < ::Actions::EntryAction
+      def plan(base_folder, organization_id, hosts_filter = "")
+        sequence do
+          plan_action(
+            GenerateHostReport,
+            base_folder,
+            organization_id,
+            hosts_filter
+          )
+
+          plan_action(
+            QueueForUploadJob,
+            base_folder,
+            ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
+            organization_id
+          )
+
+          if ForemanRhCloud.with_iop_smart_proxy?
+            plan_action(
+              CreateMissingInsightsFacets,
+              organization_id
+            )
+          end
+        end
+      end
+
+      def humanized_name
+        _("Host inventory report job")
+      end
+
+      def organization_id
+        input[:organization_id]
+      end
+    end
+  end
+end

lib/foreman_inventory_upload/async/single_host_report_job.rb

@@ -1,14 +1,14 @@
 module ForemanInventoryUpload
   module Async
-    class SingleHostReportJob < ::Actions::EntryAction
+    class SingleHostReportJob < HostInventoryReportJob
       def plan(base_folder, organization_id, host_id)
         input[:host_id] = host_id
         sequence do
           plan_action(
-            GenerateSingleHostReport,
+            GenerateHostReport,
             base_folder,
             organization_id,
-            hosts_filter,
+            hosts_filter
           )
 
           plan_action(
@@ -17,6 +17,11 @@ def plan(base_folder, organization_id, host_id)
             ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
             organization_id
           )
+
+          plan_action(
+            CreateMissingInsightsFacets,
+            organization_id
+          )
         end
       end
 
@@ -27,7 +32,7 @@ def hostname(host_id)
 
       def humanized_name
         hostname_result = hostname(input[:host_id])
-        hostname_result.present? ? _("Single-host report job for host %s" % hostname_result) : _("Single-host report job")
+        hostname_result.present? ? format(_("Single-host report job for host %s"), hostname_result) : _("Single-host report job")
       end
 
       def organization_id

lib/tasks/rh_cloud_inventory.rake

@@ -23,8 +23,8 @@ namespace :rh_cloud_inventory do
       end
     end
     desc 'Generate inventory report to be sent to Red Hat cloud'
-    task generate: :environment do
-      organizations = [ENV['organization_id']]
+    task generate: [:environment, 'dynflow:client'] do
+      organization_ids = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
       filter = ENV['hosts_filter']
 
@@ -34,37 +34,21 @@ namespace :rh_cloud_inventory do
         puts "Using #{base_folder} for the output"
       end
 
-      if organizations.empty?
+      if organization_ids.empty?
         puts "Must specify organization_id"
         return
       end
 
       User.as_anonymous_admin do
-        organizations.each do |organization|
-          target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization, filter))
-          archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-          archived_report_generator.render(organization: organization, filter: filter)
-          puts "Successfully generated #{target} for organization id #{organization}"
-          puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
-
-          next unless ForemanRhCloud.with_iop_smart_proxy?
-
-          puts 'Creating missing insights facets'
-          hosts_without_facets = ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
-          hosts_without_facets.each do |batch|
-            facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
-              {
-                host_id: host_id,
-                uuid: uuid,
-              }
-            end
-            # We don't need to validate the facets here as we create the necessary fields.
-            # rubocop:disable Rails/SkipsModelValidations
-            InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
-            # rubocop:enable Rails/SkipsModelValidations
-          end
-          puts 'Missing Insights facets created'
+        organization_ids.each do |organization_id|
+          ForemanTasks.sync_task(
+            ForemanInventoryUpload::Async::HostInventoryReportJob,
+            base_folder,
+            organization_id,
+            filter
+          )
         end
+        puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end
     end
     desc 'Upload generated inventory report to Red Hat cloud'