foreman_rh_cloud 1.0.18 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222e7f5392e6276d4c38fdeb9bdbbf1078bcbbbc10bbf4aa3eb841ed1395bff9
-  data.tar.gz: 746a4388499f65ad2691188ccb36e0936486222ed7a278bb90e35ce27adff85f
+  metadata.gz: 1f6361a25739c19a67518378257d51f67fc443839d76d7d07f5bd597f09ef15d
+  data.tar.gz: b558ad39920b634ee4c9be77ec20f65235eb3193de374879dc85bc284a15bfa5
 SHA512:
-  metadata.gz: 19504446398f9dca2bee75c9a89265fc9b67b24e43b018c516a0fbc8351f7e4f888f3c4295606049ea15390b8291599401913cfc8d974ca0d86be9029ff2a5f8
-  data.tar.gz: ce53ae2e0a0b1eba451d8e7b498fbd7c50257416c5604ae57df4cfbab6e5815e2cf91ddfd1f3ffa0b89933201dd01f68904fe7e50514a042a4685ddffdbc35f7
+  metadata.gz: 83b2169b736d8c57d544b8ce53bda7e91e4741efdd384953fd32a22ac96e531282e97ef740112a7be5310ef44fc0569fe8995972304844302d0b2eb3db6215f8
+  data.tar.gz: 3b7bbd7d76a68b5b41874472961eabd2360de0ad871705430d7549d8c44b48e5811ba9d566d74a3c0a8774b7c3b4c0c5a0f75ae57f2f38519ef528e12239c4f3

data/README.md

@@ -11,39 +11,6 @@ for how to install Foreman plugins
 
 *Usage here*
 
-### In Satellite
-
-#### Inventory upload
-
-In UI: Configure -> Inventory Upload -> Restart
-
-From command-line:
-
-    export organization_id=1
-    export target=/var/lib/foreman/red_hat_inventory/generated_reports/
-    /usr/sbin/foreman-rake rh_cloud_inventory:report:generate
-
-#### Fetch hosts remediation data
-
-In UI: Configure -> Insights -> Sync now
-
-From command-line:
-
-    /usr/sbin/foreman-rake rh_cloud_inventory:sync
-
-#### Synchronize inventory status
-
-In UI: Configure -> Inventory Upload -> Sync inventory status
-
-From command-line:
-
-    # all organizations
-    /usr/sbin/foreman-rake rh_cloud_insights:sync
-    
-    # specific organization with id 1
-    export organization_id=1
-    /usr/sbin/foreman-rake rh_cloud_insights:sync
-
 ## TODO
 
 *Todo list here*

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -1,8 +1,12 @@
 module ForemanInventoryUpload
   class AccountsController < ::ApplicationController
+    # override default "welcome screen behavior, since we don't have a model"
+    def welcome
+      true
+    end
+
     def index
-      organizations = User.current.my_organizations
-      labels = organizations.pluck(:id, :name)
+      labels = Organization.all.pluck(:id, :name)
 
       accounts = Hash[
         labels.map do |id, label|
@@ -10,22 +14,17 @@ module ForemanInventoryUpload
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
 
           [
-            label,
+            id,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
-              id: id,
+              label: label,
             },
           ]
         end
       ]
 
       render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
-        hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
-        ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
-        cloudToken: Setting[:rh_cloud_token],
-        excludePackages: Setting[:exclude_installed_packages],
         accounts: accounts,
       }, status: :ok
     end

data/app/controllers/foreman_inventory_upload/react_controller.rb

@@ -0,0 +1,7 @@
+module ForemanInventoryUpload
+  class ReactController < ::ApplicationController
+    def index
+      render 'foreman_inventory_upload/layouts/react', :layout => false
+    end
+  end
+end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -11,58 +11,21 @@ module ForemanInventoryUpload
 
     def download_file
       filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
-      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
+      path = Rails.root.join(ForemanInventoryUpload.uploads_folder, filename)
+      unless File.exist? path
+        return throw_flash_error(
+          "Path doesn't exist: #{path}"
+        )
+      end
 
-      return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
-      raise ::Foreman::Exception.new("The report file doesn't exist")
+      send_file path, disposition: 'attachment', filename: filename
     end
 
-    def auto_upload
-      Setting[:allow_auto_inventory_upload] = auto_upload_params
-      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
-    end
-
-    def show_auto_upload
-      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
-    end
-
-    def auto_upload_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def host_obfuscation
-      Setting[:obfuscate_inventory_hostnames] = host_obfuscation_params
-      render_setting(:hostObfuscationEnabled, :obfuscate_inventory_hostnames)
-    end
-
-    def host_obfuscation_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def installed_packages_inclusion
-      Setting[:exclude_installed_packages] = host_obfuscation_params
-      render_setting(:excludePackages, :exclude_installed_packages)
-    end
-
-    def installed_packages_inclusion_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    def ips_obfuscation
-      Setting[:obfuscate_inventory_ips] = ips_obfuscation_params
-      render_setting(:ipsObfuscationEnabled, :obfuscate_inventory_ips)
-    end
-
-    def ips_obfuscation_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
-
-    private
-
-    def render_setting(node_name, setting)
-      render json: {
-        node_name => Setting[setting],
-      }
+    def throw_flash_error(message)
+      process_error(
+        :redirect => foreman_inventory_upload_index_path,
+        :error_msg => message
+      )
     end
   end
 end

data/app/views/{layouts/foreman_rh_cloud/application.html.erb → foreman_inventory_upload/layouts/react.html.erb}

@@ -10,7 +10,7 @@
   <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <div id="ForemanRhCloudReactRoot"></div>
-  <%= yield %>
+  <div id="ForemanInventoryUploadReactRoot"></div>
 <% end %>
 <%= render file: "layouts/base" %>
+<%= mount_react_component('ForemanInventoryUpload', '#ForemanInventoryUploadReactRoot') %>

data/config/routes.rb

@@ -1,27 +1,10 @@
 Rails.application.routes.draw do
   namespace :foreman_inventory_upload do
+    get 'index', to: 'react#index'
     get ':organization_id/reports/last', to: 'reports#last', constraints: { organization_id: %r{[^\/]+} }
     post ':organization_id/reports', to: 'reports#generate', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
     get 'accounts', to: 'accounts#index'
-    get 'auto_upload', to: 'uploads#show_auto_upload'
-    post 'auto_upload', to: 'uploads#auto_upload'
-    post 'host_obfuscation', to: 'uploads#host_obfuscation'
-    post 'installed_packages_inclusion', to: 'uploads#installed_packages_inclusion'
-    post 'ips_obfuscation', to: 'uploads#ips_obfuscation'
-
-    resources :tasks, only: [:create]
-  end
-
-  namespace :insights_cloud do
-    resources :tasks, only: [:create]
-    resource :settings, only: [:show, :update]
-    get 'hits/:host_id', to: 'hits#index'
-  end
-
-  namespace :foreman_rh_cloud do
-    get 'inventory_upload', to: 'react#inventory_upload'
-    get 'insights_cloud', to: 'react#insights_cloud'
   end
 end

data/lib/foreman_inventory_upload.rb

@@ -18,18 +18,6 @@ module ForemanInventoryUpload
     )
   end
 
-  def self.uploads_file_path(filename)
-    File.join(ForemanInventoryUpload.uploads_folder, filename)
-  end
-
-  def self.done_folder
-    File.join(ForemanInventoryUpload.uploads_folder, 'done/')
-  end
-
-  def self.done_file_path(filename)
-    File.join(ForemanInventoryUpload.done_folder, filename)
-  end
-
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(
@@ -48,7 +36,7 @@ module ForemanInventoryUpload
   end
 
   def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.xz"
+    "report_for_#{organization}.tar.gz"
   end
 
   def self.upload_url
@@ -60,9 +48,4 @@ module ForemanInventoryUpload
     FileUtils.mkdir_p(folder)
     folder
   end
-
-  def self.inventory_export_url
-    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
-    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
-  end
 end

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -2,14 +2,6 @@ module ForemanInventoryUpload
   module Async
     class GenerateAllReportsJob < ::ApplicationJob
       def perform
-        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
-
         organizations = Organization.unscoped.all
 
         organizations.map do |organization|

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -23,7 +23,7 @@ module ForemanInventoryUpload
       end
 
       def command
-        "#{rake_prefix}rake rh_cloud_inventory:report:generate"
+        "#{rake_prefix}rake foreman_inventory_upload:report:generate"
       end
 
       def env

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -3,35 +3,27 @@ require 'open3'
 module ForemanInventoryUpload
   module Async
     class ShellProcess < ::ApplicationJob
-      include AsyncHelpers
-
       def perform(instance_label)
         klass_name = self.class.name
         logger.debug("Starting #{klass_name} with label #{instance_label}")
-        progress_output_for(instance_label) do |progress_output|
-          Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
-            progress_output.status = "Running in pid #{wait_thread.pid}"
-
-            stdout_stderr.each do |out_line|
-              progress_output.write_line(out_line)
-            end
+        progress_output = ProgressOutput.register(instance_label)
+        Open3.popen2e(env, command) do |_stdin, stdout_stderr, wait_thread|
+          progress_output.status = "Running in pid #{wait_thread.pid}"
 
-            progress_output.status = wait_thread.value.to_s
+          stdout_stderr.each do |out_line|
+            progress_output.write_line(out_line)
           end
+
+          progress_output.status = wait_thread.value.to_s
         end
         logger.debug("Finished job #{klass_name} with label #{instance_label}")
+      ensure
+        progress_output.close
       end
 
       def command
       end
 
-      def progress_output_for(instance_label)
-        progress_output = ProgressOutput.register(instance_label)
-        yield(progress_output)
-      ensure
-        progress_output.close
-      end
-
       def env
         {}
       end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -8,33 +8,15 @@ module ForemanInventoryUpload
       end
 
       def perform(filename, organization_id)
-        label = UploadReportJob.output_label(organization_id)
         @filename = filename
         @organization = Organization.find(organization_id)
 
-        if Setting[:content_disconnected]
-          progress_output_for(label) do |progress_output|
-            progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
-            progress_output.status = "Task aborted, exit 1"
-          end
-          return
-        end
-
-        unless @organization.owner_details&.fetch('upstreamConsumer')&.fetch('idCert')
-          logger.info("Skipping organization '#{@organization}', no candlepin certificate defined.")
-          progress_output_for(label) do |progress_output|
-            progress_output.write_line("Skipping organization #{@organization}, no candlepin certificate defined.")
-            progress_output.status = "Task aborted, exit 1"
-          end
-          return
-        end
-
         Tempfile.create([@organization.name, '.pem']) do |cer_file|
           cer_file.write(rh_credentials[:cert])
           cer_file.write(rh_credentials[:key])
           cer_file.flush
           @cer_path = cer_file.path
-          super(label)
+          super(UploadReportJob.output_label(organization_id))
         end
       end
 
@@ -47,8 +29,6 @@ module ForemanInventoryUpload
           'FILES' => @filename,
           'CER_PATH' => @cer_path
         )
-
-        http_proxy_string = ForemanRhCloud.http_proxy_string(logger: logger)
         if http_proxy_string
           env_vars['http_proxy'] = http_proxy_string
           env_vars['https_proxy'] = http_proxy_string
@@ -56,6 +36,10 @@ module ForemanInventoryUpload
         env_vars
       end
 
+      def http_proxy_string
+        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
+      end
+
       def rh_credentials
         @rh_credentials ||= begin
           candlepin_id_certificate = @organization.owner_details['upstreamConsumer']['idCert']

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -16,9 +16,9 @@ module ForemanInventoryUpload
               first = true
               host_batches.each do |hosts_batch|
                 slice_id = Foreman.uuid
-                @logger.info "Adding slice #{slice_id}"
-                hosts_count = generate_slice(tmpdir, slice_id, hosts_batch)
-                @logger.info "slice #{slice_id} was created with #{hosts_count} hosts"
+                hosts_count = hosts_batch.count
+                @logger.info "Adding slice #{slice_id} with #{hosts_count} hosts"
+                generate_slice(tmpdir, slice_id, hosts_batch)
                 inner_generator.add_slice(slice_id, hosts_count, first)
                 first = false
               end
@@ -28,7 +28,7 @@ module ForemanInventoryUpload
 
           @logger.info 'Archiving generated report'
           # success = system('tar', '-zcvf', @target, '-C', tmpdir, '.')
-          Open3.popen2e('tar', '-Jcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
+          Open3.popen2e('tar', '-zcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
             @logger.info("tar: #{out.read}")
 
             if wait_thr.value.success?
@@ -43,13 +43,10 @@ module ForemanInventoryUpload
       private
 
       def generate_slice(tmpdir, slice_id, hosts_batch)
-        hosts_count = 0
         File.open(File.join(tmpdir, "#{slice_id}.json"), 'w') do |slice_out|
           slice_generator = ForemanInventoryUpload::Generators::Slice.new(hosts_batch, slice_out, slice_id)
           slice_generator.render
-          hosts_count = slice_generator.hosts_count
         end
-        hosts_count
       end
     end
   end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -1,15 +1,8 @@
-require 'json'
-
 module ForemanInventoryUpload
   module Generators
     module FactHelpers
       extend ActiveSupport::Concern
 
-      CLOUD_AMAZON = 'aws'
-      CLOUD_GOOGLE = 'google'
-      CLOUD_AZURE = 'azure'
-      CLOUD_ALIBABA = 'alibaba'
-
       def fact_value(host, fact_name)
         value_record = host.fact_values.find do |fact_value|
           fact_value.fact_name_id == ForemanInventoryUpload::Generators::Queries.fact_names[fact_name]
@@ -20,90 +13,6 @@ module ForemanInventoryUpload
       def kilobytes_to_bytes(kilobytes)
         kilobytes * 1024
       end
-
-      def account_id(organization)
-        @organization_accounts ||= {}
-        @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
-      end
-
-      def golden_ticket?(organization)
-        result = organization.try(:golden_ticket?)
-        result = organization.content_access_mode == 'org_environment' if result.nil?
-
-        @organization_golden_tickets ||= {}
-        @organization_golden_tickets[organization.id] ||= result
-      end
-
-      def cloud_provider(host)
-        bios_version = fact_value(host, 'dmi::bios::version')
-
-        if bios_version
-          return CLOUD_AMAZON if bios_version.downcase['amazon']
-          return CLOUD_GOOGLE if bios_version.downcase['google']
-        end
-
-        chassis_asset_tag = fact_value(host, 'dmi::chassis::asset_tag')
-        return CLOUD_AZURE if chassis_asset_tag && chassis_asset_tag['7783-7084-3265-9085-8269-3286-77']
-
-        system_manufacturer = fact_value(host, 'dmi::system::manufacturer')
-        return CLOUD_ALIBABA if system_manufacturer && system_manufacturer.downcase['alibaba cloud']
-
-        product_name = fact_value(host, 'dmi::system::product_name')
-        return CLOUD_ALIBABA if product_name && product_name.downcase['alibaba cloud ecs']
-
-        nil
-      end
-
-      def obfuscate_hostname?(host)
-        insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
-        insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
-        return insights_client_setting unless insights_client_setting.nil?
-
-        Setting[:obfuscate_inventory_hostnames]
-      end
-
-      def fqdn(host)
-        return host.fqdn unless obfuscate_hostname?(host)
-
-        fact_value(host, 'insights_client::hostname') || obfuscate_fqdn(host.fqdn)
-      end
-
-      def obfuscate_fqdn(fqdn)
-        "#{Digest::SHA1.hexdigest(fqdn)}.example.com"
-      end
-
-      def obfuscate_ips?(host)
-        insights_client_setting = fact_value(host, 'insights_client::obfuscate_ip_enabled')
-        insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
-        return insights_client_setting unless insights_client_setting.nil?
-
-        Setting[:obfuscate_inventory_ips]
-      end
-
-      def host_ips(host)
-        return obfuscated_ips(host) if obfuscate_ips?(host)
-
-        # return a pass through proxy hash in case no obfuscation needed
-        Hash.new { |h, k| k }
-      end
-
-      def obfuscated_ips(host)
-        insights_client_ips = JSON.parse(fact_value(host, 'insights_client::ips') || '[]')
-
-        obfuscated_ips = Hash[
-          insights_client_ips.map { |ip_record| [ip_record['original'], ip_record['obfuscated']] }
-        ]
-
-        obfuscated_ips.default_proc = proc do |hash, key|
-          hash[key] = obfuscate_ip(key, hash)
-        end
-
-        obfuscated_ips
-      end
-
-      def obfuscate_ip(ip, ips_dict)
-        "10.230.230.#{ips_dict.count + 1}"
-      end
     end
   end
 end