foreman_rh_cloud 4.0.35 → 5.0.28

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/inventory_upload/report_actions.rb +1 -1
  3. data/app/controllers/foreman_inventory_upload/reports_controller.rb +1 -1
  4. data/app/models/setting/rh_cloud.rb +0 -1
  5. data/app/models/task_output_line.rb +2 -0
  6. data/app/models/task_output_status.rb +2 -0
  7. data/app/services/foreman_rh_cloud/cloud_ping_service.rb +1 -4
  8. data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb +1 -1
  9. data/config/package-lock.json.plugin +10551 -7500
  10. data/db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb +18 -0
  11. data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb +11 -7
  12. data/lib/foreman_inventory_upload/async/generate_report_job.rb +24 -12
  13. data/lib/foreman_inventory_upload/async/progress_output.rb +5 -28
  14. data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb +20 -5
  15. data/lib/foreman_inventory_upload/async/shell_process.rb +17 -4
  16. data/lib/foreman_inventory_upload/async/upload_report_job.rb +22 -13
  17. data/lib/foreman_inventory_upload/generators/fact_helpers.rb +1 -3
  18. data/lib/foreman_inventory_upload/generators/queries.rb +0 -1
  19. data/lib/foreman_inventory_upload/generators/tags.rb +1 -8
  20. data/lib/foreman_rh_cloud/engine.rb +12 -22
  21. data/lib/foreman_rh_cloud/version.rb +1 -1
  22. data/lib/insights_cloud/async/insights_scheduled_sync.rb +11 -7
  23. data/lib/inventory_sync/async/host_result.rb +5 -0
  24. data/lib/inventory_sync/async/inventory_full_sync.rb +9 -14
  25. data/lib/inventory_sync/async/inventory_hosts_sync.rb +6 -2
  26. data/lib/tasks/rh_cloud_inventory.rake +2 -2
  27. data/package.json +7 -12
  28. data/test/controllers/inventory_upload/cloud_status_controller_test.rb +0 -2
  29. data/test/jobs/inventory_full_sync_test.rb +2 -28
  30. data/test/jobs/inventory_hosts_sync_test.rb +0 -15
  31. data/test/jobs/upload_report_job_test.rb +5 -3
  32. data/test/unit/fact_helpers_test.rb +2 -2
  33. data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb +0 -19
  34. data/test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb +0 -4
  35. data/test/unit/shell_process_job_test.rb +3 -1
  36. data/test/unit/slice_generator_test.rb +0 -12
  37. data/test/unit/tags_generator_test.rb +0 -15
  38. data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss +8 -0
  39. data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss +17 -4
  40. data/webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js +29 -17
  41. data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap +58 -47
  42. data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js +1 -1
  43. data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js +12 -10
  44. data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap +10 -10
  45. data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap +1 -1
  46. data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap +4 -1
  47. data/webpack/InsightsCloudSync/Components/__tests__/__snapshots__/NoTokenEmptyState.test.js.snap +24 -13
  48. data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap +1 -1
  49. data/webpack/__mocks__/foremanReact/components/Head.js +11 -0
  50. data/webpack/common/Switcher/__tests__/__snapshots__/SwitcherPF4.test.js.snap +1 -0
  51. metadata +6 -3
  52. data/config/package-lock.json +0 -41822
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 13d501dcd7ec95a0fc10ed4bd7b0a426e3f485aa3dd7ba597e56dbfd41268977
4
- data.tar.gz: 6c392f1ad04344c887609894b64dac3bbd6add5c4a70cbf4ae1598c2851ac581
3
+ metadata.gz: 012fcceed18a6413326df32052bee870b299682bc114d5c3e59954bda33b2475
4
+ data.tar.gz: bb72b384fc54d6c19951c453c69b0ecaae5d26bf844fc85b4d4b56f04e1e76bd
5
5
  SHA512:
6
- metadata.gz: c5bbe88508a4df1017b05d6dd13adb432040dbad271bc317abc10169decd43f1ab785dfc9733f3c8e4d5f6116ffa46252ace5996a5e133c2c48954da71679464
7
- data.tar.gz: 448308053649ce5001aeb40b53f546a52c92a5a84c870d1bbda392655f579c0f16df61c53da16f58101708fdac855813c5f1adeb2039cf2c6a0f2ea1b4c6f709
6
+ metadata.gz: 70904b446fce3a2ca3a794c418aaa1591f4276bd35d1636a629e7361b75c62163fc76ad45caa024752a763ef6a9e6344e979dff8f9e9a017c19ac878f667a649
7
+ data.tar.gz: 4fd0e25610e4848565178f19e5a3ffb1da2d9b1505cd604f18a9276bba931f6fea3fbbddcd6c1e375a9d655a4c0b506c3937d89e9e7899b4aed37ae05c72b542
@@ -11,7 +11,7 @@ module InventoryUpload
11
11
  end
12
12
 
13
13
  def start_report_generation(organization_id)
14
- ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
14
+ ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id)
15
15
  end
16
16
 
17
17
  def report_file(organization_id)
@@ -7,7 +7,7 @@ module ForemanInventoryUpload
7
7
  def last
8
8
  label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
9
9
  output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
10
- task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.singleton_job_name
10
+ task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.name
11
11
  scheduled = ForemanTasks::Task.where(
12
12
  :label => task_label,
13
13
  :state => 'scheduled'
@@ -12,7 +12,6 @@ class Setting::RhCloud < Setting
12
12
  end
13
13
 
14
14
  def self.default_settings
15
- return unless ActiveRecord::Base.connection.table_exists?('settings')
16
15
  [
17
16
  set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
18
17
  set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),
@@ -0,0 +1,2 @@
1
+ class TaskOutputLine < ApplicationRecord
2
+ end
@@ -0,0 +1,2 @@
1
+ class TaskOutputStatus < ApplicationRecord
2
+ end
@@ -39,9 +39,6 @@ module ForemanRhCloud
39
39
  certs = candlepin_id_cert(@org)
40
40
  return StandardError.new('certificate missing') unless certs
41
41
 
42
- cert_checker = Katello::UpstreamConnectionChecker.new(@org)
43
- cert_checker.assert_connection
44
-
45
42
  execute_cloud_request(
46
43
  method: :get,
47
44
  url: ForemanRhCloud.cert_base_url + "/api/apicast-tests/ping",
@@ -75,7 +72,7 @@ module ForemanRhCloud
75
72
  org,
76
73
  {
77
74
  success: cert_response.is_a?(RestClient::Response),
78
- error: (cert_response.is_a?(Exception) ? cert_response&.message || cert_response.inspect : nil),
75
+ error: (cert_response.is_a?(Exception) ? cert_response.inspect : nil),
79
76
  },
80
77
  ]
81
78
  end
@@ -28,7 +28,7 @@ module ForemanRhCloud
28
28
  headers: {
29
29
  params: forward_params,
30
30
  user_agent: http_user_agent(original_request),
31
- content_type: original_request.media_type.presence || original_request.format.to_s,
31
+ content_type: original_request.media_type,
32
32
  },
33
33
  }
34
34
  base_params.merge(path_params(original_request.path, certs))