foreman_rh_cloud 2.0.14 → 2.0.15

data/lib/foreman_inventory_upload.rb

@@ -48,7 +48,7 @@ module ForemanInventoryUpload
   end
 
   def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.gz"
+    "report_for_#{organization}.tar.xz"
   end
 
   def self.upload_url

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -28,7 +28,7 @@ module ForemanInventoryUpload
 
           @logger.info 'Archiving generated report'
           # success = system('tar', '-zcvf', @target, '-C', tmpdir, '.')
-          Open3.popen2e('tar', '-zcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
+          Open3.popen2e('tar', '-Jcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
             @logger.info("tar: #{out.read}")
 
             if wait_thr.value.success?

data/lib/foreman_rh_cloud/engine.rb

@@ -79,7 +79,6 @@ module ForemanRhCloud
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
       ::Host::Managed.include RhCloudHost
-      ::Host::Base.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.14'.freeze
+  VERSION = '2.0.15'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -2,6 +2,21 @@ require 'tempfile'
 
 namespace :rh_cloud_inventory do
   namespace :report do
+    desc 'Generate inventory report and send it to Red Hat cloud'
+    task generate_upload: [:environment, 'dynflow:client'] do
+      unless ENV['organization_id'].nil?
+        organizations = [ Organization.where(:id => ENV['organization_id']).first ]
+      else
+        organizations = Organization.unscoped.all
+      end
+
+      User.as_anonymous_admin do
+        organizations.each do |organization|
+          ForemanInventoryUpload::Async::GenerateReportJob.perform_now(ForemanInventoryUpload.generated_reports_folder, organization.id)
+          puts "Generated and uploaded inventory report for organization '#{organization.name}'"
+        end
+      end
+    end
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
       portal_user = ENV['portal_user']
@@ -27,6 +42,14 @@ namespace :rh_cloud_inventory do
         end
       end
     end
+    desc 'Upload generated inventory report to Red Hat cloud'
+    task upload: [:environment, 'dynflow:client'] do
+      base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
+      organization_id = ENV['organization_id']
+      report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
+      ForemanInventoryUpload::Async::QueueForUploadJob.perform_now(base_folder, report_file, organization_id)
+      puts "Uploaded #{report_file}"
+    end
   end
 
   desc "Synchronize Insights hosts hits"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -125,6 +125,9 @@ files:
 - app/views/foreman_rh_cloud/react/inventory_upload.html.erb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
+- config/Gemfile.lock.gh_test
+- config/database.yml.example
+- config/package-lock.json.gh_test
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
@@ -525,7 +528,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -540,25 +543,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
-- test/controllers/accounts_controller_test.rb
+- test/controllers/uploads_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
+- test/controllers/accounts_controller_test.rb
 - test/controllers/reports_controller_test.rb
-- test/controllers/uploads_controller_test.rb
-- test/factories/insights_factories.rb
-- test/factories/inventory_upload_factories.rb
+- test/test_plugin_helper.rb
+- test/jobs/upload_report_job_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/jobs/upload_report_job_test.rb
-- test/test_plugin_helper.rb
-- test/unit/archived_report_generator_test.rb
-- test/unit/metadata_generator_test.rb
+- test/factories/inventory_upload_factories.rb
+- test/factories/insights_factories.rb
 - test/unit/shell_process_job_test.rb
-- test/unit/fact_helpers_test.rb
+- test/unit/metadata_generator_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
+- test/unit/fact_helpers_test.rb
+- test/unit/archived_report_generator_test.rb
 - test/unit/slice_generator_test.rb