foreman_rh_cloud 9.0.58 → 9.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48906395af94f2d71160604c547ba3855d46440ff1f29b60f11b0b1fbe6d9d12
-  data.tar.gz: fcc42c3924b9bdcf1135ce967298e08b9089610ae9240bcb3fe45421fc658b06
+  metadata.gz: 7fc9fef343039c3d7fb7aca6dc870f356c45ed2a67d40184cea8c4c9a0792b7d
+  data.tar.gz: 19cb1bbe3ece3cf95fc568d2415aed4eabb215e8bdf609afb2f2b5d0a1229a23
 SHA512:
-  metadata.gz: 189c8a3d0f7db4274c10bd0baa57542fbfd82c0d0ddedf9bb7da5429b5045e1bad9dc6434248737db0deb2be792af34f8f8067ef8397ba85a3c3cc9f0ae29f5e
-  data.tar.gz: 16039e69ed139efee3304bb64086391f1ee8e44bf42732793c8700fc3941d62c1f011cf87f514a931336ad4b20560b150364debcbe1547cbc3cfe75a735b5e05
+  metadata.gz: 40bb4d0d7f9f537ccac76103385f6babf23a05ac7acef3c906dc7de3c660e6ebb94e87455021c825472fe701a4cf8abd0125c247344451000256964b67b720ee
+  data.tar.gz: ab205ff552f4ff1a7e50c50dcf0f32ad5fd36b6ca3f1b05eb95665b5e47e36150187361a3222a14298c6f08e0ddea85af229e1105eb2634ff95735839db6a202

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]
@@ -50,7 +50,9 @@ module ForemanRhCloud
 
     def prepare_forward_params(original_request, branch_id)
       forward_params = original_request.query_parameters
-      if original_request.user_agent && !original_request.user_agent.include?('redhat_access_cfme')
+      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
         forward_params = forward_params.merge(:branch_id => branch_id)
       end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '9.0.58'.freeze
+  VERSION = '9.0.60'.freeze
 end

data/package.json

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

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
@@ -113,6 +112,30 @@ 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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 9.0.58
+  version: 9.0.60
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible