foreman_rh_cloud 4.0.32 → 4.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b11e8e007c7d982a5554b027916d26df635d1d3824ba8a586b794370f1828f1a
-  data.tar.gz: ac439b33efec89c1f939745de5470d8bcb12c9cc21dd8464527ecd400d9fe0a0
+  metadata.gz: 224802f19d8eb36625b3d80121e6325d2733920417d1b45d229b448e20cd8164
+  data.tar.gz: 3ffe588112a4638c952b7dc11786e811dd484aba2f013b03fd070b09cd5292d0
 SHA512:
-  metadata.gz: 05a8f783d13985048ec24dd4d9fe8037cb1a5d8af0b266739fbbc515c9542f2b9c14de8e6e2b209194f84c8b5902300ff6f0b746814a063e0ab45521d8139035
-  data.tar.gz: 632d536fa1056cc8fd69ee7375f7683da2675756151f890a3a6d1e42081225cbde5e71c8b3516e0804eabcda54ac61b340ae622f0f7cc63ebc0f4fc15026c809
+  metadata.gz: '08abdef66a17843cec33bf0a6fa84c689ecdceab413df010936c0b9b7226ce9b2ed00d1853c23838b49faa01a96ab86673d59554910ba78ebbfd654ecc439d8e'
+  data.tar.gz: 3f432ee32d4d1e81b1f5dddccd98265be4e62422ca28a062264be78dd3ce3c58f657aae55dd572a27cc8d88c38ac8b6250f328f17d9951572340af694644259b

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

@@ -33,14 +33,25 @@ 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]
+      # 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_')
       end
-
+      # Append general headers
       assign_header(response, @cloud_response, :x_resource_count, true)
-      assign_header(response, @cloud_response, :x_rh_insights_request_id, false)
+      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/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -25,11 +25,12 @@ module ForemanRhCloud
       base_params = {
         method: original_request.method,
         payload: forward_payload,
-        headers: {
-          params: forward_params,
-          user_agent: http_user_agent(original_request),
-          content_type: original_request.media_type.presence || original_request.format.to_s,
-        },
+        headers: original_headers(original_request).merge(
+          {
+            params: forward_params,
+            user_agent: http_user_agent(original_request),
+            content_type: original_request.media_type.presence || original_request.format.to_s,
+          }),
       }
       base_params.merge(path_params(original_request.path, certs))
     end
@@ -80,6 +81,16 @@ module ForemanRhCloud
       end
     end
 
+    def original_headers(original_request)
+      headers = {
+        if_none_match: original_request.if_none_match,
+        if_modified_since: original_request.if_modified_since,
+      }.compact
+
+      logger.debug("Sending headers: #{headers}")
+      headers
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/lib/foreman_rh_cloud/engine.rb

@@ -6,15 +6,18 @@ module ForemanRhCloud
     engine_name 'foreman_rh_cloud'
 
     def self.register_scheduled_task(task_class, cronline)
-      return if ForemanTasks::RecurringLogic.joins(:tasks)
-                .merge(ForemanTasks::Task.where(label: task_class.name))
-                .exists?
-
-      User.as_anonymous_admin do
-        recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline(cronline)
-        recurring_logic.save!
-        recurring_logic.start(task_class)
+      ForemanTasks::RecurringLogic.transaction(isolation: :serializable) do
+        return if ForemanTasks::RecurringLogic.joins(:tasks)
+                  .merge(ForemanTasks::Task.where(label: task_class.name))
+                  .exists?
+
+        User.as_anonymous_admin do
+          recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline(cronline)
+          recurring_logic.save!
+          recurring_logic.start(task_class)
+        end
       end
+    rescue ActiveRecord::TransactionIsolationError
     end
 
     initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
@@ -136,10 +139,9 @@ module ForemanRhCloud
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    config.to_prepare do
+    initializer 'foreman_rh_cloud.register_rex_features', :before => :finisher_hook do |_app|
       # skip database manipulations while tables do not exist, like in migrations
-      if ActiveRecord::Base.connection.data_source_exists?(ForemanTasks::Task.table_name) &&
-
+      if ActiveRecord::Base.connection.data_source_exists?(ForemanTasks::Task.table_name)
         RemoteExecutionFeature.register(
           :rh_cloud_remediate_hosts,
           N_('Apply Insights recommendations'),

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '4.0.32'.freeze
+  VERSION = '4.0.36'.freeze
 end

data/package.json

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

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

@@ -60,6 +60,29 @@ module InsightsCloud::Api
         assert_equal x_rh_insights_request_id, @response.headers['x_rh_insights_request_id']
       end
 
+      test "should set etag header to response from cloud" do
+        etag = '12345'
+        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org', :headers => { "If-None-Match": etag})
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        net_http_resp[Rack::ETAG] = etag
+        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 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: 4.0.32
+  version: 4.0.36
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -174,7 +174,6 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
-- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -659,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.