foreman_rh_cloud 6.0.42.1 → 6.0.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d6287736ecb0fe82ecd3506ba7a5c638b0359976c9948ace0e5d7fc1cda5b8
-  data.tar.gz: 650285b17a358808f0e8d79bdb239a310b0468dff592848a390bd3201a5f6369
+  metadata.gz: 286d62e3c864ee4b0728bfc1c5d1d224e46ee0917d7a2ea517e096ea6dab0c5c
+  data.tar.gz: 1ce1d58a07bdc5d57acb5dab27e4441594605608a79fdfa82f029c6e6018211e
 SHA512:
-  metadata.gz: 140f8b1c56d18863d22d97c8195b08f1f264b8b3ed2ead351c1f78d5b9b9eb779505cfe913b7c9360153f4bfb0c1c356c1e179e70211a3cf277b0bc47c7fcfc1
-  data.tar.gz: 1b6a57cda764598e8a2a82567c8cc2cd653af3dc6af0e950ce3adca8b6961235e3b1057a4f4fbd8ae173db9b0515c1b97c8c3b4f272e4b96d8ff499bdcdac250
+  metadata.gz: 5375be3e72da24347196c842946f663464bdf8d367b592b682c604eb7373221addc0f43f49735941cc3cfc279ebffb87888284e21752ca4c2b9ba863e99e88c0
+  data.tar.gz: cc5d701cff558eaf96ea554a7d293fc5fe14e6d8c04daf05d537363dac759b7e611f8af66e780cb30e8856e2a696364a6b9b1efe58806b357f25d8c0f58b6954

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

@@ -33,6 +33,10 @@ 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_')
@@ -41,17 +45,7 @@ module InsightsCloud::Api
       assign_header(response, @cloud_response, :x_resource_count, true)
       headers[Rack::ETAG] = @cloud_response.headers[:etag]
 
-      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
+      render json: @cloud_response, status: @cloud_response.code
     end
 
     def branch_info

data/db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FixRhCloudSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-	VERSION = '6.0.42.1'.freeze
+  VERSION = '6.0.42.2'.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.1",
+  "version": "6.0.42.2",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

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

@@ -72,17 +72,6 @@ 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.1
+  version: 6.0.42.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -197,6 +197,7 @@ files:
 - db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
 - db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
 - db/migrate/20220321000001_add_unique_to_insights_rules.foreman_rh_cloud.rb
+- db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb