[CP] Katello 4.12.0.rc3 Cherry Picks (#10922)

* Fixes #37187 - Update ACS refresh Pulp fixtures + fix repository_test test (cherry picked from commit 99c7857) * Fixes #37137 - Use insert_all when creating available module streams (#10878) * Fixes #37137 - Use insert_all when creating available module streams (cherry picked from commit 7458f70) * Fixes #37178 - use safe navigation for operatingsystem (#10897) (cherry picked from commit 664488d) * Refs #37202 - display name according to setting in host collection (cherry picked from commit de39a36) * Refs #37201 - display short host name in activation keys menu (cherry picked from commit 8164043) * Refs #37203 - display name according to setting in errata host list (cherry picked from commit 2775554) * Fixes #37214 - Change 'default' for limit to environment checkbox in activation-key and content-host (cherry picked from commit 9d0a338) * Fixes #37198 - Allow installedDeb package attributes in safemode (cherry picked from commit b5d785f) * Fixes #37108 - Preload content_view_components (#10864) (cherry picked from commit d98c17b) * Fixes #37197 - Kickstart repository correctly listed on hostgroup (cherry picked from commit 35c49b1) * Fixes #36976 - Too many audit records slow down CV loading (#10911) (cherry picked from commit 30c6977) * Fixes #37169 - Managing a Hosts Repository Sets does not behave as expected (#10905) (cherry picked from commit 6420cf8) * Refs #37214 - Use Limit to Environment by default (cherry picked from commit 8bedda9) --------- Co-authored-by: ianballou <[email protected]> Co-authored-by: Jeremy Lenz <[email protected]> Co-authored-by: Matěj Mudra <[email protected]> Co-authored-by: Manisha Singhal <[email protected]> Co-authored-by: Bernhard Suttner <[email protected]> Co-authored-by: Bernhard Suttner <[email protected]> Co-authored-by: Partha Aji <[email protected]> Co-authored-by: Samir Jha <[email protected]> Co-authored-by: Thorben <[email protected]>
Katello · Mar 8, 2024 · dfbc4ac · dfbc4ac
1 parent ab7f2d6
commit dfbc4ac
Show file tree

Hide file tree

Showing 28 changed files with 3,106 additions and 2,419 deletions.
diff --git a/app/controllers/katello/api/v2/content_views_controller.rb b/app/controllers/katello/api/v2/content_views_controller.rb
@@ -59,7 +59,7 @@ def filtered_associations
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ContentView)
     def index
-      content_view_includes = [:activation_keys, :content_view_versions,
+      content_view_includes = [:activation_keys, :content_view_versions, :content_view_components,
                                :environments, :organization, :repositories]
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => content_view_includes))
     end

diff --git a/app/controllers/katello/api/v2/host_subscriptions_controller.rb b/app/controllers/katello/api/v2/host_subscriptions_controller.rb
@@ -170,6 +170,7 @@ def product_content
     param :content_overrides_search, Hash, :desc => N_("Content override search parameters") do
       param_group :search, Api::V2::ApiController
       param :enabled, :bool, :desc => N_("Set true to override to enabled; Set false to override to disabled.'"), :required => false
+      param :limit_to_env, :bool, :desc => N_("Limit actions to content in the host's environment."), :required => false
       param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
     end
     def content_override
@@ -232,10 +233,22 @@ def action_permission
 
     def find_content_overrides
       if !params.dig(:content_overrides_search, :search).nil?
+
         content_labels = ::Katello::Content.joins(:product_contents)
                             .where("#{Katello::ProductContent.table_name}.product_id": @host.organization.products.subscribable.enabled)
                             .search_for(params[:content_overrides_search][:search])
                             .pluck(:label)
+
+        if Foreman::Cast.to_bool(params.dig(:content_overrides_search, :limit_to_env))
+          env_content = ProductContentFinder.new(
+              :match_subscription => false,
+              :match_environment => true,
+              :consumable => @host.subscription_facet
+          ).product_content
+          env_content_labels = ::Katello::Content.find(env_content.pluck(:content_id)).pluck(:label)
+          content_labels &= env_content_labels
+        end
+
         @content_overrides = content_labels.map do |label|
           { content_label: label,
             value: Foreman::Cast.to_bool(params[:content_overrides_search][:enabled]),

diff --git a/app/models/katello/concerns/host_managed_extensions.rb b/app/models/katello/concerns/host_managed_extensions.rb
@@ -325,40 +325,67 @@ def import_enabled_repositories(repos)
         content_facet.update_repositories_by_paths(paths.compact)
       end
 
-      def import_module_streams(module_streams)
-        streams = {}
-        module_streams.each do |module_stream|
-          stream = AvailableModuleStream.create_or_find_by!(name: module_stream["name"],
-                                               context: module_stream["context"],
-                                               stream: module_stream["stream"])
-          streams[stream.id] = module_stream
+      def available_module_stream_id_from(name:, stream:, context:)
+        @indexed_available_module_streams ||= Katello::AvailableModuleStream.all.index_by do |available_module_stream|
+          "#{available_module_stream.name}-#{available_module_stream.stream}-#{available_module_stream.context}"
         end
-        sync_available_module_stream_associations(streams)
+        @indexed_available_module_streams["#{name}-#{stream}-#{context}"]&.id
+      end
+
+      def import_module_streams(module_streams)
+        # module_streams looks like this
+        # {"name"=>"389-ds", "stream"=>"1.4", "version"=>"8030020201203210520", "context"=>"e114a9e7", "arch"=>"x86_64", "profiles"=>[], "installed_profiles"=>[], "status"=>"default", "active"=>false}
+        streams = module_streams.map do |module_stream|
+          {
+            name: module_stream["name"],
+            stream: module_stream["stream"],
+            context: module_stream["context"]
+          }
+        end
+        if streams.any?
+          AvailableModuleStream.insert_all(
+            streams,
+            unique_by: %w[name stream context],
+            returning: %w[id name stream context]
+          )
+        end
+        indexed_module_streams = module_streams.index_by do |module_stream|
+          available_module_stream_id_from(
+                  name: module_stream["name"],
+                  stream: module_stream["stream"],
+                  context: module_stream["context"]
+                )
+        end
+        sync_available_module_stream_associations(indexed_module_streams)
       end
 
       def sync_available_module_stream_associations(new_available_module_streams)
-        upgradable_streams = self.host_available_module_streams.where(:available_module_stream_id => new_available_module_streams.keys)
+        new_associated_ids = new_available_module_streams.keys.compact
+        upgradable_streams = self.host_available_module_streams.where(:available_module_stream_id => new_associated_ids)
         old_associated_ids = self.available_module_stream_ids
-        delete_ids = old_associated_ids - new_available_module_streams.keys
+        delete_ids = old_associated_ids - new_associated_ids
 
         if delete_ids.any?
           self.host_available_module_streams.where(:available_module_stream_id => delete_ids).delete_all
         end
 
-        new_ids = new_available_module_streams.keys - old_associated_ids
-        new_ids.each do |new_id|
+        new_ids = new_associated_ids - old_associated_ids
+
+        hams_to_create = new_ids.map do |new_id|
           module_stream = new_available_module_streams[new_id]
           status = module_stream["status"]
           # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
           if enabled_module_stream_inactive?(module_stream)
             status = "unknown"
           end
-          self.host_available_module_streams.create!(host_id: self.id,
-                                                     available_module_stream_id: new_id,
-                                                     installed_profiles: module_stream["installed_profiles"],
-                                                     status: status)
-        end
-
+          {
+            host_id: self.id,
+            available_module_stream_id: new_id,
+            installed_profiles: module_stream["installed_profiles"],
+            status: status
+          }
+        end
+        HostAvailableModuleStream.insert_all(hams_to_create) if hams_to_create.any?
         upgradable_streams.each do |hams|
           module_stream = new_available_module_streams[hams.available_module_stream_id]
           shared_keys = hams.attributes.keys & module_stream.keys

diff --git a/app/models/katello/concerns/hostgroup_extensions.rb b/app/models/katello/concerns/hostgroup_extensions.rb
@@ -56,6 +56,11 @@ def lifecycle_environment
         Katello::KTEnvironment.find_by(:id => inherited_lifecycle_environment_id)
       end
 
+      def kickstart_repository
+        return super if ancestry.nil? || self.kickstart_repository_id.present?
+        Katello::Repository.find_by(:id => inherited_kickstart_repository_id)
+      end
+
       # instead of calling nested_attribute_for(:content_source_id) in Foreman, define the methods explictedly
       def content_source
         return super if ancestry.nil? || self.content_source_id.present?

diff --git a/app/models/katello/content_view.rb b/app/models/katello/content_view.rb
@@ -770,45 +770,6 @@ def related_composite_cvs
       content_views
     end
 
-    def audited_cv_repositories_since_last_publish
-      audited_repositories = self.audits.filter do |a|
-        !a.audited_changes["repository_ids"].nil?
-      end
-      if latest_version_object
-        audited_repositories.filter! { |a| a.created_at > latest_version_object.created_at }
-      end
-      audited_repositories
-    end
-
-    def audited_cv_repository_changed
-      audited_repositories_changes = Audit.where(auditable_id: repositories, auditable_type: "Katello::Repository").filter do |a|
-        a.audited_changes["publication_href"].present? || a.audited_changes["version_href"].present?
-      end
-      if latest_version_object
-        audited_repositories_changes = audited_repositories_changes.filter { |a| a.created_at > latest_version_object.created_at }
-      end
-      audited_repositories_changes
-    end
-
-    def audited_cv_filters_changed
-      audited_filters = Audit.where(auditable_type: "Katello::ContentViewFilter",
-                                    associated_id: id,
-                                    associated_type: "Katello::ContentView")
-      if latest_version_object
-        audited_filters = audited_filters.filter { |a| a.created_at > latest_version_object.created_at }
-      end
-      audited_filters
-    end
-
-    def audited_cv_filter_rules_changed
-      audited_filter_rules = Audit.where(associated_id: id,
-                                    associated_type: "Katello::ContentView").where("auditable_type LIKE '%FilterRule%'")
-      if latest_version_object
-        audited_filter_rules = audited_filter_rules.filter { |a| a.created_at > latest_version_object.created_at }
-      end
-      audited_filter_rules
-    end
-
     def composite_cv_components_changed?
       return true unless latest_version_object
       published_component_version_ids = latest_version_object.components.pluck(:id) || []
@@ -874,8 +835,29 @@ def needs_publish?
     end
 
     def audited_changes_present?
-      audited_cv_repositories_since_last_publish.present? || audited_cv_repository_changed.present? ||
-        audited_cv_filters_changed.present? || audited_cv_filter_rules_changed.present?
+      latest_version_created_at = latest_version_object.created_at
+      cv_repository_ids = repositories.pluck(:id)
+
+      audited_changes_like = ->(param) {
+        Arel.sql("#{Audit.table_name}.audited_changes ilike '%#{param}%'")
+      }
+
+      table = Audit.arel_table
+      repository_condition = table[:auditable_id].eq(id).and(audited_changes_like.call("repository_ids"))
+
+      cv_repository_condition = table[:auditable_id].in(cv_repository_ids)
+                                                    .and(table[:auditable_type].eq('Katello::Repository'))
+                                                    .and(Arel.sql("(#{audited_changes_like.call("publication_href")} OR #{audited_changes_like.call("version_href")})"))
+
+      content_view_filter_condition = table[:auditable_type].eq('Katello::ContentViewFilter').and(table[:associated_id].eq(id))
+
+      filter_rule_condition = table[:associated_id].eq(id).and(table[:auditable_type].matches('%FilterRule%'))
+
+      base_query = table[:created_at].gt(latest_version_created_at)
+
+      final_query = base_query.and(repository_condition.or(cv_repository_condition).or(content_view_filter_condition).or(filter_rule_condition))
+
+      Audit.where(final_query).exists?
     end
 
     def dependency_solving_changed?

diff --git a/app/models/katello/installed_deb.rb b/app/models/katello/installed_deb.rb
@@ -1,5 +1,17 @@
 module Katello
   class InstalledDeb < Katello::Model
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Installed Deb'
+      refs 'InstalledDeb'
+      sections only: %w[all additional]
+      property :name, String, desc: 'Returns name of the package'
+      property :version, String, desc: 'Returns package version'
+      property :architecture, String, desc: 'Returns package architecture'
+    end
+    class Jail < Safemode::Jail
+      allow :name, :version, :architecture
+    end
+
     has_many :host_installed_debs, :class_name => "Katello::HostInstalledDeb", :dependent => :destroy, :inverse_of => :installed_deb
     has_many :hosts, :through => :host_installed_debs, :class_name => "::Host"
 

diff --git a/app/models/katello/repository.rb b/app/models/katello/repository.rb
@@ -250,6 +250,10 @@ def set_pulp_id
       self.pulp_id = SecureRandom.uuid if self.pulp_id.length > PULP_ID_MAX_LENGTH
     end
 
+    def self.attribute_name
+      :name
+    end
+
     def set_container_repository_name
       self.container_repository_name = Repository.safe_render_container_name(self)
     end

diff --git a/app/views/katello/api/v2/content_views/base.json.rabl b/app/views/katello/api/v2/content_views/base.json.rabl
@@ -12,7 +12,6 @@ attributes :import_only
 attributes :generated_for
 attributes :related_cv_count
 attributes :related_composite_cvs
-attributes :needs_publish? => :needs_publish
 attributes :filtered? => :filtered
 
 node :next_version do |content_view|

diff --git a/app/views/katello/api/v2/content_views/show.json.rabl b/app/views/katello/api/v2/content_views/show.json.rabl
@@ -3,6 +3,7 @@ object @resource
 extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
+attributes :needs_publish? => :needs_publish
 
 node :errors do
   unless @resource.valid?

diff --git a/app/views/katello/api/v2/hosts/base.json.rabl b/app/views/katello/api/v2/hosts/base.json.rabl
@@ -6,11 +6,11 @@ object @resource
 attributes :id, :name, :description
 
 node :operatingsystem_family do |resource|
-  resource.operatingsystem.family
+  resource.operatingsystem&.family
 end
 
 node :operatingsystem_major do |resource|
-  resource.operatingsystem.major
+  resource.operatingsystem&.major
 end
 
 if @facet

diff --git a/app/views/overrides/activation_keys/_host_synced_content_select.html.erb b/app/views/overrides/activation_keys/_host_synced_content_select.html.erb
@@ -3,7 +3,7 @@
      kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
      kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
    elsif using_hostgroups_page?
-     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_repo_id = kickstart_repository_id(@hostgroup, :selected_host_group => @host&.hostgroup)
      kickstart_options = kickstart_repository_options(@hostgroup)
    else
      kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @hostgroup)

diff --git a/...ipts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js b/...ipts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js
@@ -24,6 +24,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
         params = {
             'activation_key_id': $scope.$stateParams.activationKeyId,
             'content_access_mode_all': $scope.simpleContentAccessEnabled,
+            'content_access_mode_env': true,
             'sort_order': 'ASC',
             'paged': true
         };
@@ -39,7 +40,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         $scope.contentAccessModes = {
             contentAccessModeAll: $scope.simpleContentAccessEnabled,
-            contentAccessModeEnv: false
+            contentAccessModeEnv: true
         };
 
         $scope.selectRepositoryType = function () {

diff --git a/...tion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html b/...tion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html
@@ -29,8 +29,8 @@
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
-              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>

diff --git a/...lo/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html b/...lo/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html
@@ -63,8 +63,8 @@ <h3 translate>Apply to Content Hosts</h3>
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-href="/new/hosts/{{contentHost.name}}/content">{{ contentHost.name }}</a>
-              <a ng-switch-when="false" ui-sref="content-host.info({hostId: contentHost.id})">{{ contentHost.name }}</a>
+              <a ng-switch-when="true" ng-href="/new/hosts/{{contentHost.name}}/content">{{ contentHost.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: contentHost.id})">{{ contentHost.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>

diff --git a/...javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html b/...javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html
@@ -40,8 +40,8 @@
         </td>
         <td bst-table-cell >
           <span ng-switch="newHostDetailsUI">
-            <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
-            <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+            <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+            <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
           </span>
         </td>
         <td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>

diff --git a/...avascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html b/...avascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html
@@ -40,8 +40,8 @@
           </td>
           <td bst-table-cell >
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
-              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>

diff --git a/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb b/test/actions/pulp3/orchestration/alternate_content_source_refresh_test.rb
@@ -7,7 +7,7 @@ class AlternateContentSourceRefreshTest < ActiveSupport::TestCase
     def setup
       @primary = SmartProxy.pulp_primary
       @yum_acs = katello_alternate_content_sources(:yum_alternate_content_source)
-      @yum_acs.subpaths = ['rpm-zchunk/', 'rpm-with-modules/']
+      @yum_acs.subpaths = ['rpm-with-sha-512/', 'rpm-with-modules/']
       @yum_acs.ssl_ca_cert_id = nil
       @yum_acs.ssl_client_cert_id = nil
       @yum_acs.ssl_client_key_id = nil
@@ -28,22 +28,22 @@ def setup
     end
 
     def teardown
-      @yum_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @yum_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @file_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @file_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @yum_simplified_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @yum_simplified_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end
 
-      @file_simplified_acs.smart_proxy_alternate_content_sources.each do |smart_proxy_acs|
+      @file_simplified_acs.smart_proxy_alternate_content_sources.where.not(remote_href: nil).sort_by(&:remote_href).each do |smart_proxy_acs|
         ForemanTasks.sync_task(
             ::Actions::Pulp3::Orchestration::AlternateContentSource::Delete, smart_proxy_acs)
       end