foreman_rh_cloud 10.0.4 → 10.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8215c5bc0f5e21d7c4ee1b09ee2a38a44bc17d36c95606d77e8ee2cffc10d2e
-  data.tar.gz: f42e8b38e3f996cf29973a776ec03083aaa8db1fb58639690f7a50048c531260
+  metadata.gz: bfabc05d2ec5effb2a007e85471ba31e9d0067495fcbf52d07bb37b4f3c1a15c
+  data.tar.gz: c5f0db2ca590193d014d69358882c0abf98adf523158ceec65536391b454ca23
 SHA512:
-  metadata.gz: bd2acf961ce05b7043013b695dccaab5d764d526b23aef83adc85373a0699fdc9a161bbd65c621d5fffc9139f254e88b6e6e53e2da9e5da6ade0330523c85f0b
-  data.tar.gz: 380d55213867c915d707f52470f6ec3aca269c3f2aa7bfc1aa2ba2db7659806c3c17824675fe5c9b2ef62df9704f0fb09f0cc2738bab17ea5339edd7c832dbad
+  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)

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '10.0.4'.freeze
+  VERSION = '10.0.5'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "10.0.4",
+  "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'

metadata

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