Ignore adding branch_id to compliance policies requests

theforeman · Feb 26, 2025 · c6b7908 · c6b7908
1 parent 38eb35b
commit c6b7908
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/services/foreman_rh_cloud/cloud_request_forwarder.rb b/app/services/foreman_rh_cloud/cloud_request_forwarder.rb
@@ -52,7 +52,9 @@ def prepare_forward_payload(original_request, controller_name)
 
     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\/systems\/.+\/policies/)
+      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