foreman_rh_cloud 3.0.33 → 4.0.21.1

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -6,11 +6,6 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
-        unless cloud_auth_available?
-          logger.debug('Cloud authentication is not available, skipping insights sync')
-          return
-        end
-
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host
@@ -55,18 +50,28 @@ module InsightsCloud
       end
 
       def query_insights_hits
-        hits_response = execute_cloud_request(
+        hits_response = RestClient::Request.execute(
           method: :get,
-          url: InsightsCloud.hits_export_url
+          url: InsightsCloud.hits_export_url,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+          headers: {
+            Authorization: "Bearer #{rh_credentials}",
+          }
         )
 
         JSON.parse(hits_response)
       end
 
       def query_insights_rules
-        rules_response = execute_cloud_request(
+        rules_response = RestClient::Request.execute(
           method: :get,
-          url: InsightsCloud.rules_url
+          url: InsightsCloud.rules_url,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+          headers: {
+            Authorization: "Bearer #{rh_credentials}",
+          }
         )
 
         JSON.parse(rules_response)

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -7,21 +7,11 @@ module InsightsCloud
 
       RULE_ID_REGEX = /[^:]*:(?<id>.*)/
 
-      def plan
-        unless cloud_auth_available?
-          logger.debug('Cloud authentication is not available, skipping resolutions sync')
-          return
-        end
-
-        plan_self
-      end
-
       def run
         InsightsResolution.transaction do
           InsightsResolution.delete_all
-          rule_ids = relevant_rules
-          api_response = query_insights_resolutions(rule_ids) unless rule_ids.empty?
-          write_resolutions(api_response) if api_response
+          api_response = query_insights_resolutions(relevant_rules)
+          write_resolutions(api_response)
         end
       end
 
@@ -32,11 +22,14 @@ module InsightsCloud
       private
 
       def query_insights_resolutions(rule_ids)
-        resolutions_response = execute_cloud_request(
+        resolutions_response = RestClient::Request.execute(
           method: :post,
           url: InsightsCloud.resolutions_url,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             content_type: :json,
+            Authorization: "Bearer #{rh_credentials}",
           },
           payload: {
             issues: rule_ids,

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -6,17 +6,8 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
-        unless cloud_auth_available?
-          logger.debug('Cloud authentication is not available, skipping rules sync')
-          return
-        end
-
-        # since the tasks are not connected, we need to force sequence execution here
-        # to make sure we don't run resolutions until we synced all our rules
-        sequence do
-          plan_self
-          plan_resolutions
-        end
+        plan_self
+        plan_resolutions
       end
 
       def plan_resolutions
@@ -46,9 +37,14 @@ module InsightsCloud
       private
 
       def query_insights_rules(offset)
-        rules_response = execute_cloud_request(
+        rules_response = RestClient::Request.execute(
           method: :get,
-          url: InsightsCloud.rules_url(offset: offset)
+          url: InsightsCloud.rules_url(offset: offset),
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+          headers: {
+            Authorization: "Bearer #{rh_credentials}",
+          }
         )
 
         JSON.parse(rules_response)

data/lib/inventory_sync/async/host_result.rb

@@ -1,8 +1,6 @@
 module InventorySync
   module Async
     class HostResult
-      attr_reader :uuid_by_fqdn
-
       def initialize(result)
         @total = result['total']
         @count = result['count']
@@ -10,23 +8,26 @@ 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']] }]
       end
 
       def status_hashes
         @sub_ids.map do |sub_id|
           host_id = host_id(sub_id)
           if host_id
+            touched << host_id
             {
               host_id: host_id,
               status: InventorySync::InventoryStatus::SYNC,
               reported_at: DateTime.current,
-              type: InventorySync::InventoryStatus.name,
             }
           end
         end.compact
       end
 
+      def touched
+        @touched ||= []
+      end
+
       def host_id(sub_id)
         hosts[sub_id]
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -5,16 +5,15 @@ module InventorySync
       set_callback :step, :around, :update_statuses_batch
 
       def plan(organization)
-        unless cloud_auth_available?
-          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
-          return
-        end
-
         plan_self(organization_id: organization.id)
       end
 
       def setup_statuses
-        @subscribed_hosts_ids = Set.new(affected_host_ids)
+        @subscribed_hosts_ids = Set.new(
+          ForemanInventoryUpload::Generators::Queries.for_slice(
+            Host.unscoped.where(organization: input[:organization_id])
+          ).pluck(:id)
+        )
 
         InventorySync::InventoryStatus.transaction do
           InventorySync::InventoryStatus.where(host_id: @subscribed_hosts_ids).delete_all
@@ -25,24 +24,20 @@ module InventorySync
 
         logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
         logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
-        output[:host_statuses] = host_statuses
       end
 
       def update_statuses_batch
         results = yield
 
-        existing_hosts = results.status_hashes.select { |hash| @subscribed_hosts_ids.include?(hash[:host_id]) }
-
-        update_hosts_status(existing_hosts)
-        host_statuses[:sync] += existing_hosts.size
+        update_hosts_status(results.status_hashes, results.touched)
+        host_statuses[:sync] += results.touched.size
       end
 
       private
 
-      def update_hosts_status(status_hashes)
+      def update_hosts_status(status_hashes, touched)
         InventorySync::InventoryStatus.create(status_hashes)
-        updated_ids = status_hashes.map { |hash| hash[:host_id] }
-        @subscribed_hosts_ids.subtract(updated_ids)
+        @subscribed_hosts_ids.subtract(touched)
       end
 
       def add_missing_hosts_statuses(hosts_ids)
@@ -58,17 +53,11 @@ module InventorySync
       end
 
       def host_statuses
-        @host_statuses ||= {
+        output[:host_statuses] ||= {
           sync: 0,
           disconnect: 0,
         }
       end
-
-      def affected_host_ids
-        ForemanInventoryUpload::Generators::Queries.for_slice(
-          Host.unscoped.where(organization: input[:organization_id])
-        ).pluck(:id)
-      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -4,17 +4,6 @@ module InventorySync
       set_callback :iteration, :around, :setup_facet_transaction
       set_callback :step, :around, :create_facets
 
-      def plan
-        unless cloud_auth_available?
-          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
-          return
-        end
-
-        # by default the tasks will be executed concurrently
-        plan_self
-        plan_self_host_sync
-      end
-
       def setup_facet_transaction
         InsightsFacet.transaction do
           yield
@@ -31,18 +20,14 @@ module InventorySync
       private
 
       def add_missing_insights_facets(uuids_hash)
-        all_facets = uuids_hash.map do |host_id, uuid|
+        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id)
+        missing_facets = uuids_hash.except(*existing_facets).map do |host_id, uuid|
           {
             host_id: host_id,
             uuid: uuid,
           }
         end
-
-        InsightsFacet.upsert_all(all_facets, unique_by: :host_id) unless all_facets.empty?
-      end
-
-      def plan_self_host_sync
-        plan_action InventorySync::Async::InventorySelfHostSync
+        InsightsFacet.create(missing_facets)
       end
     end
   end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -4,14 +4,6 @@ module InventorySync
       include ::Actions::RecurringAction
 
       def plan
-        unless Setting[:allow_auto_inventory_upload]
-          logger.debug(
-            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
-            setting being set to false.'
-          )
-          return
-        end
-
         Organization.unscoped.each do |org|
           plan_org_sync(org)
         end
@@ -20,10 +12,6 @@ module InventorySync
       def plan_org_sync(org)
         plan_action InventoryFullSync, org
       end
-
-      def logger
-        action_logger
-      end
     end
   end
 end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -29,10 +29,13 @@ module InventorySync
       private
 
       def query_inventory(page = 1)
-        hosts_inventory_response = execute_cloud_request(
+        hosts_inventory_response = RestClient::Request.execute(
           method: :get,
-          url: request_url,
+          url: ForemanInventoryUpload.inventory_export_url,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
+            Authorization: "Bearer #{rh_credentials}",
             params: {
               per_page: 100,
               page: page,
@@ -46,10 +49,6 @@ module InventorySync
       def logger
         action_logger
       end
-
-      def request_url
-        ForemanInventoryUpload.inventory_export_url
-      end
     end
   end
 end

data/lib/tasks/insights.rake

@@ -4,19 +4,4 @@ namespace :rh_cloud_insights do
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
     puts "Synchronized Insights hosts hits data"
   end
-
-  desc "Remove insights client report statuses by searching on host criteria"
-  task clean_statuses: [:environment] do
-    hosts_search = ENV['SEARCH']
-
-    if hosts_search.empty?
-      puts 'Must specify SEARCH= criteria for hosts search'
-      next
-    end
-
-    cleaner = ForemanRhCloud::InsightsStatusCleaner.new
-    deleted_count = cleaner.clean(hosts_search)
-
-    puts "Deleted #{deleted_count} insights statuses"
-  end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -23,15 +23,8 @@ namespace :rh_cloud_inventory do
       organizations = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
 
-      unless File.writable?(base_folder)
-        puts "#{base_folder} is not writable by the current process"
-        base_folder = Dir.mktmpdir
-        puts "Using #{base_folder} for the output"
-      end
-
-      if portal_user.empty? && organizations.empty?
+      unless portal_user || organizations.empty?
         puts "Must specify either portal_user or organization_id"
-        return
       end
 
       User.as_anonymous_admin do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.33",
+  "version": "4.0.21.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
+    "@redhat-cloud-services/frontend-components": "^2.5.0",
     "@theforeman/builder": "~4.14.0",
     "@theforeman/stories": "~4.14.0",
     "@theforeman/test": "~4.14.0",
@@ -42,7 +43,6 @@
   },
   "dependencies": {
     "jed": "~1.1.1",
-    "react-intl": "~2.8.0",
-    "@redhat-cloud-services/frontend-components": "^2.5.0"
+    "react-intl": "~2.8.0"
   }
 }

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

@@ -3,8 +3,6 @@ require 'test_plugin_helper'
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
     context '#forward_request' do
-      include MockCerts
-
       setup do
         @body = 'Cloud response body'
         @http_req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
@@ -13,10 +11,6 @@ module InsightsCloud::Api
         host = FactoryBot.create(:host, :with_subscription, :organization => org)
         User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:upstream_owner).returns({ 'uuid' => 'abcdefg' })
-
-        setup_certs_expectation do
-          InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:candlepin_id_cert)
-        end
       end
 
       test "should respond with response from cloud" do
@@ -36,7 +30,6 @@ module InsightsCloud::Api
         ::ForemanRhCloud::CloudRequestForwarder.any_instance.expects(:execute_cloud_request).with do |opts|
           opts[:headers][:content_type] == 'application/json'
         end.returns(res)
-        InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:cp_owner_id).returns('123')
 
         post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => {"foo" => "bar"} }
         assert_equal @body, @response.body
@@ -56,29 +49,6 @@ 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)
@@ -88,17 +58,6 @@ module InsightsCloud::Api
         assert_equal 502, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
-
-      test "should forward errors to the client" do
-        net_http_resp = Net::HTTPResponse.new(1.0, 500, "TEST_RESPONSE")
-        res = RestClient::Response.create(@body, net_http_resp, @http_req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::InternalServerError.new(res))
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 500, @response.status
-        assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
-        assert_match /#{@body}/, JSON.parse(@response.body)['response']
-      end
     end
 
     context '#branch_info' do

data/test/factories/inventory_upload_factories.rb

@@ -49,7 +49,7 @@ end
 
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % {n: n, r: rand(500)} }
+    sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
     facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/insights_full_sync_test.rb

@@ -7,7 +7,6 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')

data/test/jobs/insights_resolutions_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require 'test_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsResolutionsSyncTest < ActiveSupport::TestCase
@@ -63,7 +63,6 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     }
 
     @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Resolutions data is replaced with data from cloud' do
@@ -75,13 +74,4 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 5, InsightsResolution.all.count
     assert_equal 2, @rule.resolutions.count
   end
-
-  test 'Skips pinging the cloud if no rule ids were found' do
-    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
-    InsightsRule.all.delete_all
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
-
-    assert_equal 0, InsightsResolution.all.count
-  end
 end

data/test/jobs/insights_rules_sync_test.rb

@@ -112,7 +112,6 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
 
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Hits data is replaced with data from cloud' do

data/test/jobs/inventory_full_sync_test.rb

@@ -37,18 +37,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
-    # this host would pass our plugin queries, so it could be uploaded to the cloud.
-    @host3 = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: cv.first,
-      lifecycle_environment: env,
-      organization: env.organization
-    )
-
-    @host3.subscription_facet.pools << pool
-
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -163,7 +151,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
         {
           "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
           "rhel_machine_id": null,
-          "subscription_manager_id": "#{@host3.subscription_facet.uuid}",
+          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
           "ip_addresses": [
@@ -171,7 +159,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
             "fd6e:2298:736e::857",
             "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
           ],
-          "fqdn": "#{@host3.fqdn}",
+          "fqdn": "rhel8-demo.oss-lab.net",
           "mac_addresses": [
             "6e:66:a6:fe:fc:07",
             "00:00:00:00:00:00"
@@ -254,7 +242,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be SYNC for inventory hosts' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
@@ -266,7 +253,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
@@ -275,26 +261,4 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
   end
-
-  test 'Task should be aborted if token is not present' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: '')
-
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
-
-    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
-  end
-
-  test 'Should skip hosts that are not returned in query' do
-    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
-
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
-    @host2.reload
-
-    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
-  end
 end