foreman_rh_cloud 8.0.51 → 8.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8832ac6130f0c9d6d03f01c4da75144968f1c56670ab64634dc0f25f4ba5e2
-  data.tar.gz: 1e7e672a81f2ecd51a1514a1035b91e7b686d02efd340dba05b65d0a3064d54d
+  metadata.gz: c1d1f1eec1e7f83d5fea8b52102c9966fd8429dd01368150b5c4448ea9d5cb92
+  data.tar.gz: 3ecdf1a64c836187cafca7c27b9fba8cef99bb7094f3d09e2dfd085295b8f18e
 SHA512:
-  metadata.gz: 7e5c3bb073a864906194caaab77a77f01389e1d0a702c12f429fb6277457e412f89a4fb30e79963236388a1347897c1e611f1cc14a68bb580b8427df3838b42e
-  data.tar.gz: 7cf5d53689a2b8b396a4bb7d72ffb87dd29d35d5e60c8b4b222708a72f9900aaac7180cae53dc82c1ed7b0ceba5293ec831cb69312281cc9c4bbae06d27f4e31
+  metadata.gz: dd8dd41fd2ffbb9f66b075e4dbe73e64f9439dedc08974d73851f6a37262ff26b87fb376df6f8ce5817ee9e90bb185185805b3e5f1bd9f63120919a962794a9f
+  data.tar.gz: 4ea0b00bd56be43485483107665dd9fab550dd362fc9e4784732b8174aed5f23527816ee320c7bf00b244f22601c60acf1386791c94909a301ff55cf250d9127

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/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 = '8.0.51'.freeze
+  VERSION = '8.0.52'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -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/package.json

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

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: 8.0.51
+  version: 8.0.52
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello