foreman_rh_cloud 9.0.55 → 10.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/foreman_rh_cloud/locale/en/foreman_rh_cloud.js +3 -0
  3. data/app/assets/javascripts/foreman_rh_cloud/locale/fr/foreman_rh_cloud.js +3 -0
  4. data/app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js +3 -0
  5. data/app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js +3 -0
  6. data/app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js +3 -0
  7. data/app/controllers/api/v2/rh_cloud/inventory_controller.rb +2 -2
  8. data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb +1 -1
  9. data/config/routes.rb +1 -1
  10. data/db/seeds.d/179_ui_notifications.rb +0 -1
  11. data/db/seeds.d/50_job_templates.rb +4 -4
  12. data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb +2 -1
  13. data/lib/foreman_inventory_upload/generators/fact_helpers.rb +1 -1
  14. data/lib/foreman_inventory_upload/generators/slice.rb +0 -1
  15. data/lib/foreman_inventory_upload.rb +1 -1
  16. data/lib/foreman_rh_cloud/version.rb +1 -1
  17. data/lib/insights_cloud/async/insights_resolutions_sync.rb +7 -1
  18. data/lib/inventory_sync/async/inventory_hosts_sync.rb +1 -1
  19. data/lib/tasks/hybrid_cloud.rake +5 -5
  20. data/lib/tasks/insights.rake +4 -3
  21. data/lib/tasks/rh_cloud_inventory.rake +5 -5
  22. data/locale/en/foreman_rh_cloud.po +3 -0
  23. data/locale/foreman_rh_cloud.pot +6 -2
  24. data/locale/fr/foreman_rh_cloud.po +3 -0
  25. data/locale/ja/foreman_rh_cloud.po +3 -0
  26. data/locale/ka/foreman_rh_cloud.po +3 -0
  27. data/locale/zh_CN/foreman_rh_cloud.po +3 -0
  28. data/package.json +1 -1
  29. data/test/jobs/inventory_hosts_sync_test.rb +53 -5
  30. data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb +4 -5
  31. data/test/unit/slice_generator_test.rb +1 -1
  32. metadata +18 -44
  33. data/config/Gemfile.lock.gh_test +0 -879
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e63267cff67596355989b7c79e8d84105df6ebc9a8779704f414e3e046ec1902
4
- data.tar.gz: 834bca7a10443cf868a1247dc4d10dd564024dfe69fd9460eba644629cf195d6
3
+ metadata.gz: 0ff94b0740c89b0b945f90e7feba658b30341a7f8bb5c1fd2e59cdfc68d05969
4
+ data.tar.gz: b25c4f29a021b554b425d6d464971aed419e3021736730b696710c10e9804670
5
5
  SHA512:
6
- metadata.gz: 731740c7cb108304f2dadfc5b76a75d9bab9cb6a6cddb2608e2b15ce265885409d96e41c51e2eea06da22dd614a40a56485cf945d05d79da6fb616fd3e407b8d
7
- data.tar.gz: 2747d5cef2268291356e675b493b40bc3fb95a8b309750242b42179445ef875bead8068ece9bcfb2fb687208f5c30babc6a1b9438cc9c5870615d602774f4769
6
+ metadata.gz: 6c4b8398e71971b211bb7eb5a76f3d4acd2a274eb69cd9c6f33c8961e0824c8f9da3a34e7ae72c438ab9ddc5042f9a4e3aee53bf24c5ad07ce617b3bdba83eee
7
+ data.tar.gz: a0f2b3d8d0b1ddf1c0bccd5eeef2c818d8f81bf1a05eaa5e9f0a9bacd70368381d362343f5bc454023b258c238127664f4aaac709fe40feae03ae8b400f80f0c
@@ -491,6 +491,9 @@
491
491
  "The server returned the following error: %s": [
492
492
  ""
493
493
  ],
494
+ "There are no recommendations for your hosts": [
495
+ ""
496
+ ],
494
497
  "Foreman plugin that process & upload data to Red Hat Cloud": [
495
498
  ""
496
499
  ]
@@ -491,6 +491,9 @@
491
491
  "The server returned the following error: %s": [
492
492
  "Le serveur a renvoyé l'erreur suivante : %s"
493
493
  ],
494
+ "There are no recommendations for your hosts": [
495
+ ""
496
+ ],
494
497
  "Foreman plugin that process & upload data to Red Hat Cloud": [
495
498
  "Plugin Foreman qui traite et télécharge les données vers Red Hat Cloud"
496
499
  ]
@@ -491,6 +491,9 @@
491
491
  "The server returned the following error: %s": [
492
492
  "サーバーは以下のエラーを返しました: %s"
493
493
  ],
494
+ "There are no recommendations for your hosts": [
495
+ ""
496
+ ],
494
497
  "Foreman plugin that process & upload data to Red Hat Cloud": [
495
498
  "データを処理して Red Hat Cloud にアップロードする Foreman プラグイン"
496
499
  ]
@@ -491,6 +491,9 @@
491
491
  "The server returned the following error: %s": [
492
492
  "სერვერმა შემდეგი შეცდომა დააბრუნა: %ს"
493
493
  ],
494
+ "There are no recommendations for your hosts": [
495
+ ""
496
+ ],
494
497
  "Foreman plugin that process & upload data to Red Hat Cloud": [
495
498
  "Foreman-ის დამატება, რომელიც მონაცემების დამუშავებაზე და Red Hat Cloud-ში ატვირთვაზე აგებს პასუხს"
496
499
  ]
@@ -491,6 +491,9 @@
491
491
  "The server returned the following error: %s": [
492
492
  "服务器返回以下错误:%s"
493
493
  ],
494
+ "There are no recommendations for your hosts": [
495
+ ""
496
+ ],
494
497
  "Foreman plugin that process & upload data to Red Hat Cloud": [
495
498
  "处理数据并将其上传到红帽云的 Foreman 插件"
496
499
  ]
@@ -18,10 +18,10 @@ module Api
18
18
 
19
19
  api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
20
20
  param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
21
- param :disconnected, :bool, required: false, desc: N_('Generate the report, but do not upload')
21
+ param :disconnected, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
22
22
  def generate_report
23
23
  organization_id = params[:organization_id]
24
- disconnected = params[:disconnected]
24
+ disconnected = params[:disconnected] || false
25
25
 
26
26
  start_report_generation(organization_id, disconnected)
27
27
 
@@ -38,7 +38,7 @@ module ForemanRhCloud
38
38
  def prepare_forward_payload(original_request, controller_name)
39
39
  forward_payload = original_request.request_parameters[controller_name]
40
40
 
41
- forward_payload = original_request.raw_post.clone if original_request.post? && original_request.raw_post
41
+ forward_payload = original_request.raw_post.clone if (original_request.post? || original_request.patch?) && original_request.raw_post
42
42
  forward_payload = original_request.body.read if original_request.put?
43
43
 
44
44
  forward_payload = original_request.params.slice(:file, :metadata) if original_request.params[:file]
data/config/routes.rb CHANGED
@@ -41,7 +41,7 @@ Rails.application.routes.draw do
41
41
  end
42
42
 
43
43
  scope '/r/insights' do
44
- match '(/*path)(/)', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
44
+ match '(/*path)(/)', constraints: ->(req) { !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete, :put, :patch]
45
45
  end
46
46
  end
47
47
 
@@ -8,4 +8,3 @@ blueprints = [
8
8
  ]
9
9
 
10
10
  blueprints.each { |blueprint| UINotifications::Seed.new(blueprint).configure }
11
-
@@ -4,11 +4,11 @@ User.as_anonymous_admin do
4
4
  JobTemplate.without_auditing do
5
5
  Dir[File.join("#{ForemanRhCloud::Engine.root}/app/views/job_templates/**/*.erb")].each do |template|
6
6
  template = JobTemplate.import_raw!(File.read(template),
7
- :default => true,
8
- :lock => true,
9
- :update => true)
7
+ :default => true,
8
+ :lock => true,
9
+ :update => true)
10
10
  template.organizations = organizations if template.present?
11
11
  template.locations = locations if template.present?
12
12
  end
13
13
  end
14
- end
14
+ end
@@ -20,7 +20,8 @@ module ForemanInventoryUpload
20
20
  total_hosts = ForemanInventoryUpload::Generators::Queries.for_org(organization.id, use_batches: false).count
21
21
 
22
22
  if total_hosts <= ForemanInventoryUpload.max_org_size
23
- plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization)
23
+ disconnected = false
24
+ plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization, disconnected)
24
25
  else
25
26
  logger.info("Skipping automatic uploads for organization #{organization.name}, too many hosts (#{total_hosts}/#{ForemanInventoryUpload.max_org_size})")
26
27
  end
@@ -6,7 +6,7 @@ module ForemanInventoryUpload
6
6
  extend ActiveSupport::Concern
7
7
 
8
8
  CLOUD_AMAZON = 'aws'
9
- CLOUD_GOOGLE = 'google'
9
+ CLOUD_GOOGLE = 'gcp'
10
10
  CLOUD_AZURE = 'azure'
11
11
  CLOUD_ALIBABA = 'alibaba'
12
12
 
@@ -126,7 +126,6 @@ module ForemanInventoryUpload
126
126
  ) { |v| os_release_value(*v) }
127
127
  @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
128
128
  @stream.simple_field('arch', host.architecture&.name)
129
- @stream.simple_field('subscription_status', host.subscription_status_label)
130
129
  @stream.simple_field('katello_agent_running', false)
131
130
  @stream.simple_field(
132
131
  'infrastructure_type',
@@ -75,7 +75,7 @@ module ForemanInventoryUpload
75
75
  end
76
76
 
77
77
  def self.inventory_export_url
78
- tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
78
+ tags = CGI.escape("satellite/satellite_instance_id=#{Foreman.instance_id}")
79
79
  inventory_base_url + "?tags=#{tags}"
80
80
  end
81
81
 
@@ -1,3 +1,3 @@
1
1
  module ForemanRhCloud
2
- VERSION = '9.0.55'.freeze
2
+ VERSION = '10.0.1'.freeze
3
3
  end
@@ -60,7 +60,13 @@ module InsightsCloud
60
60
 
61
61
  def write_resolutions(response)
62
62
  all_resolutions = response.map do |rule_id, rule_details|
63
- rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
63
+ if rule_details
64
+ rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
65
+ else
66
+ logger.info("Rules response: #{rule_id} #{rule_details}")
67
+ logger.debug("Response: #{response}\n Failed id #{rule_id}")
68
+ []
69
+ end
64
70
  end.flatten
65
71
 
66
72
  InsightsResolution.create(all_resolutions)
@@ -68,7 +68,7 @@ module InventorySync
68
68
 
69
69
  def to_ip_address_string(ip_addresses)
70
70
  string_size = 0
71
- ip_addresses.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
71
+ ip_addresses&.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
72
72
  end
73
73
 
74
74
  def plan_self_host_sync
@@ -7,7 +7,7 @@ namespace :rh_cloud do |args|
7
7
  task hybridcloud_register: [:environment] do
8
8
  include ::ForemanRhCloud::CertAuth
9
9
  include ::InsightsCloud::CandlepinCache
10
-
10
+
11
11
  def logger
12
12
  @logger ||= Logger.new(STDOUT)
13
13
  end
@@ -21,7 +21,7 @@ namespace :rh_cloud do |args|
21
21
  logger.error('ERROR: org_id needs to be specified.')
22
22
  exit(1)
23
23
  end
24
-
24
+
25
25
  @organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
26
26
  @uid = cp_owner_id(@organization)
27
27
  @hostname = ForemanRhCloud.foreman_host_name
@@ -33,14 +33,14 @@ namespace :rh_cloud do |args|
33
33
 
34
34
  def headers
35
35
  {
36
- Authorization: "Bearer #{@token}"
36
+ Authorization: "Bearer #{@token}",
37
37
  }
38
38
  end
39
39
 
40
40
  def payload
41
41
  {
42
42
  "uid": @uid,
43
- "display_name": "#{@hostname}+#{@organization.label}"
43
+ "display_name": "#{@hostname}+#{@organization.label}",
44
44
  }
45
45
  end
46
46
 
@@ -57,7 +57,7 @@ namespace :rh_cloud do |args|
57
57
  payload: payload.to_json
58
58
  )
59
59
  logger.debug(response)
60
- rescue Exception => ex
60
+ rescue StandardError => ex
61
61
  logger.error(ex)
62
62
  end
63
63
  end
@@ -15,9 +15,10 @@ namespace :rh_cloud_insights do
15
15
  end
16
16
 
17
17
  cleaner = ForemanRhCloud::InsightsStatusCleaner.new
18
- deleted_count = cleaner.clean(hosts_search)
19
-
20
- puts "Deleted #{deleted_count} insights statuses"
18
+ User.as_anonymous_admin do
19
+ deleted_count = cleaner.clean(hosts_search)
20
+ puts "Deleted #{deleted_count} insights statuses"
21
+ end
21
22
  end
22
23
 
23
24
  desc "Re-announce all organizations into Sources on RH cloud."
@@ -4,10 +4,10 @@ namespace :rh_cloud_inventory do
4
4
  namespace :report do
5
5
  desc 'Generate inventory report and send it to Red Hat cloud'
6
6
  task generate_upload: [:environment, 'dynflow:client'] do
7
- unless ENV['organization_id'].nil?
8
- organizations = [ Organization.where(:id => ENV['organization_id']).first ]
9
- else
7
+ if ENV['organization_id'].nil?
10
8
  organizations = Organization.unscoped.all
9
+ else
10
+ organizations = [Organization.where(:id => ENV['organization_id']).first]
11
11
  end
12
12
 
13
13
  User.as_anonymous_admin do
@@ -55,8 +55,8 @@ namespace :rh_cloud_inventory do
55
55
 
56
56
  desc "Synchronize Hosts inventory"
57
57
  task sync: [:environment, 'dynflow:client'] do
58
- if ! ENV['organization_id'].nil?
59
- organizations = [ Organization.where(:id => ENV['organization_id']).first ]
58
+ if !ENV['organization_id'].nil?
59
+ organizations = [Organization.where(:id => ENV['organization_id']).first]
60
60
  else
61
61
  organizations = Organization.all
62
62
  end
@@ -444,6 +444,9 @@ msgstr ""
444
444
  msgid "The task failed with the following error:"
445
445
  msgstr ""
446
446
 
447
+ msgid "There are no recommendations for your hosts"
448
+ msgstr ""
449
+
447
450
  msgid "This action will also enable automatic reports upload"
448
451
  msgstr ""
449
452
 
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: foreman_rh_cloud 1.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2023-11-29 00:27+0100\n"
12
- "PO-Revision-Date: 2023-11-29 00:27+0100\n"
11
+ "POT-Creation-Date: 2024-03-05 20:08+0100\n"
12
+ "PO-Revision-Date: 2024-03-05 20:08+0100\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -799,6 +799,10 @@ msgstr ""
799
799
  msgid "The server returned the following error: %s"
800
800
  msgstr ""
801
801
 
802
+ #: ../webpack/common/table/EmptyState.js:44
803
+ msgid "There are no recommendations for your hosts"
804
+ msgstr ""
805
+
802
806
  #: gemspec.rb:2
803
807
  msgid "Foreman plugin that process & upload data to Red Hat Cloud"
804
808
  msgstr ""
@@ -456,6 +456,9 @@ msgstr "Le serveur a renvoyé l'erreur suivante : %s"
456
456
  msgid "The task failed with the following error:"
457
457
  msgstr "La tâche a échoué avec l'erreur suivante :"
458
458
 
459
+ msgid "There are no recommendations for your hosts"
460
+ msgstr ""
461
+
459
462
  msgid "This action will also enable automatic reports upload"
460
463
  msgstr "Cette action permettra également le téléchargement automatique des rapports"
461
464
 
@@ -449,6 +449,9 @@ msgstr "サーバーは以下のエラーを返しました: %s"
449
449
  msgid "The task failed with the following error:"
450
450
  msgstr "タスクは以下のエラーで失敗しました: "
451
451
 
452
+ msgid "There are no recommendations for your hosts"
453
+ msgstr ""
454
+
452
455
  msgid "This action will also enable automatic reports upload"
453
456
  msgstr "このアクションを実行すると、自動レポートのアップロードも有効になります。"
454
457
 
@@ -448,6 +448,9 @@ msgstr "სერვერმა შემდეგი შეცდომა დ
448
448
  msgid "The task failed with the following error:"
449
449
  msgstr "დავალება შემდეგი შეცდომით დასრულდა:"
450
450
 
451
+ msgid "There are no recommendations for your hosts"
452
+ msgstr ""
453
+
451
454
  msgid "This action will also enable automatic reports upload"
452
455
  msgstr "ეს ქმედება ავტომატურად ანგარიშების ატვირთვასაც ჩართავს"
453
456
 
@@ -454,6 +454,9 @@ msgstr "服务器返回以下错误:%s"
454
454
  msgid "The task failed with the following error:"
455
455
  msgstr "任务失败,错误为:"
456
456
 
457
+ msgid "There are no recommendations for your hosts"
458
+ msgstr ""
459
+
457
460
  msgid "This action will also enable automatic reports upload"
458
461
  msgstr "此操作还会启用自动报告上传"
459
462
 
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_rh_cloud",
3
- "version": "9.0.51",
3
+ "version": "10.0.1",
4
4
  "description": "Inventory Upload =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -44,11 +44,59 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
44
44
 
45
45
  inventory_json = <<-INVENTORY_JSON
46
46
  {
47
- "total": 3,
48
- "count": 3,
47
+ "total": 4,
48
+ "count": 4,
49
49
  "page": 1,
50
- "per_page": 3,
50
+ "per_page": 4,
51
51
  "results": [
52
+ {
53
+ "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f39",
54
+ "rhel_machine_id": null,
55
+ "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1c",
56
+ "satellite_id": "bb72bf95-0a19-4090-8009-f0d8c68aca61",
57
+ "bios_uuid": "b48a7e5f-cb50-4029-a75e-366bf43db642",
58
+ "fqdn": "rhel81-demo.oss-lab.net",
59
+ "mac_addresses": [
60
+ "52:54:00:aa:12:12",
61
+ "00:00:00:00:00:00"
62
+ ],
63
+ "external_id": null,
64
+ "id": "59ab38db-c25b-4fc7-bfb2-c8eb01d865a4",
65
+ "account": "1460290",
66
+ "display_name": "insights-rh71.example.com",
67
+ "ansible_host": null,
68
+ "facts": [
69
+ {
70
+ "namespace": "satellite",
71
+ "facts": {
72
+ "virtual_host_name": "virt-who-nobody.home-1",
73
+ "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
74
+ "is_simple_content_access": false,
75
+ "distribution_version": "7.3",
76
+ "satellite_version": "6.8.4",
77
+ "organization_id": 1,
78
+ "is_hostname_obfuscated": false,
79
+ "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
80
+ }
81
+ },
82
+ {
83
+ "namespace": "yupana",
84
+ "facts": {
85
+ "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
86
+ "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
87
+ "source": "Satellite",
88
+ "yupana_host_id": "e85958b6-58db-4cfd-aeb6-01ee81bc0f43",
89
+ "account": "1460290"
90
+ }
91
+ }
92
+ ],
93
+ "reporter": "puptoo",
94
+ "stale_timestamp": "2021-03-19T07:57:42.466399+00:00",
95
+ "stale_warning_timestamp": "2021-03-26T07:57:42.466399+00:00",
96
+ "culled_timestamp": "2021-04-02T07:57:42.466399+00:00",
97
+ "created": "2021-02-08T14:36:03.613880+00:00",
98
+ "updated": "2021-03-18T02:57:42.535250+00:00"
99
+ },
52
100
  {
53
101
  "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f36",
54
102
  "rhel_machine_id": null,
@@ -307,7 +355,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
307
355
 
308
356
  ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
309
357
 
310
- assert_equal 2, InsightsMissingHost.count
358
+ assert_equal 3, InsightsMissingHost.count
311
359
  end
312
360
 
313
361
  test 'Inventory should remove old missing host records' do
@@ -324,6 +372,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
324
372
 
325
373
  ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
326
374
 
327
- assert_equal 2, InsightsMissingHost.count
375
+ assert_equal 3, InsightsMissingHost.count
328
376
  end
329
377
  end
@@ -65,16 +65,15 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
65
65
  end
66
66
 
67
67
  test 'should forward patch payload' do
68
- params = { 'pumpkin' => 'pie' }
68
+ post_data = 'Random PATCH data'
69
69
  req = ActionDispatch::Request.new(
70
70
  'REQUEST_URI' => '/foo/bar?baz=awesome',
71
71
  'REQUEST_METHOD' => 'PATCH',
72
72
  'rack.input' => ::Puma::NullIO.new,
73
- 'RAW_POST_DATA' => 'Random PATCH data',
74
- "action_dispatch.request.path_parameters" => { :format => "json" },
75
- "action_dispatch.request.request_parameters" => { 'vegetables' => params }
73
+ 'RAW_POST_DATA' => post_data,
74
+ "action_dispatch.request.path_parameters" => { :format => "json" }
76
75
  )
77
- assert_equal params.to_json, @forwarder.prepare_forward_payload(req, 'vegetables')
76
+ assert_equal post_data, @forwarder.prepare_forward_payload(req, 'Random PATCH data')
78
77
  end
79
78
 
80
79
  test 'should forward file with metadata' do
@@ -594,7 +594,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
594
594
  assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
595
595
  assert_not_nil(actual_host = actual['hosts'].first)
596
596
  assert_not_nil(actual_profile = actual_host['system_profile'])
597
- assert_equal 'google', actual_profile['cloud_provider']
597
+ assert_equal 'gcp', actual_profile['cloud_provider']
598
598
  end
599
599
 
600
600
  test 'Identifies Azure cloud provider' do
metadata CHANGED
@@ -1,29 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_rh_cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.0.55
4
+ version: 10.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Red Hat Cloud team
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-15 00:00:00.000000000 Z
11
+ date: 2024-06-21 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: katello
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ">="
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: foreman_ansible
29
15
  requirement: !ruby/object:Gem::Requirement
@@ -53,27 +39,13 @@ dependencies:
53
39
  - !ruby/object:Gem::Version
54
40
  version: '0'
55
41
  - !ruby/object:Gem::Dependency
56
- name: rdoc
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ">="
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
- - !ruby/object:Gem::Dependency
70
- name: rubocop
42
+ name: katello
71
43
  requirement: !ruby/object:Gem::Requirement
72
44
  requirements:
73
45
  - - ">="
74
46
  - !ruby/object:Gem::Version
75
47
  version: '0'
76
- type: :development
48
+ type: :runtime
77
49
  prerelease: false
78
50
  version_requirements: !ruby/object:Gem::Requirement
79
51
  requirements:
@@ -81,7 +53,7 @@ dependencies:
81
53
  - !ruby/object:Gem::Version
82
54
  version: '0'
83
55
  - !ruby/object:Gem::Dependency
84
- name: rubocop-performance
56
+ name: rdoc
85
57
  requirement: !ruby/object:Gem::Requirement
86
58
  requirements:
87
59
  - - ">="
@@ -95,19 +67,19 @@ dependencies:
95
67
  - !ruby/object:Gem::Version
96
68
  version: '0'
97
69
  - !ruby/object:Gem::Dependency
98
- name: rubocop-rails
70
+ name: theforeman-rubocop
99
71
  requirement: !ruby/object:Gem::Requirement
100
72
  requirements:
101
- - - ">="
73
+ - - "~>"
102
74
  - !ruby/object:Gem::Version
103
- version: '0'
75
+ version: 0.0.6
104
76
  type: :development
105
77
  prerelease: false
106
78
  version_requirements: !ruby/object:Gem::Requirement
107
79
  requirements:
108
- - - ">="
80
+ - - "~>"
109
81
  - !ruby/object:Gem::Version
110
- version: '0'
82
+ version: 0.0.6
111
83
  description: Foreman plugin that process & upload data to Red Hat Cloud
112
84
  email:
113
85
  - rlavi@redhat.com, sshtein@redhat.com
@@ -171,7 +143,6 @@ files:
171
143
  - app/views/job_templates/rh_cloud_download_playbook.erb
172
144
  - app/views/job_templates/rh_cloud_remediations.erb
173
145
  - app/views/layouts/foreman_rh_cloud/application.html.erb
174
- - config/Gemfile.lock.gh_test
175
146
  - config/database.yml.example
176
147
  - config/package-lock.json.plugin
177
148
  - config/rh_cert-api_chain.pem
@@ -668,7 +639,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
668
639
  licenses:
669
640
  - GPL-3.0
670
641
  metadata: {}
671
- post_install_message:
642
+ post_install_message:
672
643
  rdoc_options: []
673
644
  require_paths:
674
645
  - lib
@@ -676,15 +647,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
676
647
  requirements:
677
648
  - - ">="
678
649
  - !ruby/object:Gem::Version
679
- version: '0'
650
+ version: '2.7'
651
+ - - "<"
652
+ - !ruby/object:Gem::Version
653
+ version: '4'
680
654
  required_rubygems_version: !ruby/object:Gem::Requirement
681
655
  requirements:
682
656
  - - ">="
683
657
  - !ruby/object:Gem::Version
684
658
  version: '0'
685
659
  requirements: []
686
- rubygems_version: 3.1.6
687
- signing_key:
660
+ rubygems_version: 3.2.33
661
+ signing_key:
688
662
  specification_version: 4
689
663
  summary: Summary of ForemanRhCloud.
690
664
  test_files: