foreman_rh_cloud 12.2.1 → 12.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5297c9be7a8e61f55e175c20b5f322b19c015d9a29bdd9c1bf42248ad1ffedf
-  data.tar.gz: 59cab12bcca78ee78eba81af4c0089f1dcaac84b35244936b707692c4881f7ba
+  metadata.gz: b3bc2f9bf0700b7f22d4bee9c0b1f02b10d7b91a441bfa125f38cf2b3b00f655
+  data.tar.gz: 21a3c48d1720f8ffbea0dd00fbf3b660dc6adea2a097254fd4c9a6c85791f49b
 SHA512:
-  metadata.gz: d8a544fe9144aad08668231c90d3c221a316501dc3d7f3766c444d2617c22949a5d4bde889960f6ff5cd9a6005f07885cb99ca059ab8b64ca7a5f058fc8df192
-  data.tar.gz: 123d446d857e98c371c362b26af1be131e59d41c7ade186a11d061fcb5078b39358a998be23eceb1e4dafcc66e9e6a8dd10c70652ad60b13f01d54675fbd4576
+  metadata.gz: 12b3933a12e68f827cd1a3130be3c4f0907eaa2235c2ac7850a734c7b8fc9e89780d2c87287874d6067337a3679c331d151cf695b5d4e3ad24647434e0a96714
+  data.tar.gz: 278421740888ba600cfd295c43e8eefb649053a4153430f74ff8729e32312f18d93723db1193de8bdc7cb82c96e5c4307405455671035407c978b8d659ab136a

data/app/controllers/api/v2/rh_cloud/advisor_engine_config_controller.rb

@@ -7,7 +7,7 @@ module Api
         api :GET, "/rh_cloud/advisor_engine_config", N_("Show if system is configured to use local iop-advisor-engine.")
         def show
           render json: {
-            use_local_advisor_engine: ForemanRhCloud.with_local_advisor_engine?,
+            use_iop_mode: ForemanRhCloud.with_iop_smart_proxy?,
           }, status: :ok
         end
       end

data/app/controllers/api/v2/rh_cloud/cloud_request_controller.rb

@@ -1,7 +1,10 @@
 module Api::V2::RhCloud
   class CloudRequestController < ::Api::V2::BaseController
+    include ForemanRhCloud::IopSmartProxyAccess
     layout false
 
+    before_action :require_non_iop_smart_proxy, only: [:update]
+
     KNOWN_DIRECTIVES = {
       'playbook-sat' => :handle_run_playbook_request,
       'foreman_rh_cloud' => :handle_run_playbook_request,

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -5,6 +5,9 @@ module Api
         include ::Api::Version2
         include InventoryUpload::ReportActions
         include InventoryUpload::TaskActions
+        include ForemanRhCloud::IopSmartProxyAccess
+
+        before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
         api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
         param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")

data/app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb

@@ -0,0 +1,28 @@
+module ForemanRhCloud
+  module IopSmartProxyAccess
+    extend ActiveSupport::Concern
+
+    private
+
+    def require_non_iop_smart_proxy
+      return unless ForemanRhCloud.with_iop_smart_proxy?
+
+      handle_iop_access_error('This feature is not available when using IoP Smart Proxy')
+    end
+
+    def require_iop_smart_proxy
+      return if ForemanRhCloud.with_iop_smart_proxy?
+
+      handle_iop_access_error('This feature is not available without IoP Smart Proxy')
+    end
+
+    def handle_iop_access_error(message)
+      if api_request?
+        not_found(message)
+      else
+        error(message)
+        redirect_back(fallback_location: main_app.root_path)
+      end
+    end
+  end
+end

data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb

@@ -10,7 +10,7 @@ module InsightsCloud
     end
 
     def generate_host_report
-      return unless ForemanRhCloud.with_local_advisor_engine?
+      return unless ForemanRhCloud.with_iop_smart_proxy?
 
       logger.debug("Generating host-specific report for host #{@host.name}")
 

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -1,6 +1,9 @@
 module ForemanInventoryUpload
   class UploadsController < ::ApplicationController
     include InventoryUpload::ReportActions
+    include ForemanRhCloud::IopSmartProxyAccess
+
+    before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
     def last
       label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])

data/app/controllers/foreman_rh_cloud/foreman_rh_cloud_controller.rb

@@ -0,0 +1,22 @@
+module ForemanRhCloud
+  class ForemanRhCloudController < ApplicationController
+    include ForemanRhCloud::IopSmartProxyAccess
+    layout 'layouts/react_application'
+    skip_before_action :authorize, :only => :index
+
+    before_action :require_iop_smart_proxy, only: [:recommendations]
+
+    def index
+      response.headers['X-Request-Path'] = request.path
+      render("react/index", formats: [:html])
+    end
+
+    def inventory_upload
+      index
+    end
+
+    def recommendations
+      index
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module InsightsCloud::Api
     skip_after_action :log_response_body, :only => [:forward_request]
     skip_before_action :check_media_type, :only => [:forward_request]
     after_action :update_host_insights_status, only: [:forward_request]
+    after_action :update_host_facet, only: [:forward_request], if: -> { ForemanRhCloud.with_iop_smart_proxy? }
 
     # The method that "proxies" requests over to Cloud
     def forward_request
@@ -117,14 +118,27 @@ module InsightsCloud::Api
     end
 
     def update_host_insights_status
-      return unless request.path == '/redhat_access/r/insights/platform/ingress/v1/upload' ||
-                    request.path.include?('/redhat_access/r/insights/uploads/')
-
-      return unless @cloud_response.code.to_s.start_with?('2')
-
+      return unless upload_success?
       # create insights status if it wasn't there in the first place and refresh its reporting date
       @host.get_status(InsightsClientReportStatus).refresh!
       @host.refresh_global_status!
     end
+
+    def update_host_facet
+      return unless upload_success?
+
+      # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already
+      # exist in the local inventory. This will also handle facet creation for new hosts.
+      return if @host.insights
+
+      insights_facet = @host.build_insights(uuid: @host.subscription_facet.uuid)
+      insights_facet.save
+    end
+
+    def upload_success?
+      @cloud_response&.code&.to_s&.start_with?('2') &&
+        (request.path == '/redhat_access/r/insights/platform/ingress/v1/upload' ||
+          request.path.include?('/redhat_access/r/insights/uploads/'))
+    end
   end
 end

data/app/services/foreman_rh_cloud/cert_auth.rb

@@ -11,7 +11,7 @@ module ForemanRhCloud
 
     def execute_cloud_request(params)
       organization = params.delete(:organization)
-      certs = ForemanRhCloud.with_local_advisor_engine? ? foreman_certificate : candlepin_id_cert(organization)
+      certs = ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : candlepin_id_cert(organization)
       final_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
         ssl_client_key: OpenSSL::PKey.read(certs[:key]),

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -8,7 +8,7 @@ module ForemanRhCloud
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
-      if ForemanRhCloud.with_local_advisor_engine?
+      if ForemanRhCloud.with_iop_smart_proxy?
         final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
       end
 

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -37,7 +37,7 @@ module ForemanRhCloud
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
       params = path_params(requested_url)
 
-      if ForemanRhCloud.with_local_advisor_engine?
+      if ForemanRhCloud.with_iop_smart_proxy?
         params[:ssl_ca_file] = ForemanRhCloud.ca_cert
       end
 

data/app/services/foreman_rh_cloud/hit_remediations_retriever.rb

@@ -2,24 +2,34 @@ module ForemanRhCloud
   class HitRemediationsRetriever < RemediationsRetriever
     def initialize(hit_remediation_pairs, logger: Logger.new(IO::NULL))
       super(logger: logger)
-      @hit_remediation_pairs = hit_remediation_pairs
+      @is_iop = ForemanRhCloud.with_iop_smart_proxy?
+      @hit_remediation_pairs = (hit_remediation_pairs || []).map(&:with_indifferent_access)
       logger.debug("Querying playbook for #{hit_remediation_pairs}")
     end
 
     private
 
     def hit_ids
+      # hit_ids are host ids
       @hit_remediation_pairs.map { |pair| pair["hit_id"] }
     end
 
     def remediation_ids
+      # In IoP, these are Insights rule IDs. For Hosted, they are Foreman database IDs
       @hit_remediation_pairs.map { |pair| pair["resolution_id"] }
     end
 
     def hits
-      @hits ||= Hash[
-        InsightsHit.joins(:insights_facet).where(id: hit_ids).pluck(:id, 'insights_facets.uuid')
-      ]
+      if @is_iop
+        # Return the hit_id unaltered. With IoP, host ids are already translated
+        @hits = Hash[@hit_remediation_pairs.map { |pair| [pair[:hit_id], pair[:hit_id]] }]
+      else
+        # Return a hash which maps Foreman host ID to Insights-flavored ID
+        @hits ||= Hash[
+          InsightsHit.joins(:insights_facet).where(id: hit_ids).pluck(:id, 'insights_facets.uuid')
+        ]
+      end
+      @hits
     end
 
     def pairs_by_remediation_id
@@ -27,11 +37,18 @@ module ForemanRhCloud
     end
 
     def remediations
-      @remediations ||= Hash[
-        InsightsResolution.where(id: remediation_ids).pluck(:id, :resolution_type, :rule_id).map do |id, resolution_type, rule_id|
-          [id, { resolution_type: resolution_type, rule_id: rule_id }]
-        end
-      ]
+      if @is_iop
+        @remediations = Hash[
+          @hit_remediation_pairs.map { |pair| [pair['resolution_id'], { resolution_type: pair['resolution_type'], rule_id: pair['rule_id'] }] }
+        ]
+      else
+        @remediations ||= Hash[
+          InsightsResolution.where(id: remediation_ids).pluck(:id, :resolution_type, :rule_id).map do |id, resolution_type, rule_id|
+            [id, { resolution_type: resolution_type, rule_id: rule_id }]
+          end
+        ]
+      end
+      @remediations
     end
 
     def playbook_request
@@ -65,7 +82,7 @@ module ForemanRhCloud
     end
 
     def organization
-      InsightsHit.find(@hit_remediation_pairs.first['hit_id']).host.organization
+      @is_iop ? Organization.current : InsightsHit.find(@hit_remediation_pairs.first['hit_id']).host.organization
     end
   end
 end

data/app/views/api/v2/hosts/insights/base.rabl

@@ -6,6 +6,6 @@ end
 node :insights_hits_count do |facet|
   facet.hits&.count
 end
-node :use_local_advisor_engine do |_facet|
-  ForemanRhCloud.with_local_advisor_engine?
+node :use_iop_mode do |_facet|
+  ForemanRhCloud.with_iop_smart_proxy?
 end

data/app/views/api/v2/hosts/insights/single.rabl

@@ -1,5 +1,5 @@
 node :vulnerability do
   {
-    enabled: ForemanRhCloud.with_local_advisor_engine?,
+    enabled: ForemanRhCloud.with_iop_smart_proxy?,
   }
 end

data/config/routes.rb

@@ -9,9 +9,7 @@ Rails.application.routes.draw do
     get 'settings', to: 'uploads_settings#index'
     post 'setting', to: 'uploads_settings#set_advanced_setting'
 
-    unless ForemanRhCloud.with_local_advisor_engine?
-      post 'cloud_connector', to: 'uploads#enable_cloud_connector'
-    end
+    post 'cloud_connector', to: 'uploads#enable_cloud_connector'
 
     resources :tasks, only: [:create, :show]
 
@@ -35,13 +33,9 @@ Rails.application.routes.draw do
   end
 
   namespace :foreman_rh_cloud do
-    unless ForemanRhCloud.with_local_advisor_engine?
-      get 'inventory_upload', to: '/react#index'
-    end
-    if ForemanRhCloud.with_local_advisor_engine?
-      get 'recommendations', to: '/react#index'
-      get 'recommendations/:rule_id', to: '/react#index'
-    end
+    get 'inventory_upload', to: 'foreman_rh_cloud#inventory_upload'
+    get 'recommendations', to: 'foreman_rh_cloud#recommendations'
+    get 'recommendations/:rule_id', to: 'foreman_rh_cloud#recommendations'
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
     get 'insights_vulnerability', to: '/react#index'
     get 'insights_vulnerability/:cve_id', to: '/react#index'
@@ -79,10 +73,8 @@ Rails.application.routes.draw do
       end
 
       namespace 'rh_cloud' do
-        unless ForemanRhCloud.with_local_advisor_engine?
-          post 'enable_connector', to: 'inventory#enable_cloud_connector'
-          post 'cloud_request', to: 'cloud_request#update'
-        end
+        post 'enable_connector', to: 'inventory#enable_cloud_connector'
+        post 'cloud_request', to: 'cloud_request#update'
         get 'advisor_engine_config', to: 'advisor_engine_config#show'
       end
 

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -13,7 +13,7 @@ module ForemanInventoryUpload
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self # so that 'run' runs
         else
           after_delay do
@@ -34,7 +34,7 @@ module ForemanInventoryUpload
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def rescue_strategy_for_self

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -60,7 +60,7 @@ module ForemanInventoryUpload
       end
 
       def certificate
-        ForemanRhCloud.with_local_advisor_engine? ? foreman_certificate : manifest_certificate
+        ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : manifest_certificate
       end
 
       def manifest_certificate

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -213,6 +213,8 @@ module ForemanInventoryUpload
               first = false
             end
           end
+
+          report_yum_repos(host)
         end
         @stream.simple_field('satellite_managed', true, :last)
       end
@@ -248,6 +250,28 @@ module ForemanInventoryUpload
       def os_release_value(name, version, codename)
         "#{name} #{version} (#{codename})"
       end
+
+      def report_yum_repos(host)
+        return unless host&.content_facet&.bound_repositories&.any?
+        return unless ForemanRhCloud.with_iop_smart_proxy?
+
+        @stream.array_field('yum_repos') do
+          host.content_facet.bound_repositories.each_with_index do |repo, index|
+            report_yum_repo(host.content_source.load_balancer_pulp_content_url, repo)
+            @stream.comma unless index == host.content_facet.bound_repositories.count - 1
+          end
+        end
+      end
+
+      def report_yum_repo(url_prefix, repo)
+        @stream.object do
+          @stream.simple_field('name', repo.content.name)
+          @stream.simple_field('id', repo.content.label)
+          @stream.simple_field('base_url', "#{url_prefix}/#{repo.generate_repo_path(repo.content.content_url)}")
+          @stream.simple_field('enabled', true)
+          @stream.simple_field('gpgcheck', true, :last)
+        end
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -121,8 +121,12 @@ module ForemanRhCloud
     end
   end
 
-  def self.with_local_advisor_engine?
-    SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
+  def self.with_iop_smart_proxy?
+    SmartProxy.with_features('iop').exists?
+  end
+
+  def self.iop_smart_proxy
+    SmartProxy.with_features('iop').first
   end
 
   def self.ca_cert

data/lib/foreman_rh_cloud/plugin.rb

@@ -48,6 +48,7 @@ module ForemanRhCloud
             'foreman_inventory_upload/uploads_settings': [:index],
             'foreman_inventory_upload/missing_hosts': [:index],
             'api/v2/rh_cloud/advisor_engine_config': [:show],
+            'foreman_rh_cloud/foreman_rh_cloud': [:inventory_upload, :recommendations],
             'react': [:index]
           )
           permission(
@@ -87,7 +88,8 @@ module ForemanRhCloud
             caption: N_('Inventory Upload'),
             url: '/foreman_rh_cloud/inventory_upload',
             url_hash: { controller: :react, action: :index },
-            parent: :insights_menu
+            parent: :insights_menu,
+            if: -> { !ForemanRhCloud.with_iop_smart_proxy? }
           menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
           menu :top_menu,
             :insights_vulnerability,
@@ -95,9 +97,19 @@ module ForemanRhCloud
             url: '/foreman_rh_cloud/insights_vulnerability',
             url_hash: { controller: :react, action: :index },
             parent: :insights_menu,
-            if: -> { ForemanRhCloud.with_local_advisor_engine? }
+            if: -> { ForemanRhCloud.with_iop_smart_proxy? }
         end
 
+        # In IoP case we want the page to be in the admin menu
+        menu :admin_menu,
+          :inventory_upload,
+          caption: N_('Inventory Upload'),
+          url: '/foreman_rh_cloud/inventory_upload',
+          url_hash: { controller: :react, action: :index },
+          parent: :administer_menu,
+          before: :upgrade,
+          if: -> { ForemanRhCloud.with_iop_smart_proxy? }
+
         register_facet InsightsFacet, :insights do
           configure_host do
             api_view :list => 'api/v2/hosts/insights/insights', :single => 'api/v2/hosts/insights/single'

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.1'.freeze
+  VERSION = '12.2.2'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -4,13 +4,12 @@ require 'uri'
 
 module ForemanRhCloud
   def self.on_premise_url
-    return unless ForemanRhCloud.with_local_advisor_engine?
-    port = ENV['ADVISOR_ENGINE_PORT'] || "24443"
-    ENV['ADVISOR_ENGINE_URL'] || "https://localhost:#{port}"
+    return unless ForemanRhCloud.with_iop_smart_proxy?
+    ForemanRhCloud.iop_smart_proxy&.url
   end
 
   def self.env_or_on_premise_url(env_var_name)
-    ENV[env_var_name] || on_premise_url
+    on_premise_url || ENV[env_var_name]
   end
 
   def self.base_url
@@ -47,7 +46,7 @@ module ForemanRhCloud
   end
 
   def self.proxy_string
-    return '' if ForemanRhCloud.with_local_advisor_engine?
+    return '' if ForemanRhCloud.with_iop_smart_proxy?
 
     HttpProxy.default_global_content_proxy&.full_url ||
     ForemanRhCloud.global_foreman_proxy ||
@@ -106,7 +105,7 @@ module ForemanRhCloud
   end
 
   def self.legacy_insights_ca
-    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem" unless ForemanRhCloud.with_local_advisor_engine?
+    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem" unless ForemanRhCloud.with_iop_smart_proxy?
   end
 
   def self.cloud_url_validator

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InsightsCloud
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self
         else
           after_delay do
@@ -23,7 +23,7 @@ module InsightsCloud
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_full_sync

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -9,7 +9,7 @@ module InventorySync
 
       def plan(organizations)
         # Do not run for local advisor, since we use sub-man id to identify hosts.
-        return if ForemanRhCloud.with_local_advisor_engine?
+        return if ForemanRhCloud.with_iop_smart_proxy?
         # by default the tasks will be executed concurrently
         super(organizations)
         plan_self_host_sync

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InventorySync
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self # so that 'run' runs
         else
           after_delay do
@@ -35,7 +35,7 @@ module InventorySync
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_remove_insights_hosts(org_id)

data/lib/tasks/insights.rake

@@ -24,7 +24,7 @@ namespace :rh_cloud_insights do
   desc "Re-announce all organizations into Sources on RH cloud."
   task announce_to_sources: [:environment] do
     logger = Logging::Logger.new(STDOUT)
-    if ForemanRhCloud.with_local_advisor_engine?
+    if ForemanRhCloud.with_iop_smart_proxy?
       logger.warn('Task announce_to_sources is not available when using local advisor engine')
     else
       Organization.unscoped.each do |org|

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,7 +9,7 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
@@ -45,6 +45,24 @@ namespace :rh_cloud_inventory do
           archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
           archived_report_generator.render(organization: organization, filter: filter)
           puts "Successfully generated #{target} for organization id #{organization}"
+
+          next unless ForemanRhCloud.with_iop_smart_proxy?
+
+          puts 'Creating missing insights facets'
+          hosts_without_facets = ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+          hosts_without_facets.each do |batch|
+            facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
+              {
+                host_id: host_id,
+                uuid: uuid,
+              }
+            end
+            # We don't need to validate the facets here as we create the necessary fields.
+            # rubocop:disable Rails/SkipsModelValidations
+            InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
+            # rubocop:enable Rails/SkipsModelValidations
+          end
+          puts 'Missing Insights facets created'
         end
       end
     end
@@ -53,7 +71,7 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
       puts "Uploaded #{report_file}"
     end

data/package.json

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

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

@@ -17,8 +17,8 @@ module InsightsCloud::Api
         @http_req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
 
         org = FactoryBot.create(:organization)
-        host = FactoryBot.create(:host, :with_subscription, :organization => org)
-        User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
+        @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
@@ -151,6 +151,20 @@ module InsightsCloud::Api
         assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
         assert_match /#{@body}/, JSON.parse(@response.body)['response']
       end
+
+      test "should create insights facet" do
+        assert_nil InsightsFacet.find_by(host_id: @host.id)
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+        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" => "/redhat_access/r/insights/uploads/" }
+
+        assert_not_nil InsightsFacet.find_by(host_id: @host.id)
+      end
     end
 
     context '#branch_info' do
@@ -166,7 +180,10 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          content_facet: FactoryBot.build(
+            :content_facet,
+            content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+          ),
           organization: env.organization
         )
 

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
   def setup
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
   end
 
   test 'should return allow_auto_insights_sync setting' do