foreman_rh_cloud 10.0.3 → 10.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee25c439b8e8ef11143c3a772398691fde180e7b001c0746a7e2cbe4cfa4b8f
-  data.tar.gz: 7f2bfb6dbcef65244329f71942fa9d40a5c753c307919414fd95beb3c6856f3e
+  metadata.gz: e8215c5bc0f5e21d7c4ee1b09ee2a38a44bc17d36c95606d77e8ee2cffc10d2e
+  data.tar.gz: f42e8b38e3f996cf29973a776ec03083aaa8db1fb58639690f7a50048c531260
 SHA512:
-  metadata.gz: 0b2450546e69009b8621a8814d472ae373c765d99ca4b339f37349c2c78cd2f07f68f84f550a967feec6e646c4ecfc58a6f804336c521f2da91124f317e89a86
-  data.tar.gz: 4f70f1b604a0493ad0d90f8a55af38685f4e298564addec4487fec5939943c92a6a1b7dc55c2a8c738edda963dedf842e278f5062a3fe01e75102be35379caa8
+  metadata.gz: bd2acf961ce05b7043013b695dccaab5d764d526b23aef83adc85373a0699fdc9a161bbd65c621d5fffc9139f254e88b6e6e53e2da9e5da6ade0330523c85f0b
+  data.tar.gz: 380d55213867c915d707f52470f6ec3aca269c3f2aa7bfc1aa2ba2db7659806c3c17824675fe5c9b2ef62df9704f0fb09f0cc2738bab17ea5339edd7c832dbad

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -51,7 +51,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 = '10.0.3'.freeze
+  VERSION = '10.0.4'.freeze
 end

data/package.json

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

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

@@ -112,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: 10.0.3
+  version: 10.0.4
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible