foreman_rh_cloud 8.0.49 → 8.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cedd47c0a845f1b043329ed3c2487bb781d7807667e8c1608c0f7204f0734ff
-  data.tar.gz: 3ac8c4184db82abea338841e9783181acfdb5c75dd9ee2bca4bf2dcc401ef5a0
+  metadata.gz: 4a8832ac6130f0c9d6d03f01c4da75144968f1c56670ab64634dc0f25f4ba5e2
+  data.tar.gz: 1e7e672a81f2ecd51a1514a1035b91e7b686d02efd340dba05b65d0a3064d54d
 SHA512:
-  metadata.gz: b5e70d7b496792133a6d32ae8daeb2016b884eed3167936f0bd60e45146a36ee57201f61136c8440d4a992b7a7e7cc60a0cfca8ae9f703431ebc0f58fb44507a
-  data.tar.gz: 15c2c3df4d42ba65f84aabcb5875534a3e07f5dd1e684ed21574c5d5103639ee9fda51e62f45c53b52ffba92ca9e16b04a1eb3b40894c850921e78fc0e959ef3
+  metadata.gz: 7e5c3bb073a864906194caaab77a77f01389e1d0a702c12f429fb6277457e412f89a4fb30e79963236388a1347897c1e611f1cc14a68bb580b8427df3838b42e
+  data.tar.gz: 7cf5d53689a2b8b396a4bb7d72ffb87dd29d35d5e60c8b4b222708a72f9900aaac7180cae53dc82c1ed7b0ceba5293ec831cb69312281cc9c4bbae06d27f4e31

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '8.0.49'.freeze
+  VERSION = '8.0.51'.freeze
 end

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -144,7 +144,7 @@ module InsightsCloud
         {
           'state' => host_task.state,
           'output' => host_task.main_action.live_output.map { |line| line['output'] }.join("\n"),
-          'exit_status' => host_task.main_action.exit_status,
+          'exit_status' => ActiveModel::Type::Integer.new.cast(host_task.main_action.exit_status),
           'sequence' => sequence(host_name),
           'report_done' => host_done?(host_name),
         }

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -19,7 +19,7 @@ module InventorySync
             Organization.unscoped.each do |org|
               sequence do
                 plan_org_sync(org)
-                plan_remove_insights_hosts(org) if Setting[:allow_auto_insights_mismatch_delete]
+                plan_remove_insights_hosts(org.id) if Setting[:allow_auto_insights_mismatch_delete]
               end
             end
           end
@@ -30,9 +30,9 @@ module InventorySync
         plan_action InventoryFullSync, org
       end
 
-      def plan_remove_insights_hosts
+      def plan_remove_insights_hosts(org_id)
         # plan a remove hosts action with search set to empty (all records)
-        plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', org.id)
+        plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', org_id)
       end
 
       def logger

data/package.json

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

data/test/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -43,6 +43,10 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     assert_not_nil actual_report
     actual_jsonl = read_jsonl(actual_report)
 
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
+
     assert_equal true, @job_invocation.finished?
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
 
@@ -85,6 +89,9 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     actual_json1 = read_jsonl(actual_report1)
     actual_json2 = read_jsonl(actual_report2)
 
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
 
     assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
@@ -149,6 +156,9 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     actual_json2 = read_jsonl(actual_report2)
     actual_json3 = read_jsonl(actual_report3)
 
+    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+
     assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
     assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']
     assert_equal 'TEST_UUID1', actual_report_updated['host']
@@ -263,7 +273,7 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
       { 'timestamp' => (Time.now - (5 - i)).to_f, 'output' => "#{i}\n" }
     end
     Support::DummyDynflowAction.any_instance.stubs(:live_output).returns(fake_output)
-    Support::DummyDynflowAction.any_instance.stubs(:exit_status).returns(0)
+    Support::DummyDynflowAction.any_instance.stubs(:exit_status).returns("0")
 
     job_invocation
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 8.0.49
+  version: 8.0.51
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello