foreman_rh_cloud 9.0.57 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63684c35a1618be19a8a593c01271deda04e42afce5bb29b604b9af5bc6bba32
-  data.tar.gz: 7e431b41e130d528a4528fbcba7c4aef6efb1c44228c43691c1cad8a58afb690
+  metadata.gz: 0ff94b0740c89b0b945f90e7feba658b30341a7f8bb5c1fd2e59cdfc68d05969
+  data.tar.gz: b25c4f29a021b554b425d6d464971aed419e3021736730b696710c10e9804670
 SHA512:
-  metadata.gz: 19c9d15f55a75ef46d56b0b45e1058472afb6d69a8ce496730d5154d563c07f95ce52e099b0ab95115c0c3833b5b030c34d76cdbe78035d336deec6b84357432
-  data.tar.gz: d4e1e3ea2f38b898a527e05ce841f5f9d981fdb685a5dd706734e02b1f79baeb57f031e67ca20a34f4c492da18dafc0e138acc05b38bbaee61164f548e1962b7
+  metadata.gz: 6c4b8398e71971b211bb7eb5a76f3d4acd2a274eb69cd9c6f33c8961e0824c8f9da3a34e7ae72c438ab9ddc5042f9a4e3aee53bf24c5ad07ce617b3bdba83eee
+  data.tar.gz: a0f2b3d8d0b1ddf1c0bccd5eeef2c818d8f81bf1a05eaa5e9f0a9bacd70368381d362343f5bc454023b258c238127664f4aaac709fe40feae03ae8b400f80f0c

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -38,7 +38,7 @@ module ForemanRhCloud
     def prepare_forward_payload(original_request, controller_name)
       forward_payload = original_request.request_parameters[controller_name]
 
-      forward_payload = original_request.raw_post.clone if original_request.post? && original_request.raw_post
+      forward_payload = original_request.raw_post.clone if (original_request.post? || original_request.patch?) && original_request.raw_post
       forward_payload = original_request.body.read if original_request.put?
 
       forward_payload = original_request.params.slice(:file, :metadata) if original_request.params[:file]

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
       extend ActiveSupport::Concern
 
       CLOUD_AMAZON = 'aws'
-      CLOUD_GOOGLE = 'google'
+      CLOUD_GOOGLE = 'gcp'
       CLOUD_AZURE = 'azure'
       CLOUD_ALIBABA = 'alibaba'
 

data/lib/foreman_inventory_upload.rb

@@ -75,7 +75,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_export_url
-    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
+    tags = CGI.escape("satellite/satellite_instance_id=#{Foreman.instance_id}")
     inventory_base_url + "?tags=#{tags}"
   end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '9.0.57'.freeze
+  VERSION = '10.0.1'.freeze
 end

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -60,7 +60,13 @@ module InsightsCloud
 
       def write_resolutions(response)
         all_resolutions = response.map do |rule_id, rule_details|
-          rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+          if rule_details
+            rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+          else
+            logger.info("Rules response: #{rule_id} #{rule_details}")
+            logger.debug("Response: #{response}\n Failed id #{rule_id}")
+            []
+          end
         end.flatten
 
         InsightsResolution.create(all_resolutions)

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -68,7 +68,7 @@ module InventorySync
 
       def to_ip_address_string(ip_addresses)
         string_size = 0
-        ip_addresses.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
+        ip_addresses&.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
       end
 
       def plan_self_host_sync

data/lib/tasks/insights.rake

@@ -15,9 +15,10 @@ namespace :rh_cloud_insights do
     end
 
     cleaner = ForemanRhCloud::InsightsStatusCleaner.new
-    deleted_count = cleaner.clean(hosts_search)
-
-    puts "Deleted #{deleted_count} insights statuses"
+    User.as_anonymous_admin do
+      deleted_count = cleaner.clean(hosts_search)
+      puts "Deleted #{deleted_count} insights statuses"
+    end
   end
 
   desc "Re-announce all organizations into Sources on RH cloud."

data/package.json

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

data/test/jobs/inventory_hosts_sync_test.rb

@@ -44,11 +44,59 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     inventory_json = <<-INVENTORY_JSON
     {
-      "total": 3,
-      "count": 3,
+      "total": 4,
+      "count": 4,
       "page": 1,
-      "per_page": 3,
+      "per_page": 4,
       "results": [
+        {
+          "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f39",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1c",
+          "satellite_id": "bb72bf95-0a19-4090-8009-f0d8c68aca61",
+          "bios_uuid": "b48a7e5f-cb50-4029-a75e-366bf43db642",
+          "fqdn": "rhel81-demo.oss-lab.net",
+          "mac_addresses": [
+            "52:54:00:aa:12:12",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "59ab38db-c25b-4fc7-bfb2-c8eb01d865a4",
+          "account": "1460290",
+          "display_name": "insights-rh71.example.com",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "virtual_host_name": "virt-who-nobody.home-1",
+                "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
+                "is_simple_content_access": false,
+                "distribution_version": "7.3",
+                "satellite_version": "6.8.4",
+                "organization_id": 1,
+                "is_hostname_obfuscated": false,
+                "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
+                "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
+                "source": "Satellite",
+                "yupana_host_id": "e85958b6-58db-4cfd-aeb6-01ee81bc0f43",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T07:57:42.466399+00:00",
+          "stale_warning_timestamp": "2021-03-26T07:57:42.466399+00:00",
+          "culled_timestamp": "2021-04-02T07:57:42.466399+00:00",
+          "created": "2021-02-08T14:36:03.613880+00:00",
+          "updated": "2021-03-18T02:57:42.535250+00:00"
+        },
         {
           "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f36",
           "rhel_machine_id": null,
@@ -307,7 +355,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
 
-    assert_equal 2, InsightsMissingHost.count
+    assert_equal 3, InsightsMissingHost.count
   end
 
   test 'Inventory should remove old missing host records' do
@@ -324,6 +372,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
 
-    assert_equal 2, InsightsMissingHost.count
+    assert_equal 3, InsightsMissingHost.count
   end
 end

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -65,16 +65,15 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
   end
 
   test 'should forward patch payload' do
-    params = { 'pumpkin' => 'pie' }
+    post_data = 'Random PATCH data'
     req = ActionDispatch::Request.new(
       'REQUEST_URI' => '/foo/bar?baz=awesome',
       'REQUEST_METHOD' => 'PATCH',
       'rack.input' => ::Puma::NullIO.new,
-      'RAW_POST_DATA' => 'Random PATCH data',
-      "action_dispatch.request.path_parameters" => { :format => "json" },
-      "action_dispatch.request.request_parameters" => { 'vegetables' => params }
+      'RAW_POST_DATA' => post_data,
+      "action_dispatch.request.path_parameters" => { :format => "json" }
     )
-    assert_equal params.to_json, @forwarder.prepare_forward_payload(req, 'vegetables')
+    assert_equal post_data, @forwarder.prepare_forward_payload(req, 'Random PATCH data')
   end
 
   test 'should forward file with metadata' do

data/test/unit/slice_generator_test.rb

@@ -594,7 +594,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 'google', actual_profile['cloud_provider']
+    assert_equal 'gcp', actual_profile['cloud_provider']
   end
 
   test 'Identifies Azure cloud provider' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 9.0.57
+  version: 10.0.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible