foreman_rh_cloud 5.0.42 → 5.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21744025612c50afc1aa1c943e33a0c2dd6e76e8a2ee778ae74068d57c8d971f
-  data.tar.gz: 491d74b6e3ad554de98c2ce45c5b95806547855ab8794aa9a51e3e08bc6e3bca
+  metadata.gz: 9635bebb61af6ca7d21d4b4acffb2a7e56076bd4c889917469aba146473b7b2a
+  data.tar.gz: a08402321da845e7e2e2d66b1abeefadd2a8d037c482b808734310ec918032ee
 SHA512:
-  metadata.gz: a4e8097f9923909d623e445a0b0ca604e737409ee6ce06962e0ae9122f9d8a95d568a41b8e5b2061d2629e6290605f72209f861a9dd7c709661703a927bb5cdf
-  data.tar.gz: 6c62744629566595c8f2ddb4e6b649ac6131efe177666455c97d9dc7353c1f7e2102f90938c2828f95ddfc57fa65a11244cf0a7cc2641595df429948ce01117e
+  metadata.gz: 6c4b6f686cc56e902aa6589d5fc85829b3c1c014dfcf4f16bd8f087f4a1609a807d1d4fc24364fd6bd0196156508da9daacbc97e6d0de91bc265e26600b12b85
+  data.tar.gz: 5e21c1f90bba2f55bba85eb38b3829a0fb3bca3728d1766e6986233d35e8e446812ac35d2903061a104760404d4b3b6386a48a6e9c39565eb8ad3c6c2f972045

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

@@ -33,10 +33,6 @@ module InsightsCloud::Api
         }, status: @cloud_response.code
       end
 
-      if @cloud_response.headers[:content_disposition]
-        return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
-      end
-
       # Append redhat-specific headers
       @cloud_response.headers.each do |key, value|
         assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
@@ -45,7 +41,17 @@ module InsightsCloud::Api
       assign_header(response, @cloud_response, :x_resource_count, true)
       headers[Rack::ETAG] = @cloud_response.headers[:etag]
 
-      render json: @cloud_response, status: @cloud_response.code
+      if @cloud_response.headers[:content_disposition]
+        # If there is a Content-Disposition header, it means we are forwarding binary data, send the raw data with proper
+        # content type
+        send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
+      elsif @cloud_response.headers[:content_type] =~ /zip/
+        # if there is no Content-Disposition, but the content type is binary according the content type,
+        # forward the request as binry too
+        send_data @cloud_response, type: @cloud_response.headers[:content_type]
+      else
+        render json: @cloud_response, status: @cloud_response.code
+      end
     end
 
     def branch_info

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.42'.freeze
+  VERSION = '5.0.44'.freeze
 end

data/lib/inventory_sync/async/host_result.rb

@@ -11,7 +11,7 @@ module InventorySync
         @per_page = result['per_page']
         @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
         @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
-        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn'].downcase, host['id']] }]
+        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn']&.downcase, host['id']] }]
       end
 
       def status_hashes

data/package.json

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

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

@@ -72,6 +72,17 @@ module InsightsCloud::Api
         assert_equal etag, @response.headers[Rack::ETAG]
       end
 
+      test "should set content type header to response from cloud" do
+        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        net_http_resp['Content-Type'] = 'application/zip'
+        res = RestClient::Response.create(@body, net_http_resp, req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        get :forward_request, params: { "path" => "static/v1/release/insights-core.egg" }
+        assert_equal net_http_resp['Content-Type'], @response.headers['Content-Type']
+      end
+
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.42
+  version: 5.0.44
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -674,7 +674,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.