From c6b7908f35e84fc1a92249235991bf3a6ea25a39 Mon Sep 17 00:00:00 2001 From: Partha Aji Date: Wed, 26 Feb 2025 13:46:25 -0500 Subject: [PATCH] Ignore adding branch_id to compliance policies requests --- app/services/foreman_rh_cloud/cloud_request_forwarder.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/foreman_rh_cloud/cloud_request_forwarder.rb b/app/services/foreman_rh_cloud/cloud_request_forwarder.rb index ff4b623c..17ed2c03 100644 --- 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