foreman_rh_cloud 9.0.51 → 9.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd555061d766a7bdffb964b4fe5214a22651b2be5ebcc729f7cc689c188b2ee
-  data.tar.gz: 60b2ad4169a6495a372006138848f7faf63d05ec5775dc78ee16c69f0a6fa4df
+  metadata.gz: f73aa359a80f6cf7cadf833aa827c0c0e3099ca943b4300e22d73e2be92f1389
+  data.tar.gz: f8a2ee913daac4550f4399346f9e7d3a0af9be3d48345fe9426d0b6abb093e0f
 SHA512:
-  metadata.gz: 7c93f25c3b1eb2bd0b7a388f6db1dfc506da5ab98a8004752e3e737fa9585c9c226d99d56718c917f933889a06c89230e001bbb99cdf8a0337c8f312321f5f62
-  data.tar.gz: e2f56f3f2135515c5f647d74b89698963bc38d09214f77c3737f159b23f2fde30d90c71cea05df69ca973dd74031a8244f48c3170c3eb7b203b622de02ebe29f
+  metadata.gz: bc6b5df18d1846cde970fda6c3ba0f87f2a915aaec5d0873af41f891f62bd9b0cfbe837af36d8a2d246a1f53bcfa511febba0a6b4eab7647bea333bdd2b32025
+  data.tar.gz: 0de27b61c102f8e89828e60b9b3169de59056675b10d06017513e8943089563a571d98d4a9a5bd00284448f4902a570a4fcc8eaff6b068ea588eb17672645edd

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -18,10 +18,12 @@ module Api
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
         param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
+        param :disconnected, :bool, required: false, desc: N_('Generate the report, but do not upload')
         def generate_report
           organization_id = params[:organization_id]
+          disconnected = params[:disconnected]
 
-          start_report_generation(organization_id)
+          start_report_generation(organization_id, disconnected)
 
           render json: {
             action_status: 'success',

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -10,8 +10,8 @@ module InventoryUpload
       end
     end
 
-    def start_report_generation(organization_id)
-      ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id)
+    def start_report_generation(organization_id, disconnected)
+      ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id, disconnected)
     end
 
     def report_file(organization_id)

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -21,8 +21,9 @@ module ForemanInventoryUpload
 
     def generate
       organization_id = params[:organization_id]
+      disconnected = params[:disconnected]
 
-      start_report_generation(organization_id)
+      start_report_generation(organization_id, disconnected)
 
       render json: {
         action_status: 'success',

data/app/views/job_templates/cloud_connector.erb

@@ -30,6 +30,7 @@ feature: ansible_configure_cloud_connector
 
 ---
 - hosts: all
+  become: true
   vars:
     satellite_cloud_connector_url: "<%= foreman_server_url %>"
   roles:

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -32,8 +32,8 @@ module ForemanInventoryUpload
         Dynflow::Action::Rescue::Fail
       end
 
-      def plan_generate_report(folder, organization)
-        plan_action(ForemanInventoryUpload::Async::GenerateReportJob, folder, organization.id)
+      def plan_generate_report(folder, organization, disconnected)
+        plan_action(ForemanInventoryUpload::Async::GenerateReportJob, folder, organization.id, disconnected)
       end
 
       def logger

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -5,7 +5,7 @@ module ForemanInventoryUpload
         "report_for_#{label}"
       end
 
-      def plan(base_folder, organization_id)
+      def plan(base_folder, organization_id, disconnected)
         sequence do
           super(
             GenerateReportJob.output_label(organization_id),
@@ -17,7 +17,8 @@ module ForemanInventoryUpload
             QueueForUploadJob,
             base_folder,
             ForemanInventoryUpload.facts_archive_name(organization_id),
-            organization_id
+            organization_id,
+            disconnected
           )
         end
       end

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -1,9 +1,9 @@
 module ForemanInventoryUpload
   module Async
     class QueueForUploadJob < ::Actions::EntryAction
-      def plan(base_folder, report_file, organization_id)
+      def plan(base_folder, report_file, organization_id, disconnected)
         enqueue_task = plan_self(base_folder: base_folder, report_file: report_file)
-        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id)
+        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id) unless disconnected
       end
 
       def run

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '9.0.51'.freeze
+  VERSION = '9.0.53'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -12,7 +12,7 @@ namespace :rh_cloud_inventory do
 
       User.as_anonymous_admin do
         organizations.each do |organization|
-          ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization.id)
+          ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization.id, false)
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end
       end
@@ -47,7 +47,8 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id)
+      disconnected = false
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
       puts "Uploaded #{report_file}"
     end
   end

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

@@ -6,14 +6,15 @@ module InventoryUpload::Api
 
     setup do
       @test_org = FactoryBot.create(:organization)
+      @disconnected = false
     end
 
     test 'Starts report generation' do
       Api::V2::RhCloud::InventoryController.any_instance
         .expects(:start_report_generation)
-        .with(@test_org.id.to_s)
+        .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id }
+      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected}
 
       assert_response :success
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 9.0.51
+  version: 9.0.53
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -655,7 +655,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
@@ -670,8 +670,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: