foreman_rh_cloud 6.0.42 → 6.0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c56d7e23a70203868099896bbdcf3bb1b6ec31dc5a703a5da9bd147f849a10
-  data.tar.gz: d6ea56a9abbc11fad5d4d77347d829a0eb3062af500b8773c9d617235ce0b0fc
+  metadata.gz: 38d6287736ecb0fe82ecd3506ba7a5c638b0359976c9948ace0e5d7fc1cda5b8
+  data.tar.gz: 650285b17a358808f0e8d79bdb239a310b0468dff592848a390bd3201a5f6369
 SHA512:
-  metadata.gz: 523354ddf7e4511663d53833823b0e5ffa3128ea9513eeab23b458e23d6f5a76254017ffc52b8f513245f8404e991154123585bc93269f1b72c06ec7512e595a
-  data.tar.gz: '03784d6b78c2acf11b084912739cb5714e95f165871db256a260da8aab1e3c3d278eb8120eb2aec673477467da611a02f4ac89b87ed4b60b099a27d51e3c0e5b'
+  metadata.gz: 140f8b1c56d18863d22d97c8195b08f1f264b8b3ed2ead351c1f78d5b9b9eb779505cfe913b7c9360153f4bfb0c1c356c1e179e70211a3cf277b0bc47c7fcfc1
+  data.tar.gz: 1b6a57cda764598e8a2a82567c8cc2cd653af3dc6af0e950ce3adca8b6961235e3b1057a4f4fbd8ae173db9b0515c1b97c8c3b4f272e4b96d8ff499bdcdac250

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 = '6.0.42'.freeze
+	VERSION = '6.0.42.1'.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": "6.0.42",
+  "version": "6.0.42.1",
   "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: 6.0.42
+  version: 6.0.42.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello