foreman_rh_cloud 5.0.34 → 5.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0389d4bf9e9af791b23a3ea7b271feca1385e2fcf4fc6acc7d954283477c8706'
-  data.tar.gz: 839cc45d7b92a308841f995152ae4a68503acd69feb95cd95b19772f99cec6c9
+  metadata.gz: 437d70d98a43e88f7835426bf1a8ae7995a2b759038e3a5908dc41e122544ed1
+  data.tar.gz: a655276cda12b06662db3670019747c518e9204c22ca8ad3591024945dd48fb8
 SHA512:
-  metadata.gz: 7b37d242c63e0260a76d06a6096ac569423237bf62f6e8685f79d6cf7b3e85246cfa92f35f0907a18b10539deb09f991189ea5914fa519236786aa2456e8aed6
-  data.tar.gz: e2baeab2eceeae447276db3ce9c8fa6c7236ff082eab418b835afea4c97ea9172a86eabeeb8ba430012f9662c26bd5a95cc86cc5f45e67a8f6ee4bb2d3a76ac8
+  metadata.gz: 3d59ebbe9a845efd88c9d70f1d44ff9ebae7e5faabd947c3ba3d48e5f22435c97052be363839805208b381fea29f643a35ef241f2ff0ae462d1720d6ff5fd538
+  data.tar.gz: f7d94f184cbeba9d50b6e8a83d71db08a3c6417972b6d51b6ca247558a4769a6f17fbfdae37f9e4f5efe2a73a8095885a44e109d2b736fbc1d824f9e68528fe1

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

@@ -49,7 +49,13 @@ module InsightsCloud::Api
     end
 
     def branch_info
-      render :json => ForemanRhCloud::BranchInfo.new.generate(@uuid, @host, @branch_id, request.host).to_json
+      payload = nil
+
+      User.as_anonymous_admin do
+        payload = ForemanRhCloud::BranchInfo.new.generate(@uuid, @host, @branch_id, request.host).to_json
+      end
+
+      render :json => payload
     end
 
     def assign_header(res, cloud_res, header, transform)

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
@@ -140,9 +143,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 = '5.0.34'.freeze
+  VERSION = '5.0.35'.freeze
 end

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -22,6 +22,10 @@ module InsightsCloud
       def rescue_strategy_for_self
         Dynflow::Action::Rescue::Fail
       end
+
+      def logger
+        action_logger
+      end
     end
   end
 end

data/package.json

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

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

@@ -60,6 +60,18 @@ 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 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)
@@ -116,6 +128,10 @@ module InsightsCloud::Api
       test 'should get branch info' do
         get :branch_info
 
+        res = JSON.parse(@response.body)
+
+        assert_not_equal 0, res['labels'].find { |l| l['key'] == 'hostgroup' }.count
+
         assert_response :success
       end
 

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -6,18 +6,23 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
 
   setup do
     @forwarder = ::ForemanRhCloud::CloudRequestForwarder.new
+
+    ForemanRhCloud.stubs(:base_url).returns('https://cloud.example.com')
+    ForemanRhCloud.stubs(:cert_base_url).returns('https://cert.cloud.example.com')
+    ForemanRhCloud.stubs(:legacy_insights_url).returns('https://cert-api.access.example.com')
+    ForemanRhCloud.stubs(:authentication_url).returns('https://sso.example.com/auth/realms/redhat-external/protocol/openid-connect/token')
   end
 
   test 'should prepare correct cloud url' do
     paths = {
-      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
-      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.redhat.com/r/insights/v1/static/release/insights-core.egg",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json.asc",
-      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
-      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
-      "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
-      "/redhat_access/r/insights/" => "https://cert.cloud.redhat.com/api/apicast-tests/ping",
+      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.example.com/api/module-update-router/v1/channel?module=insights-core",
+      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.example.com/r/insights/v1/static/release/insights-core.egg",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.example.com/r/insights/v1/static/uploader.v2.json",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.example.com/r/insights/v1/static/uploader.v2.json.asc",
+      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.example.com/api/inventory/v1/hosts",
+      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.example.com/api/ingress/v1/upload",
+      "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.example.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
+      "/redhat_access/r/insights/" => "https://cert.cloud.example.com/api/apicast-tests/ping",
     }
 
     paths.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.34
+  version: 5.0.35
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello