katello 4.1.0.rc2.2 → 4.1.0

data/locale/zh_TW/katello.po

@@ -3137,6 +3137,9 @@ msgstr ""
 msgid "No manifest file uploaded"
 msgstr "未上傳清單檔案"
 
+msgid "No manifest found. Import a manifest with the appropriate subscriptions before importing content."
+msgstr ""
+
 msgid "No matching content views found"
 msgstr ""
 
@@ -4408,10 +4411,13 @@ msgstr ""
 msgid "Source RPM"
 msgstr "來源 RPM"
 
+msgid "Specify an export chunk size less than 1_000_000 GB"
+msgstr ""
+
 msgid "Specify the list of units in each repo"
 msgstr ""
 
-msgid "Split the exported content into archives no greater than the specified size in megabytes."
+msgid "Split the exported content into archives no greater than the specified size in gigabytes."
 msgstr ""
 
 msgid "Stacking ID"
@@ -4741,11 +4747,6 @@ msgstr ""
 msgid "The following hosts have errata that apply to them: "
 msgstr "下列主機含有套用至它們的勘誤："
 
-msgid ""
-"The following repositories provided in the import metadata are either not available in the Library or are of incorrect Respository Type. Please add or enable the repositories before importing\n"
-" %{repos}"
-msgstr ""
-
 msgid ""
 "The following repositories provided in the import metadata have an incorrect content type or provider type. Make sure the export and import repositories are of the same type before importing\n"
 " %{repos}"
@@ -4772,6 +4773,11 @@ msgstr "檔案中之位移值，位於內容開始之處"
 msgid "The order to sort the results in. ['asc', 'desc'] Defaults to 'desc'."
 msgstr ""
 
+msgid ""
+"The organization's manifest does not contain the subscriptions required to enable the following repositories.\n"
+" %{repos}"
+msgstr ""
+
 msgid "The page you are attempting to access requires selecting a specific organization."
 msgstr "您嘗試存取的網頁需要選擇特定組織。"
 

data/webpack/components/react-bootstrap-select/index.js

@@ -62,7 +62,7 @@ class BootstrapSelect extends React.Component {
                         data-count-selected-text={__('{0} items selected')}
                         defaultValue={initialValue}
                         componentClass="select"
-                        className="without_select2 without_jquery_multiselect"
+                        className="btn-group without_select2 without_jquery_multiselect"
     />;
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc2.2
+  version: 4.1.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,30 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -760,6 +774,7 @@ files:
 - app/controllers/katello/concerns/api/v2/authorization.rb
 - app/controllers/katello/concerns/api/v2/bulk_hosts_extensions.rb
 - app/controllers/katello/concerns/api/v2/content_overrides_controller.rb
+- app/controllers/katello/concerns/api/v2/host_errata_extensions.rb
 - app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb
@@ -886,7 +901,6 @@ files:
 - app/lib/actions/katello/host/destroy.rb
 - app/lib/actions/katello/host/erratum/applicable_errata_install.rb
 - app/lib/actions/katello/host/erratum/install.rb
-- app/lib/actions/katello/host/generate_applicability.rb
 - app/lib/actions/katello/host/hypervisors.rb
 - app/lib/actions/katello/host/hypervisors_update.rb
 - app/lib/actions/katello/host/package/install.rb
@@ -942,7 +956,6 @@ files:
 - app/lib/actions/katello/repository/fetch_pxe_files.rb
 - app/lib/actions/katello/repository/filtered_index_content.rb
 - app/lib/actions/katello/repository/finish_upload.rb
-- app/lib/actions/katello/repository/import_applicability.rb
 - app/lib/actions/katello/repository/import_upload.rb
 - app/lib/actions/katello/repository/index_content.rb
 - app/lib/actions/katello/repository/index_errata.rb
@@ -993,13 +1006,8 @@ files:
 - app/lib/actions/pulp/abstract.rb
 - app/lib/actions/pulp/abstract_async_task.rb
 - app/lib/actions/pulp/abstract_async_task_group.rb
-- app/lib/actions/pulp/consumer.rb
-- app/lib/actions/pulp/consumer/create.rb
-- app/lib/actions/pulp/consumer/destroy.rb
-- app/lib/actions/pulp/consumer/generate_applicability.rb
 - app/lib/actions/pulp/consumer/sync_capsule.rb
 - app/lib/actions/pulp/consumer/unassociate_units.rb
-- app/lib/actions/pulp/consumer/update.rb
 - app/lib/actions/pulp/expect_one_task.rb
 - app/lib/actions/pulp/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp/orchestration/repository/copy_all_units.rb
@@ -1044,7 +1052,6 @@ files:
 - app/lib/actions/pulp3/abstract.rb
 - app/lib/actions/pulp3/abstract_async_task.rb
 - app/lib/actions/pulp3/capsule_content/generate_metadata.rb
-- app/lib/actions/pulp3/capsule_content/refresh_content_guard.rb
 - app/lib/actions/pulp3/capsule_content/refresh_distribution.rb
 - app/lib/actions/pulp3/capsule_content/sync.rb
 - app/lib/actions/pulp3/content_guard/refresh.rb
@@ -1172,6 +1179,7 @@ files:
 - app/lib/katello/util/docker_manifest_clause_generator.rb
 - app/lib/katello/util/errata.rb
 - app/lib/katello/util/filter_clause_generator.rb
+- app/lib/katello/util/hostgroup_facets_helper.rb
 - app/lib/katello/util/http_proxy.rb
 - app/lib/katello/util/model.rb
 - app/lib/katello/util/module_stream_clause_generator.rb
@@ -1306,7 +1314,6 @@ files:
 - app/models/katello/events/delete_host_agent_queue.rb
 - app/models/katello/events/delete_pool.rb
 - app/models/katello/events/generate_host_applicability.rb
-- app/models/katello/events/import_host_applicability.rb
 - app/models/katello/events/import_pool.rb
 - app/models/katello/ext/label_from_name.rb
 - app/models/katello/file_unit.rb
@@ -1425,7 +1432,6 @@ files:
 - app/services/katello/abstract/pulp/content.rb
 - app/services/katello/agent/dispatcher.rb
 - app/services/katello/applicability/applicable_content_helper.rb
-- app/services/katello/applicable_content_helper.rb
 - app/services/katello/applicable_host_queue.rb
 - app/services/katello/authentication/client_authentication.rb
 - app/services/katello/candlepin/consumer.rb
@@ -1446,8 +1452,6 @@ files:
 - app/services/katello/product_content_importer.rb
 - app/services/katello/proxy_status/pulp.rb
 - app/services/katello/proxy_status/pulp_node.rb
-- app/services/katello/pulp/consumer.rb
-- app/services/katello/pulp/consumer_group.rb
 - app/services/katello/pulp/content.rb
 - app/services/katello/pulp/deb.rb
 - app/services/katello/pulp/distribution.rb
@@ -2125,6 +2129,8 @@ files:
 - db/migrate/20210322142311_add_auth_url_token_to_root_repositories.rb
 - db/migrate/20210331180353_katello_pool_organization_id_not_nullable.rb
 - db/migrate/20210409033915_add_created_in_katello_to_taxonomy.rb
+- db/migrate/20210512170039_add_repo_timestamps.rb
+- db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4439,6 +4445,7 @@ files:
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
 - lib/katello/tasks/delete_orphaned_content.rake
+- lib/katello/tasks/fix_hostgroup_facets.rake
 - lib/katello/tasks/import_applicability.rake
 - lib/katello/tasks/import_subscriptions.rake
 - lib/katello/tasks/jenkins.rake
@@ -4457,6 +4464,7 @@ files:
 - lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake
 - lib/katello/tasks/upgrades/4.1/fix_invalid_pools.rake
 - lib/katello/tasks/upgrades/4.1/sync_noarch_content.rake
+- lib/katello/tasks/upgrades/4.1/update_content_import_export_perms.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb
@@ -5131,9 +5139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/app/lib/actions/katello/host/generate_applicability.rb

@@ -1,41 +0,0 @@
-module Actions
-  module Katello
-    module Host
-      class GenerateApplicability < Actions::Base
-        def queue
-          ::Katello::HOST_TASKS_QUEUE
-        end
-
-        def plan(hosts, use_queue = true)
-          if SETTINGS[:katello][:katello_applicability]
-            plan_self(:host_ids => hosts.map(&:id))
-          else
-            uuids = hosts.map { |host| host.content_facet.try(:uuid) }.compact
-            unless uuids.empty?
-              plan_action(Pulp::Consumer::GenerateApplicability, :uuids => uuids)
-              plan_self(:host_ids => hosts.map(&:id), :use_queue => use_queue)
-            end
-          end
-        end
-
-        def finalize
-          if SETTINGS[:katello][:katello_applicability]
-            input[:host_ids].each do |host_id|
-              ::Katello::ApplicableHostQueue.push_host(host_id)
-            end
-            ::Katello::EventQueue.push_event(::Katello::Events::GenerateHostApplicability::EVENT_TYPE, 0)
-          else
-            input[:host_ids].each do |host_id|
-              if input[:use_queue]
-                ::Katello::EventQueue.push_event(::Katello::Events::ImportHostApplicability::EVENT_TYPE, host_id)
-              else
-                host = ::Host.find(host_id)
-                host.content_facet.try(:import_applicability, true) if host
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/katello/repository/import_applicability.rb

@@ -1,25 +0,0 @@
-module Actions
-  module Katello
-    module Repository
-      class ImportApplicability < Actions::Base
-        middleware.use Actions::Middleware::ExecuteIfContentsChanged
-
-        input_format do
-          param :repo_id
-          param :contents_changed
-        end
-
-        def run
-          repo = ::Katello::Repository.find(input[:repo_id])
-          repo.hosts_with_applicability.each do |host|
-            ::Katello::EventQueue.push_event(::Katello::Events::ImportHostApplicability::EVENT_TYPE, host.id)
-          end
-        end
-
-        def rescue_strategy_for_self
-          Dynflow::Action::Rescue::Skip
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/pulp/consumer.rb

@@ -1,100 +0,0 @@
-module Actions
-  module Pulp
-    module Consumer
-      class ContentPresenter < Helpers::Presenter::Base
-        def humanized_output
-          if task_result_packages
-            ret = []
-            if task_result_packages.is_a?(String)
-              ret << task_result_packages
-            elsif task_result_packages.any?
-              ret.concat(task_result_packages.map { |package| package[:qname] })
-            end
-            if humanized_errors
-              ret.concat(humanized_errors)
-            end
-            return ret.sort.join("\n")
-          else
-            humanized_errors #show any errors if no packages were updated
-          end
-        end
-
-        private
-
-        def task_result
-          action.external_task && action.external_task[0][:result]
-        end
-
-        def task_result_details
-          task_result && task_result[:details]
-        end
-
-        def task_erratum_details
-          task_result_details &&
-              task_result_details[:erratum] &&
-              task_result_details[:erratum][:details]
-        end
-
-        def task_rpm_details
-          task_result_details &&
-              task_result_details[:rpm] &&
-              task_result_details[:rpm][:details]
-        end
-
-        def task_package_group_details
-          task_result_details &&
-              task_result_details[:package_group] &&
-              task_result_details[:package_group][:details]
-        end
-
-        def task_erratum_succeeded?
-          task_result_details &&
-              task_result_details[:erratum] &&
-              task_result_details[:erratum][:succeeded] == true
-        end
-
-        def task_rpm_succeeded?
-          task_result_details &&
-              task_result_details[:rpm] &&
-              task_result_details[:rpm][:succeeded] == true
-        end
-
-        def task_package_group_succeeded?
-          task_result_details &&
-              task_result_details[:package_group] &&
-              task_result_details[:package_group][:succeeded] == true
-        end
-
-        def task_errors
-          task_rpm_details && task_rpm_details[:errors]
-        end
-
-        def task_result_packages
-          if task_rpm_details
-            if task_rpm_succeeded?
-              task_rpm_details[:resolved] + task_rpm_details[:deps]
-            else
-              task_rpm_details[:message]
-            end
-          elsif task_package_group_details
-            if task_package_group_succeeded?
-              task_package_group_details[:resolved] + task_package_group_details[:deps]
-            else
-              task_package_group_details[:message]
-            end
-          elsif task_erratum_details
-            if task_erratum_succeeded?
-              task_erratum_details[:resolved] + task_erratum_details[:deps]
-            else
-              task_erratum_details[:message]
-            end
-          end
-        end
-
-        def humanized_errors
-          task_errors&.map { |k, v| "#{k}: #{v}" }
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/pulp/consumer/create.rb

@@ -1,19 +0,0 @@
-module Actions
-  module Pulp
-    module Consumer
-      class Create < Pulp::Abstract
-        include Helpers::Presenter
-
-        input_format do
-          param :uuid, String
-          param :name, String
-        end
-
-        def run
-          response = pulp_extensions.consumer.create(input[:uuid], display_name: input[:name])
-          output[:response] = response.slice(:uuid, :name)
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/pulp/consumer/destroy.rb

@@ -1,17 +0,0 @@
-module Actions
-  module Pulp
-    module Consumer
-      class Destroy < Pulp::Abstract
-        input_format do
-          param :uuid, String
-        end
-
-        def run
-          pulp_extensions.consumer.delete(self.input[:uuid])
-        rescue RestClient::ResourceNotFound
-          Rails.logger.error(_("Pulp Consumer %s has already been removed") % input[:uuid])
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/pulp/consumer/generate_applicability.rb

@@ -1,24 +0,0 @@
-module Actions
-  module Pulp
-    module Consumer
-      class GenerateApplicability < Pulp::AbstractAsyncTask
-        input_format do
-          param :uuids, Array
-        end
-
-        def invoke_external_task
-          if input[:uuids].length == 1
-            begin
-              pulp_resources.consumer.regenerate_applicability_by_id(input[:uuids].first)
-            rescue RestClient::ResourceNotFound
-              Rails.logger.warn("Pulp consumer %s not found." % input[:uuids].first)
-              nil
-            end
-          else
-            pulp_extensions.consumer.regenerate_applicability_by_ids(input[:uuids])
-          end
-        end
-      end
-    end
-  end
-end