katello 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30d037b42e387abe07cb200218782b7918735e7ae3e6eff511491914e7dc4e3
-  data.tar.gz: f92e5533113942c7f23d579f53dbe1474bbf68970d1ea9c53a850e98cfb7783c
+  metadata.gz: 4894a5652b92e0d8b87f5de6abb4b25229cd4e5ef32f5d5aafe62961d04eb4a4
+  data.tar.gz: 2ba9d4e9c8b572b23dd90c69d49a191abae7eb82c3599ffc80f65bdff9f1c73e
 SHA512:
-  metadata.gz: 9d408e0837a5efce7541213d3631d3d5f29dc552688cc54ca025d4add697c6443e0c6974b4bae66727eee4cbc34eb9cae37f8863b125b8725d1cdc71492480c0
-  data.tar.gz: 8ee4d0ab24c2d2525338cf6e44f54e67416682e3ce56db109d4460dd93d5bbdac7e038fa72fa9371817fa0f5ffd75ad68c3797fac3d365610ac29e3fefd7c48d
+  metadata.gz: 4cff5dfc8027b6a31f9da80e513cd3d936427de6e133dc612dda6c0e1d375676f8470357331ed9a7af40272501d9b55c649b2f3e84c6a142603b5c09bce6a374
+  data.tar.gz: af3829a6c7eafa17dee7833fe17cbcf32e6a819ccf007cc7da1f82ac9652e97f030bd624a8edf8d439cc6b585bea300291d2cbd6205a148002924216bd7accee

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -18,6 +18,7 @@ module Actions
 
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
         def plan(old_version, environments, options = {})
           dep_solve = options.fetch(:resolve_dependencies, true)
           description = options.fetch(:description, '')
@@ -71,18 +72,22 @@ module Actions
                 unit_map = pulp3_content_mapping(content)
 
                 unless extended_repo_mapping.empty? || unit_map.values.flatten.empty?
-                  copy_action_outputs << plan_action(Pulp3::Repository::MultiCopyUnits, extended_repo_mapping, unit_map,
-                                                     dependency_solving: dep_solve).output
+                  sequence do
+                    copy_action_outputs << plan_action(Pulp3::Repository::MultiCopyUnits, extended_repo_mapping, unit_map,
+                                                       dependency_solving: dep_solve).output
+                    repos_to_clone.each do |source_repos|
+                      if separated_repo_map[:pulp3_yum].keys.include?(source_repos)
+                        copy_repos(repository_mapping[source_repos])
+                      end
+                    end
+                  end
                 end
               end
 
               if separated_repo_map[:other].keys.flatten.present?
                 repos_to_clone.each do |source_repos|
                   if separated_repo_map[:other].keys.include?(source_repos)
-                    copy_action_outputs += copy_repos(repository_mapping[source_repos],
-                                                      new_content_view_version,
-                                                      content,
-                                                      dep_solve)
+                    copy_repos(repository_mapping[source_repos])
                   end
                 end
               end
@@ -138,19 +143,11 @@ module Actions
           end
         end
 
-        def copy_repos(new_repo, new_version, content, dep_solve)
-          copy_output = []
+        def copy_repos(new_repo)
           sequence do
-            solve_dependencies = new_version.content_view.solve_dependencies || dep_solve
-            copy_output += copy_deb_content(new_repo, solve_dependencies, content[:deb_ids])
-            copy_output += copy_yum_content(new_repo, solve_dependencies,
-                                            content[:package_ids],
-                                            content[:errata_ids])
-
             plan_action(Katello::Repository::MetadataGenerate, new_repo)
             plan_action(Katello::Repository::IndexContent, id: new_repo.id)
           end
-          copy_output
         end
 
         # For a given repo, find it's instances in both the new and old component versions.

data/app/lib/actions/pulp3/content_view_version/destroy_exporter.rb

@@ -1,13 +1,13 @@
 module Actions
   module Pulp3
     module ContentViewVersion
-      class DestroyExporter < Pulp3::Abstract
+      class DestroyExporter < Pulp3::AbstractAsyncTask
         input_format do
           param :smart_proxy_id, Integer
           param :exporter_data, Hash
         end
 
-        def run
+        def invoke_external_task
           ::Katello::Pulp3::ContentViewVersion::Export.new(smart_proxy: smart_proxy).destroy_exporter(input[:exporter_data][:pulp_href])
         end
       end

data/app/lib/actions/pulp3/repository/create_remote.rb

@@ -10,6 +10,10 @@ module Actions
           repo = ::Katello::Repository.find(input[:repository_id])
           output[:response] = repo.backend_service(smart_proxy).create_remote
         end
+
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
       end
     end
   end

data/app/models/katello/content_view_version.rb

@@ -231,7 +231,19 @@ module Katello
     end
 
     def available_packages
-      library_packages.where.not(:id => packages)
+      # The simple/obvious solution is:
+      #   library_packages.where.not(:id => packages)
+      # However, when the list of exclusions is large, the SQL "NOT IN" clause
+      # is extremely inefficient, and it is much better to use a
+      # "LEFT OUTER JOIN" with a subquery.
+      # ActiveRecord .joins() only supports subqueries by supplying raw SQL.  We
+      # use .to_sql to avoid hard-coding raw SQL for self.packages, although
+      # .to_sql may also be somewhat brittle.  For example, see:
+      # https://github.com/rails/rails/issues/18379
+      library_packages.joins(
+        "LEFT OUTER JOIN (#{packages.select('id').to_sql}) AS exclude_rpms ON " \
+        'katello_rpms.id = exclude_rpms.id'
+      ).where('exclude_rpms.id IS NULL')
     end
 
     def srpms
@@ -262,7 +274,19 @@ module Katello
     end
 
     def available_errata
-      library_errata.where.not(:id => errata)
+      # The simple/obvious solution is:
+      #   library_errata.where.not(:id => errata)
+      # However, when the list of exclusions is large, the SQL "NOT IN" clause
+      # is extremely inefficient, and it is much better to use a
+      # "LEFT OUTER JOIN" with a subquery.
+      # ActiveRecord .joins() only supports subqueries by supplying raw SQL.  We
+      # use .to_sql to avoid hard-coding raw SQL for self.errata, although
+      # .to_sql may also be somewhat brittle.  For example, see:
+      # https://github.com/rails/rails/issues/18379
+      library_errata.joins(
+        "LEFT OUTER JOIN (#{errata.select('id').to_sql}) AS exclude_errata ON " \
+        'katello_errata.id = exclude_errata.id'
+      ).where('exclude_errata.id IS NULL')
     end
 
     def file_units

data/app/models/katello/ping.rb

@@ -195,9 +195,8 @@ module Katello
         end
 
         workers = json["online_workers"] || []
-        resource_manager_exists = workers.any? { |worker| worker["name"].include?("resource-manager") }
 
-        unless resource_manager_exists && workers.count > 1
+        unless workers.count > 1
           fail _("Not all necessary pulp workers running at %s.") % url
         end
 

data/app/models/katello/root_repository.rb

@@ -67,6 +67,7 @@ module Katello
     validate :ensure_docker_repo_unprotected, :if => :docker?
     validate :ensure_ostree_repo_protected, :if => :ostree?
     validate :ensure_compatible_download_policy, :if => :yum?
+    validate :ensure_valid_collection_attributes, :if => :ansible_collection?
     validate :ensure_valid_ignorable_content
     validate :ensure_valid_docker_tags_whitelist
     validate :ensure_valid_os_versions
@@ -178,6 +179,15 @@ module Katello
       end
     end
 
+    def ensure_valid_collection_attributes
+      errors.add(:base, _("URL needs to have a trailing /")) if !url.blank? && url[-1] != '/'
+      begin
+        YAML.safe_load(ansible_collection_requirements) if ansible_collection_requirements
+      rescue
+        errors.add(:base, _('Requirements yaml is invalid!'))
+      end
+    end
+
     def update_ostree_upstream_sync_policy
       return unless ostree?
       if self.ostree_upstream_sync_policy.blank?

data/app/services/katello/pulp3/api/core.rb

@@ -81,15 +81,15 @@ module Katello
         end
 
         def importer_check_api
-          PulpcoreClient::ImportersCoreImportCheckApi.new(core_api_client)
+          PulpcoreClient::ImportersPulpImportCheckApi.new(core_api_client)
         end
 
         def export_api
-          PulpcoreClient::ExportersCoreExportsApi.new(core_api_client)
+          PulpcoreClient::ExportersPulpExportsApi.new(core_api_client)
         end
 
         def import_api
-          PulpcoreClient::ImportersCoreImportsApi.new(core_api_client)
+          PulpcoreClient::ImportersPulpImportsApi.new(core_api_client)
         end
 
         def orphans_api

data/app/services/katello/pulp3/api/docker.rb

@@ -37,7 +37,9 @@ module Katello
         end
 
         def api_client
-          api_client_class(PulpContainerClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpContainerClient::Configuration)))
+          config = smart_proxy.pulp3_configuration(PulpContainerClient::Configuration)
+          config.params_encoder = Faraday::FlatParamsEncoder
+          api_client_class(PulpContainerClient::ApiClient.new(config))
         end
 
         def repositories_api

data/app/services/katello/pulp3/docker_manifest.rb

@@ -15,15 +15,9 @@ module Katello
       end
 
       def self.content_unit_list(page_opts)
-        page_opts[:media_type] = "application/vnd.docker.distribution.manifest.v1+json"
-        data_v1 = self.content_api.list(page_opts)
-        page_opts[:media_type] = "application/vnd.docker.distribution.manifest.v2+json"
-        data_v2 = self.content_api.list(page_opts)
-
-        filtered = {}
-        filtered["count"] = data_v1.count + data_v2.count
-        filtered["results"] = data_v1.results + data_v2.results
-        filtered
+        page_opts[:media_type] = ['application/vnd.docker.distribution.manifest.v1+json',
+                                  'application/vnd.docker.distribution.manifest.v2+json']
+        self.content_api.list(page_opts)
       end
 
       def update_model(model)

data/app/services/katello/pulp3/docker_manifest_list.rb

@@ -14,7 +14,7 @@ module Katello
       end
 
       def self.content_unit_list(page_opts)
-        page_opts[:media_type] = "application/vnd.docker.distribution.manifest.list.v2+json"
+        page_opts[:media_type] = ["application/vnd.docker.distribution.manifest.list.v2+json"]
         self.content_api.list(page_opts)
       end
 

data/app/services/katello/pulp3/repository/ansible_collection.rb

@@ -8,7 +8,7 @@ module Katello
           if root.url.blank?
             super
           else
-            common_remote_options.merge(url: root.url,
+            common_remote_options.merge(url: root.url.chomp('/').concat('/'),
                                         requirements_file: root.ansible_collection_requirements.blank? ? nil : root.ansible_collection_requirements,
                                         auth_url: root.ansible_collection_auth_url,
                                         token: root.ansible_collection_auth_token,

data/app/services/katello/pulp3/task_group.rb

@@ -85,8 +85,8 @@ module Katello
 
       def cancel
         tasks_api = core_api.tasks_api
-        tasks_response = core_api.fetch_from_list do |page_opts|
-          tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: 'running,waiting'))
+        tasks_response = core_api.class.fetch_from_list do |page_opts|
+          tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: [RUNNING, WAITING]))
         end
         tasks_response.collect do |result|
           ::Katello::Pulp3::Api::Core.new(@smart_proxy).cancel_task(result.pulp_href)

data/app/views/overrides/smart_proxies/_download_policy.erb

@@ -1,3 +1,3 @@
-<% if @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) %>
+<% if @smart_proxy.pulp_mirror? %>
   <%= select_f(f, :download_policy, download_policies, :label, :name, :size => "col-md-8" ) %>
 <% end %>

data/config/initializers/monkeys.rb

@@ -2,3 +2,4 @@
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'
+require 'monkeys/pulp3_13_checksumfix'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js

@@ -71,7 +71,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
         $scope.performViaRemoteExecution = function(customize) {
             var traceHelpers = $scope.selectedTraceHelpers();
             $scope.traceActionFormValues.helper = $.grep(traceHelpers, Boolean).join(',');
-            $scope.traceActionFormValues.hostIds = $scope.host.id;
+            $scope.traceActionFormValues.bulkHostIds = angular.toJson({ included: { ids: [$scope.host.id] }});
             $scope.traceActionFormValues.customize = customize;
 
             $timeout(function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html

@@ -19,7 +19,7 @@
   <form id="traceActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" value="service_restart"/>
     <input type="hidden" name="name" ng-value="traceActionFormValues.helper"/>
-    <input type="hidden" name="host_ids" ng-value="traceActionFormValues.hostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="traceActionFormValues.bulkHostIds"/>
     <input type="hidden" name="customize" ng-value="traceActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="traceActionFormValues.authenticityToken"/>
   </form>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.0".freeze
+  VERSION = "4.1.1".freeze
 end

data/lib/monkeys/pulp3_13_checksumfix.rb

@@ -0,0 +1,17 @@
+require 'pulp_rpm_client'
+
+unless PulpRpmClient.const_defined?('OneOfMetadataChecksumTypeEnumNullEnum')
+  class PulpRpmClient::OneOfMetadataChecksumTypeEnumNullEnum
+    def self.build_from_hash(value)
+      value
+    end
+  end
+end
+
+unless PulpRpmClient.const_defined?('OneOfPackageChecksumTypeEnumNullEnum')
+  class PulpRpmClient::OneOfPackageChecksumTypeEnumNullEnum
+    def self.build_from_hash(value)
+      value
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 13.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 13.0.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -288,120 +302,120 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_deb_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.0
 - !ruby/object:Gem::Dependency
   name: pulp_certguard_client
   requirement: !ruby/object:Gem::Requirement
@@ -4471,81 +4485,38 @@ files:
 - lib/monkeys/anemone.rb
 - lib/monkeys/ar_postgres_evr_t.rb
 - lib/monkeys/fx_sqlite_skip.rb
+- lib/monkeys/pulp3_13_checksumfix.rb
 - lib/proxy_api/container_gateway.rb
 - lib/proxy_api/pulp.rb
 - lib/proxy_api/pulp_node.rb
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
-- locale/bn/katello.edit.po
 - locale/bn/katello.po
-- locale/bn/katello.po.time_stamp
-- locale/cs/katello.edit.po
 - locale/cs/katello.po
-- locale/cs/katello.po.time_stamp
-- locale/de/katello.edit.po
 - locale/de/katello.po
-- locale/de/katello.po.time_stamp
-- locale/en/katello.edit.po
 - locale/en/katello.po
-- locale/en/katello.po.time_stamp
-- locale/es/katello.edit.po
 - locale/es/katello.po
-- locale/es/katello.po.time_stamp
-- locale/fr/katello.edit.po
 - locale/fr/katello.po
-- locale/fr/katello.po.time_stamp
-- locale/gu/katello.edit.po
 - locale/gu/katello.po
-- locale/gu/katello.po.time_stamp
-- locale/hi/katello.edit.po
 - locale/hi/katello.po
-- locale/hi/katello.po.time_stamp
-- locale/it/katello.edit.po
 - locale/it/katello.po
-- locale/it/katello.po.time_stamp
-- locale/ja/katello.edit.po
 - locale/ja/katello.po
-- locale/ja/katello.po.time_stamp
 - locale/katello.pot
-- locale/kn/katello.edit.po
 - locale/kn/katello.po
-- locale/kn/katello.po.time_stamp
-- locale/ko/katello.edit.po
 - locale/ko/katello.po
-- locale/ko/katello.po.time_stamp
-- locale/mr/katello.edit.po
 - locale/mr/katello.po
-- locale/mr/katello.po.time_stamp
-- locale/or/katello.edit.po
 - locale/or/katello.po
-- locale/or/katello.po.time_stamp
-- locale/pa/katello.edit.po
 - locale/pa/katello.po
-- locale/pa/katello.po.time_stamp
-- locale/pt/katello.edit.po
 - locale/pt/katello.po
-- locale/pt/katello.po.time_stamp
-- locale/pt_BR/katello.edit.po
 - locale/pt_BR/katello.po
-- locale/pt_BR/katello.po.time_stamp
-- locale/ru/katello.edit.po
 - locale/ru/katello.po
-- locale/ru/katello.po.time_stamp
-- locale/ta/katello.edit.po
 - locale/ta/katello.po
-- locale/ta/katello.po.time_stamp
-- locale/te/katello.edit.po
 - locale/te/katello.po
-- locale/te/katello.po.time_stamp
 - locale/update-i18n
 - locale/zanata.xml
-- locale/zh_CN/katello.edit.po
 - locale/zh_CN/katello.po
-- locale/zh_CN/katello.po.time_stamp
-- locale/zh_TW/katello.edit.po
 - locale/zh_TW/katello.po
-- locale/zh_TW/katello.po.time_stamp
 - package.json
 - vendor/assets/images/katello/add2.png
 - vendor/assets/images/katello/addhost.png