foreman_rh_cloud 10.0.3 → 10.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee25c439b8e8ef11143c3a772398691fde180e7b001c0746a7e2cbe4cfa4b8f
-  data.tar.gz: 7f2bfb6dbcef65244329f71942fa9d40a5c753c307919414fd95beb3c6856f3e
+  metadata.gz: bfabc05d2ec5effb2a007e85471ba31e9d0067495fcbf52d07bb37b4f3c1a15c
+  data.tar.gz: c5f0db2ca590193d014d69358882c0abf98adf523158ceec65536391b454ca23
 SHA512:
-  metadata.gz: 0b2450546e69009b8621a8814d472ae373c765d99ca4b339f37349c2c78cd2f07f68f84f550a967feec6e646c4ecfc58a6f804336c521f2da91124f317e89a86
-  data.tar.gz: 4f70f1b604a0493ad0d90f8a55af38685f4e298564addec4487fec5939943c92a6a1b7dc55c2a8c738edda963dedf842e278f5062a3fe01e75102be35379caa8
+  metadata.gz: fd794c63904449ceb0f7b4b2d02de6e8b97cdde7745c24a5d6a02d52047fc036d3b995e11bca5aa0cf241a8b2def0f6efda15e810cd2dfdb9a5060e1cfe984bf
+  data.tar.gz: 73d24b976d3a00150696e403d5bd5f134faa1c60ca8b75063a0ac12e57da85427c6a301faf96d502e736f515c60e6bb6b25627c056909698b3fe9fac17751da7

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -18,6 +18,8 @@ module InsightsCloud::Api
       certs = candlepin_id_cert @organization
       @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
 
+      return render json: { message: @cloud_response.to_s }, status: :gateway_timeout if @cloud_response.is_a?(RestClient::Exceptions::OpenTimeout)
+
       if @cloud_response.code == 401
         return render json: {
           :message => 'Authentication to the Insights Service failed.',

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,8 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
-    rescue RestClient::Exception => error_response
-      error_response.response
+    rescue RestClient::ExceptionWithResponse => error_response
+      error_response.response.presence || error_response.exception
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -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.5'.freeze
 end

data/package.json

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

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'rest-client'
 
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
@@ -33,6 +34,18 @@ module InsightsCloud::Api
         assert_equal @body, @response.body
       end
 
+      test "should handle timeout from cloud" do
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.
+          stubs(:forward_request).
+          raises(RestClient::Exceptions::OpenTimeout.new("Timed out connecting to server"))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        request_response = JSON.parse(@response.body)
+        # I can't get @response.status to take a nil value so I'm not asserting for that
+
+        assert_equal 'Timed out connecting to server', request_response['error']
+      end
+
       test "should respond with the same content type" do
         net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
         net_http_resp.add_field 'Set-Cookie', 'Monster'

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