foreman_rh_cloud 9.0.60 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc9fef343039c3d7fb7aca6dc870f356c45ed2a67d40184cea8c4c9a0792b7d
-  data.tar.gz: 19cb1bbe3ece3cf95fc568d2415aed4eabb215e8bdf609afb2f2b5d0a1229a23
+  metadata.gz: 0ff94b0740c89b0b945f90e7feba658b30341a7f8bb5c1fd2e59cdfc68d05969
+  data.tar.gz: b25c4f29a021b554b425d6d464971aed419e3021736730b696710c10e9804670
 SHA512:
-  metadata.gz: 40bb4d0d7f9f537ccac76103385f6babf23a05ac7acef3c906dc7de3c660e6ebb94e87455021c825472fe701a4cf8abd0125c247344451000256964b67b720ee
-  data.tar.gz: ab205ff552f4ff1a7e50c50dcf0f32ad5fd36b6ca3f1b05eb95665b5e47e36150187361a3222a14298c6f08e0ddea85af229e1105eb2634ff95735839db6a202
+  metadata.gz: 6c4b8398e71971b211bb7eb5a76f3d4acd2a274eb69cd9c6f33c8961e0824c8f9da3a34e7ae72c438ab9ddc5042f9a4e3aee53bf24c5ad07ce617b3bdba83eee
+  data.tar.gz: a0f2b3d8d0b1ddf1c0bccd5eeef2c818d8f81bf1a05eaa5e9f0a9bacd70368381d362343f5bc454023b258c238127664f4aaac709fe40feae03ae8b400f80f0c

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -50,9 +50,7 @@ module ForemanRhCloud
 
     def prepare_forward_params(original_request, branch_id)
       forward_params = original_request.query_parameters
-      compliance_request = original_request.path.match?(/compliance\/v2(\/.*)?/)
-      user_agent = original_request.user_agent.present? && !original_request.user_agent.include?('redhat_access_cfme')
-      if user_agent && !compliance_request
+      if original_request.user_agent && !original_request.user_agent.include?('redhat_access_cfme')
         forward_params = forward_params.merge(:branch_id => branch_id)
       end
 

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/generators/slice.rb

@@ -126,7 +126,6 @@ module ForemanInventoryUpload
         ) { |v| os_release_value(*v) }
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
-        @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', false)
         @stream.simple_field(
           'infrastructure_type',

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.60'.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/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.60",
+  "version": "10.0.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

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

@@ -112,30 +112,6 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
 
-  test 'should NOT add branch id into forwarded params for compliance urls' do
-    user_agent = { :foo => :bar }
-    params = { :page => 5, :per_page => 42 }
-
-    uris = [
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/policies/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/",
-    ]
-    uris.each do |uri|
-      req = ActionDispatch::Request.new(
-        'REQUEST_URI' => uri,
-        'REQUEST_METHOD' => 'GET',
-        'HTTP_USER_AGENT' => user_agent,
-        'rack.input' => ::Puma::NullIO.new,
-        'action_dispatch.request.query_parameters' => params
-      )
-      req.stubs(:path).returns(uri)
-      refute @forwarder.prepare_forward_params(req, 74).key?(:branch_id), "Branch id should not be added for #{uri}"
-    end
-  end
-
   test 'should reuse BranchInfo identifiers for user_agent' do
     user_agent = { :foo => :bar }
     params = { :page => 5, :per_page => 42 }

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.60
+  version: 10.0.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -28,16 +28,16 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement