katello 4.5.0.rc2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5922047abc1b1bd8649e30bbaaf5eaf2e09f09bc9abb5e1b61920c0b84b1b57b
-  data.tar.gz: 8105c45f9d16ca034430e89224f9bb81fa95c02d38ca638268864e34a9d57e2b
+  metadata.gz: 687476385ef6943c54b1bbe07e424155cde7b21fc79230d3013a730cdd5d2261
+  data.tar.gz: 9619b38f2b5505ced4d59a6e46ce8042be4d0a95bcdabf467177554b33d48b04
 SHA512:
-  metadata.gz: '069335f24169763ce80081693498c668a115893acb4e9c7b2a1486d54d5394f53b9d21cb6442acd6cba990f07d58e6b75f7ec0d9e32515165226fb833874a311'
-  data.tar.gz: 22cda386e45a6d989daff56fe3897d07a75205282b2aa1e901bf7c333fd38d72869ab3dd808641a5535d8f72063c2961aa575c2420dfa51c2f98a3ab4152b28c
+  metadata.gz: e03d2a7fcd995895fbc94435d5bed4fae374a5a3a081ffce1bbe12f249dafa8ebba964c62c8d018419c3744ca976bcd1badada46b8bf1843e1d50842eec1cc5f
+  data.tar.gz: 8b0cbe4d4ce376daeae8901ac5f7fed804de075f9b89baf109a1134933d7cb6a910cc64cf9cd123d77b5b05bc14f531b80b7762e34cff1334ede4d0c138a69f6

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -206,21 +206,22 @@ module Katello
         search_up_to = up_to.present? ? "ended_at < \"#{up_to}\"" : nil
         search_since = since.present? ? "ended_at > \"#{since}\"" : nil
         search_result = status.present? && status != 'all' ? "result = #{status}" : nil
-        search = [search_up_to, search_since, search_result].compact.join(' and ')
+        labels = 'label ^ (Actions::Katello::Host::Erratum::Install, Actions::Katello::Host::Erratum::ApplicableErrataInstall)'
+        select = 'foreman_tasks_tasks.*'
 
         if Katello.with_remote_execution?
-          condition = ["state = 'stopped' AND ((label = 'Actions::RemoteExecution::RunHostJob' AND templates.id = ?) " \
-                       "OR label = 'Actions::Katello::Host::Erratum::Install' OR label = 'Actions::Katello::Host::Erratum::ApplicableErrataInstall')",
-                       RemoteExecutionFeature.feature('katello_errata_install').job_template_id]
+          new_labels = 'label = Actions::RemoteExecution::RunHostJob AND remote_execution_feature.label ^ (katello_errata_install, katello_errata_install_by_search)'
+          labels = [labels, new_labels].map { |label| "(#{label})" }.join(' OR ')
+          select += ',template_invocations.id AS template_invocation_id'
         else
-          condition = "state = 'stopped' AND (label = 'Actions::Katello::Host::Erratum::Install' OR label = 'Actions::Katello::Host::Erratum::ApplicableErrataInstall')"
+          select += ',NULL AS template_invocation_id'
         end
 
+        search = [search_up_to, search_since, search_result, "state = stopped", labels].compact.join(' and ')
+
         tasks = load_resource(klass: ForemanTasks::Task,
-                              where: condition,
                               permission: 'view_foreman_tasks',
-                              joins: 'LEFT OUTER JOIN template_invocations ON foreman_tasks_tasks.id = template_invocations.run_host_job_task_id LEFT OUTER JOIN templates ON template_invocations.template_id = templates.id',
-                              select: 'foreman_tasks_tasks.*,template_invocations.id AS template_invocation_id',
+                              select: select,
                               search: search)
         only_host_ids = ::Host.search_for(host_filter).pluck(:id) if host_filter
 
@@ -325,9 +326,21 @@ module Katello
         # Pick katello agent errata if present
         # Otherwise pick rex errata. There are multiple template inputs, such as errata, pre_script and post_script we only need the
         # errata input here.
-        @_tasks_errata_cache[task.id] ||= agent_input.presence || TemplateInvocationInputValue.joins(:template_input)
-                                            .where("template_invocation_id = ? AND template_inputs.name = ?", task.template_invocation_id, 'errata')
-                                            .first.value.split(',')
+        @_tasks_errata_cache[task.id] ||= agent_input.presence || errata_ids_from_template_invocation(task, task_input)
+      end
+
+      def errata_ids_from_template_invocation(task, task_input)
+        if task_input.key?('job_features') && task_input['job_features'].include?('katello_errata_install_by_search')
+          # This may give wrong results if the template is not rendered yet
+          # This also will not work for jobs run before we started storing
+          #   resolved ids in the template
+          script = task.execution_plan.actions[1].try(:input).try(:[], 'script') || ''
+          found = script.lines.find { |line| line.start_with? '# RESOLVED_ERRATA_IDS=' } || ''
+          (found.chomp.split('=', 2).last || '').split(',')
+        else
+          TemplateInvocationInputValue.joins(:template_input).where("template_invocation_id = ? AND template_inputs.name = ?", task.template_invocation_id, 'errata')
+            .first.value.split(',')
+        end
       end
     end
   end

data/app/models/katello/authorization/repository.rb

@@ -5,11 +5,13 @@ module Katello
     delegate :editable?, to: :product
 
     def deletable?(remove_from_content_view_versions = true)
-      product.editable? && (remove_from_content_view_versions || !promoted? || !self.content_views.generated_for_none.exists?)
+      return false unless product.editable?
+      remove_from_content_view_versions || !promoted? || (self.content_views.exists? && !self.content_views.generated_for_none.exists?)
     end
 
     def redhat_deletable?(remove_from_content_view_versions = false)
-      (remove_from_content_view_versions || !self.promoted? || !self.content_views.generated_for_none.exists?) && self.product.editable?
+      return false unless product.editable?
+      remove_from_content_view_versions || !self.promoted? || (self.content_views.exists? && !self.content_views.generated_for_none.exists?)
     end
 
     def readable?

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -246,7 +246,6 @@ module Katello
         streams = {}
         module_streams.each do |module_stream|
           stream = AvailableModuleStream.where(name: module_stream["name"],
-                                               context: module_stream["context"],
                                                stream: module_stream["stream"]).first_or_create!
           streams[stream.id] = module_stream
         end

data/app/services/katello/pulp3/content_view_version/import.rb

@@ -42,11 +42,14 @@ module Katello
           # In other words if metadata had repos {label:foo, product: bar}
           # this would match it to the repo with the label foo and product bar
           # in the library.
-
           queries = metadata_map.repositories.map do |repo|
-            if repo.redhat && repo.product.cp_id
+            if repo.redhat && repo.product.cp_id && repo.content&.id
               library_repositories.where("#{Katello::Product.table_name}.cp_id": repo.product.cp_id,
-                                         "#{Katello::RootRepository.table_name}.label": repo.label)
+                                         "#{::Katello::RootRepository.table_name}" => {
+                                           content_id: repo.content.id,
+                                           arch: repo.arch,
+                                           major: repo.major,
+                                           minor: repo.minor })
             else
               library_repositories.where("#{Katello::Product.table_name}.label": repo.product.label,
                                          "#{Katello::RootRepository.table_name}.label": repo.label)
@@ -84,9 +87,13 @@ module Katello
           relation = content_view_version.importable_repositories.joins(:root, :product)
 
           metadata_map.repositories.each do |metadata_repo|
-            if metadata_repo.redhat && metadata_repo.product.cp_id
+            if metadata_repo.redhat && metadata_repo.product.cp_id && metadata_repo.content&.id
               repo = relation.where("#{::Katello::Product.table_name}" => {cp_id: metadata_repo.product.cp_id},
-                                        "#{::Katello::RootRepository.table_name}" => {label: metadata_repo.label}).first
+                                    "#{::Katello::RootRepository.table_name}" => {
+                                      content_id: metadata_repo.content.id,
+                                      arch: metadata_repo.arch,
+                                      major: metadata_repo.major,
+                                      minor: metadata_repo.minor}).first
             else
               repo = relation.where("#{::Katello::Product.table_name}" => {label: metadata_repo.product.label},
                                         "#{::Katello::RootRepository.table_name}" => {label: metadata_repo.label}).first

data/app/services/katello/pulp3/content_view_version/importable_repositories.rb

@@ -22,12 +22,21 @@ module Katello
             product = product_for_metadata_repo(repo)
             fail _("Unable to find product '%s' in organization '%s'" % [repo.product.label, @organization.name]) if product.blank?
 
-            root = product.root_repositories.find { |r| r.label == repo.label }
+            root = product.root_repositories.find do |r|
+              if repo.content&.id && repo.redhat
+                r.content.cp_content_id == repo.content.id &&
+                  r.arch == repo.arch &&
+                  r.major == repo.major &&
+                  r.minor == repo.minor
+              else
+                r.label == repo.label
+              end
+            end
+
             if root
               updatable << { repository: root, options: update_repo_params(repo) }
             elsif repo.redhat
-              content = repo.content
-              product_content = product_content_by_label(content.label)
+              product_content = fetch_product_content(repo.content, product)
               substitutions = {
                 basearch: repo.arch,
                 releasever: repo.minor
@@ -49,8 +58,14 @@ module Katello
           end
         end
 
-        def product_content_by_label(content_label)
-          ::Katello::Content.find_by_label(content_label)
+        def fetch_product_content(content_metadata, product)
+          query = ::Katello::Content.joins(:product_contents).where("#{Katello::ProductContent.table_name}.product_id": product.id)
+          table_name = Katello::Content.table_name
+          if content_metadata&.id
+            query.find_by("#{table_name}.cp_content_id": content_metadata.id)
+          else
+            query.find_by("#{table_name}.label": content_metadata.label)
+          end
         end
 
         def gpg_key_id(metadata_repo)

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -15,11 +15,12 @@ foreign_input_sets:
   exclude: action,package
 %>
 
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+# RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
+
 <% if @host.operatingsystem.family == 'Suse' -%>
-    <% advisories = @host.advisory_ids(search: input("Errata search query")).join(' ') %>
-    <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisories) %>
+    <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisory_ids.join(' ')) %>
 <% else %>
-    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
     <% raise "No errata matching given search query" if !input("Errata search query").blank? && advisory_ids.empty? %>
 
     <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -115,7 +115,7 @@ angular.module('Bastion.activation-keys').config(['$stateProvider', function ($s
     })
     .state('activation-key.copy', {
         url: '/copy',
-        permission: 'create_activation_key',
+        permission: 'create_activation_keys',
         controller: 'ActivationKeyCopyController',
         templateUrl: 'activation-keys/details/views/activation-key-copy.html',
         ncyBreadcrumb: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -8,7 +8,7 @@
   <div data-block="item-actions" bst-feature-flag="custom_products">
     <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem" ng-hide="denied('create_activation_key')">
+        <li role="menuitem" ng-hide="denied('create_activation_keys')">
           <a ui-sref="activation-key.copy" translate>
             Copy Activation Key
           </a>

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

@@ -45,7 +45,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
 
         $scope.updateAll = function () {
             $scope.working = true;
-            HostPackage.updateAll({id: $scope.host.id}, $scope.openEventInfo, $scope.errorHandler);
+            $scope.performPackageAction('packageUpdate', '');
         };
 
         $scope.performPackageAction = function (actionType, term) {
@@ -57,9 +57,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         $scope.performViaKatelloAgent = function (actionType, term) {
-            var terms = term.split(/ *, */);
+            var terms = [];
+            if (term === '') {
+                packageActions.updateAll();
+            } else {
+                terms = term.split(/ *, */);
+                packageActions[actionType](terms);
+            }
             $scope.working = true;
-            packageActions[actionType](terms);
         };
 
         $scope.performViaRemoteExecution = function(actionType, term, customize) {
@@ -76,6 +81,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         packageActions = {
+            updateAll: function () {
+                HostPackage.updateAll({id: $scope.host.id}, $scope.openEventInfo, $scope.errorHandler);
+            },
             packageInstall: function (termList) {
                 HostPackage.install({id: $scope.host.id, packages: termList}, $scope.openEventInfo, $scope.errorHandler);
             },

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

@@ -60,7 +60,7 @@
         <div class="form-group">
           <button class="btn btn-default" type="button"
                   translate
-                  ng-disabled="remoteExecutionByDefault || !katelloAgentPresent || working"
+                  ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
                   ng-click="updateAll()">
             Update All Packages
           </button>

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

@@ -49,7 +49,7 @@
         <button class="btn btn-default"
                 type="button"
                 translate
-                ng-disabled="remoteExecutionByDefault || working || !katelloAgentPresent"
+                ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
                 ng-click="updateAll()">
           Update All Packages
         </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -255,9 +255,6 @@
         </dd>
       </span>
 
-      <dt translate>Publish via HTTPS</dt>
-      <dd translate>Yes</dd>
-
       <span ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <dt translate>Unprotected</dt>
         <dd bst-edit-checkbox="repository.unprotected"

data/lib/katello/tasks/refresh_alternate_content_sources.rake

@@ -2,9 +2,14 @@ namespace :katello do
   desc 'Refresh all alternate content sources'
   task :refresh_alternate_content_sources => ["dynflow:client"] do
     User.current = User.anonymous_admin
-    ::ForemanTasks.async_task(::Actions::BulkAction,
-                              ::Actions::Katello::AlternateContentSource::Refresh,
-                              ::Katello::AlternateContentSource.all)
-    puts _("Alternate content source refreshing started in the background.")
+    alternate_content_sources = ::Katello::AlternateContentSource.all
+    if alternate_content_sources.present?
+      ::ForemanTasks.async_task(::Actions::BulkAction,
+                                ::Actions::Katello::AlternateContentSource::Refresh,
+                                alternate_content_sources)
+      puts _("Alternate content source refreshing started in the background.")
+    else
+      puts _("No alternate content sources to refresh.")
+    end
   end
 end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.5.0.rc2".freeze
+  VERSION = "4.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.5.0.rc2
+  version: 4.5.0
 platform: ruby
 authors:
 - N/A
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -328,20 +328,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
@@ -5518,7 +5518,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -5529,12 +5529,12 @@ 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.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []