foreman_rh_cloud 13.0.8 → 13.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba47c451526fd85b565ba8fdcb17d6b7d643cd3c6fbea186a40943a6a4887bc
-  data.tar.gz: 16357a50048143a026497016cd38533b34d211c6ea61fccf55bd2a298852766e
+  metadata.gz: 9d818ad6b4142546fe8d3b8c0e54f49600ed30915f6b22f142bc1861938c5dba
+  data.tar.gz: 3d0e310b2cf587243c64623713af21e164c87e87e21a5edeee556f16613ae8fc
 SHA512:
-  metadata.gz: c863fed43a17edb0cfdb465e4b26b529e9a09460ab9677cea6e94bc3fea6c560c8fdf01c691ea4ea2d495c7ab715db90cbee5c3bf87217e3aae135c9b29b5e2f
-  data.tar.gz: c1d61f3f092e87829a28fd1ac237f46c29772aeae926d2a3c65cba440d3233844aa8dd40eb38a18ff56a09c68f9578aaf83a142d37d1aff06679d0ba6b87c904
+  metadata.gz: ae35c83c6c45af99a891a3ff243d10f7f7616891facecab5f6afa34287f2282eb3c0175680537bb0a17b62352ea42b43d1e1d4365a517f6086c3e1d82fbd725b
+  data.tar.gz: f9e14d6356e65f5649b3c4a2f57ef381539aa296e12fbbe7c0e5fcc28c47e855bd9ad8e1ab3a9ca739319b9c9882e41de9d578244be2f1fcbd83ca8d1c4160de

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
       accounts = Hash[
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
-          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
+          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportDirectJob)
           report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
     before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
     def last
-      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
 
       render json: {

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -9,7 +9,6 @@ module ForemanInventoryUpload
       def run
         logger.debug('Ensuring objects')
         ensure_ouput_folder
-        ensure_output_script
         logger.debug("Copying #{report_file} to #{uploads_folder}")
         enqueued_file_name = File.join(uploads_folder, report_file)
         FileUtils.mv(File.join(base_folder, report_file), enqueued_file_name)
@@ -22,31 +21,10 @@ module ForemanInventoryUpload
         @uploads_folder ||= ForemanInventoryUpload.uploads_folder
       end
 
-      def script_file
-        @script_file ||= File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-      end
-
       def ensure_ouput_folder
         FileUtils.mkdir_p(uploads_folder)
       end
 
-      def ensure_output_script
-        return if File.exist?(script_file)
-
-        script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-
-        template_src = Foreman::Renderer::Source::String.new(content: File.read(script_source))
-        scope = Foreman::Renderer::Scope::Base.new(
-          source: template_src,
-          variables: {
-            upload_url: ForemanInventoryUpload.upload_url,
-          }
-        )
-        script_source = Foreman::Renderer.render(template_src, scope)
-        File.write(script_file, script_source)
-        FileUtils.chmod('+x', script_file)
-      end
-
       def logger
         Foreman::Logging.logger('background')
       end
@@ -60,7 +38,7 @@ module ForemanInventoryUpload
       end
 
       def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id)
+        plan_action(UploadReportDirectJob, enqueued_file_name, organization_id)
       end
     end
   end

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -0,0 +1,200 @@
+require 'tempfile'
+require 'rest-client'
+
+module ForemanInventoryUpload
+  module Async
+    class UploadReportDirectJob < ::Actions::EntryAction
+      include AsyncHelpers
+      include ::ForemanRhCloud::Async::ExponentialBackoff
+      include ::ForemanRhCloud::CloudRequest
+
+      # Wrapper class to avoid monkey-patching File for multipart uploads
+      class FileUpload
+        attr_reader :file, :content_type
+
+        def initialize(file, content_type:)
+          @file = file
+          @content_type = content_type
+        end
+
+        def read(*args)
+          @file.read(*args)
+        end
+
+        def path
+          @file.path
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          @file.respond_to?(method_name, include_private) || super
+        end
+
+        def method_missing(method_name, *args, &block)
+          if @file.respond_to?(method_name)
+            @file.send(method_name, *args, &block)
+          else
+            super
+          end
+        end
+      end
+
+      def self.output_label(label)
+        "upload_for_#{label}"
+      end
+
+      def plan(filename, organization_id)
+        # NOTE: This implementation assumes a single organization will not trigger multiple
+        # concurrent uploads. The instance_label is derived from organization_id alone, which
+        # means concurrent uploads for the same org would share ProgressOutput storage.
+        # This matches the pattern in GenerateReportJob. A full fix for thread-safety
+        # requires UI changes to display multiple concurrent tasks per org (tracked for PR #2).
+        label = UploadReportDirectJob.output_label(organization_id)
+        clear_task_output(label)
+        plan_self(
+          instance_label: label,
+          filename: filename,
+          organization_id: organization_id
+        )
+      end
+
+      def try_execute
+        if content_disconnected?
+          progress_output do |progress_output|
+            progress_output.write_line("Report was not moved and upload was canceled because connection to Insights is not enabled. Report location: #{filename}.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
+          logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          progress_output do |progress_output|
+            progress_output.write_line("Skipping organization #{organization}, no candlepin certificate defined.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        Tempfile.create([organization.name, '.pem']) do |cer_file|
+          cer_file.write(certificate[:cert])
+          cer_file.write(certificate[:key])
+          cer_file.flush
+          upload_report(cer_file.path)
+        end
+
+        done!
+      end
+
+      def upload_report(cer_path)
+        progress_output do |progress_output|
+          progress_output.write_line("Uploading report for organization #{organization.label}...")
+          progress_output.status = "Running upload"
+
+          begin
+            upload_file(cer_path)
+            progress_output.write_line("Upload completed successfully")
+            move_to_done_folder
+            progress_output.write_line("Uploaded file moved to done/ folder")
+            progress_output.status = "pid #{Process.pid} exit 0"
+          rescue StandardError => e
+            progress_output.write_line("Upload failed: #{e.message}")
+            progress_output.status = "pid #{Process.pid} exit 1"
+            raise
+          end
+        end
+      end
+
+      def upload_file(cer_path)
+        cert_content = File.read(cer_path)
+
+        File.open(filename, 'rb') do |file|
+          # Wrap file with FileUpload class for RestClient multipart handling
+          # RestClient requires objects with :read, :path, and :content_type methods
+          wrapped_file = FileUpload.new(file, content_type: 'application/vnd.redhat.qpc.tar+tgz')
+
+          response = execute_cloud_request(
+            method: :post,
+            url: ForemanInventoryUpload.upload_url,
+            payload: {
+              multipart: true,
+              file: wrapped_file,
+            },
+            headers: {
+              'X-Org-Id' => organization.label,
+            },
+            ssl_client_cert: OpenSSL::X509::Certificate.new(cert_content),
+            ssl_client_key: OpenSSL::PKey::RSA.new(cert_content),
+            timeout: 600,
+            open_timeout: 60
+          )
+
+          logger.debug("Upload response code: #{response.code}")
+        end
+      end
+
+      def move_to_done_folder
+        FileUtils.mkdir_p(ForemanInventoryUpload.done_folder)
+        done_file = ForemanInventoryUpload.done_file_path(File.basename(filename))
+        FileUtils.mv(filename, done_file)
+        logger.debug("Moved #{filename} to #{done_file}")
+      end
+
+      def certificate
+        ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : manifest_certificate
+      end
+
+      def manifest_certificate
+        candlepin_id_certificate = organization.owner_details['upstreamConsumer']['idCert']
+        {
+          cert: candlepin_id_certificate['cert'],
+          key: candlepin_id_certificate['key'],
+        }
+      end
+
+      def foreman_certificate
+        {
+          cert: File.read(Setting[:ssl_certificate]),
+          key: File.read(Setting[:ssl_priv_key]),
+        }
+      end
+
+      def filename
+        input[:filename]
+      end
+
+      def organization
+        Organization.find(input[:organization_id])
+      end
+
+      def content_disconnected?
+        !Setting[:subscription_connection_enabled]
+      end
+
+      def progress_output
+        progress_output = ProgressOutput.register(instance_label)
+        yield(progress_output)
+      ensure
+        progress_output.close
+      end
+
+      def instance_label
+        input[:instance_label]
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
+      def clear_task_output(label)
+        TaskOutputLine.where(label: label).delete_all
+        TaskOutputStatus.where(label: label).delete_all
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -48,10 +48,6 @@ module ForemanInventoryUpload
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end
 
-  def self.upload_script_file
-    'uploader.sh'
-  end
-
   def self.facts_archive_name(organization, filter = nil)
     "report_for_#{organization}#{filter.empty? ? nil : "[#{filter.to_s.parameterize}]"}.tar.xz"
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.8'.freeze
+  VERSION = '13.0.9'.freeze
 end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

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

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -11,7 +11,7 @@ class AccountsControllerTest < ActionController::TestCase
     generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id)
     generate_output = ForemanInventoryUpload::Async::ProgressOutput.register(generate_label)
     generate_output.status = 'generate_status_test'
-    upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
+    upload_label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
 

data/test/controllers/uploads_controller_test.rb

@@ -8,7 +8,7 @@ class UploadsControllerTest < ActionController::TestCase
     test_org = FactoryBot.create(:organization)
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id))
+      .with(ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 

data/test/jobs/queue_for_upload_job_test.rb

@@ -11,13 +11,6 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
   let(:uploads_folder) { ForemanInventoryUpload.uploads_folder }
 
   setup do
-    # Stub the script template source
-    script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-    File.stubs(:read).with(script_source).returns('#!/bin/bash\necho "Test script"')
-
-    # Stub template rendering
-    Foreman::Renderer.stubs(:render).returns('#!/bin/bash\necho "Rendered script"')
-
     # Stub additional settings that are accessed
     Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
     Setting.stubs(:[]).with(:http_proxy).returns(nil)
@@ -49,7 +42,7 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
     assert File.exist?(File.join(uploads_folder, report_file)), "File should exist in uploads folder"
   end
 
-  test 'creates necessary folders and scripts' do
+  test 'creates necessary folders' do
     ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
 
     action = create_and_plan_action(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization.id)
@@ -57,9 +50,5 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
 
     # Verify the uploads folder was created
     assert Dir.exist?(uploads_folder), "Uploads folder should be created"
-
-    # Verify the script file was created
-    script_path = File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-    assert File.exist?(script_path), "Upload script should be created"
   end
 end