diff options
Diffstat (limited to 'app/workers/packages/debian')
3 files changed, 5 insertions, 24 deletions
diff --git a/app/workers/packages/debian/generate_distribution_worker.rb b/app/workers/packages/debian/generate_distribution_worker.rb index 822fe5a1517..1eff3ea02dd 100644 --- a/app/workers/packages/debian/generate_distribution_worker.rb +++ b/app/workers/packages/debian/generate_distribution_worker.rb @@ -4,7 +4,6 @@ module Packages module Debian class GenerateDistributionWorker include ApplicationWorker - include ::Packages::FIPS data_consistency :always include Gitlab::Utils::StrongMemoize @@ -21,8 +20,6 @@ module Packages loggable_arguments 0 def perform(container_type, distribution_id) - raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled? - @container_type = container_type @distribution_id = distribution_id diff --git a/app/workers/packages/debian/process_changes_worker.rb b/app/workers/packages/debian/process_changes_worker.rb index d477a6f2e1f..0a716c61203 100644 --- a/app/workers/packages/debian/process_changes_worker.rb +++ b/app/workers/packages/debian/process_changes_worker.rb @@ -4,7 +4,6 @@ module Packages module Debian class ProcessChangesWorker include ApplicationWorker - include ::Packages::FIPS data_consistency :always include Gitlab::Utils::StrongMemoize @@ -16,8 +15,6 @@ module Packages feature_category :package_registry def perform(package_file_id, user_id) - raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled? - @package_file_id = package_file_id @user_id = user_id @@ -25,8 +22,6 @@ module Packages ::Packages::Debian::ProcessChangesService.new(package_file, user).execute rescue StandardError => e - raise if e.instance_of?(DisabledError) - Gitlab::ErrorTracking.log_exception(e, package_file_id: @package_file_id, user_id: @user_id) package_file.destroy! end diff --git a/app/workers/packages/debian/process_package_file_worker.rb b/app/workers/packages/debian/process_package_file_worker.rb index 587c0b78c9c..e9d6ad57749 100644 --- a/app/workers/packages/debian/process_package_file_worker.rb +++ b/app/workers/packages/debian/process_package_file_worker.rb @@ -4,7 +4,6 @@ module Packages module Debian class ProcessPackageFileWorker include ApplicationWorker - include ::Packages::FIPS include Gitlab::Utils::StrongMemoize data_consistency :always @@ -15,25 +14,20 @@ module Packages queue_namespace :package_repositories feature_category :package_registry - def perform(package_file_id, user_id, distribution_name, component_name) - raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled? - + def perform(package_file_id, distribution_name, component_name) @package_file_id = package_file_id - @user_id = user_id @distribution_name = distribution_name @component_name = component_name - return unless package_file && user && distribution_name && component_name + return unless package_file && distribution_name && component_name # return if file has already been processed return unless package_file.debian_file_metadatum&.unknown? - ::Packages::Debian::ProcessPackageFileService.new(package_file, user, distribution_name, component_name).execute + ::Packages::Debian::ProcessPackageFileService.new(package_file, distribution_name, component_name).execute rescue StandardError => e - raise if e.instance_of?(DisabledError) - - Gitlab::ErrorTracking.log_exception(e, package_file_id: @package_file_id, user_id: @user_id, + Gitlab::ErrorTracking.log_exception(e, package_file_id: @package_file_id, distribution_name: @distribution_name, component_name: @component_name) - package_file.destroy! + package_file.package.update_column(:status, :error) end private @@ -42,11 +36,6 @@ module Packages ::Packages::PackageFile.find_by_id(@package_file_id) end strong_memoize_attr :package_file - - def user - ::User.find_by_id(@user_id) - end - strong_memoize_attr :user end end end |