katello 4.4.0.rc1 → 4.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cffead633d7427ab354f070ad520ef1436914690ae62a83707bd51f0ff94156
-  data.tar.gz: 759afa6d6768f23db062327899cd38db646b99c59d5068027dcf4bdc74f47896
+  metadata.gz: 294ac07f46dd213e4ebbdd13f97d387b39ef2e5859ed6224e354672f4b26f244
+  data.tar.gz: b08b1182252900cc7390ae257b1a9243fcdb26f00d64b1f668cc17faff4f08e8
 SHA512:
-  metadata.gz: f4d6669e6c29532fe48cb70fd014bc0fb0fd9e7ddfb29a3832e175134be2ecb40b2dbcedd458cef5303805680e28ec3d17a3ea9f250a3482403490c7dd22b3d1
-  data.tar.gz: 458b225423b94a7cfb95034ee9bbff4d0fceca0effcf2dfd2651bb98bf535cadc681791ccbbaca19175cd17446fffab9b1190140f07973e8b220c28239aaf398
+  metadata.gz: 85c64b73f97252bd9f99c28071bddd97aebc83a525a5ec8559f4538180c733eca336e433e4d2f06204e6d57c5333246fc512e155c2396622daa369fd0dc0bbb4
+  data.tar.gz: e5d7904f19cb93eac89ff6e27b6c585e53f9419e925c4c5bedce2b30ac7a1d8df6c3e518574ad86c6607edbacc99a21360df54cef3b3ddfb94c4c38570f945a7

data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb

@@ -53,7 +53,16 @@ module Katello
     api :POST, "/repositories/bulk/reclaim_space", N_("Reclaim space from On Demand repositories")
     param :ids, Array, :desc => N_("List of repository ids"), :required => true
     def reclaim_space_from_repositories
-      task = async_task(::Actions::Pulp3::Repository::ReclaimSpace, @repositories)
+      if @repositories.empty?
+        fail _("No repositories selected.")
+      end
+      repositories = @repositories.select { |repo| repo.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND }
+      if repositories.empty?
+        fail _("Only On Demand repositories may have space reclaimed.")
+      end
+      task = async_task(::Actions::BulkAction,
+                        ::Actions::Pulp3::Repository::ReclaimSpace,
+                        repositories)
 
       respond_for_async :resource => task
     end

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -327,6 +327,9 @@ module Katello
     api :POST, "/repositories/:id/reclaim_space", N_("Reclaim space from an On Demand repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
     def reclaim_space
+      if @repository.download_policy != ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
+        fail HttpErrors::BadRequest, _("Only On Demand repositories may have space reclaimed.")
+      end
       task = async_task(::Actions::Pulp3::Repository::ReclaimSpace, @repository)
       respond_for_async :resource => task
     rescue Errors::InvalidActionOptionError => e

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

@@ -4,17 +4,16 @@ module Actions
       class ErrataMail < Actions::EntryAction
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
-        def plan(repo, last_updated = nil, contents_changed = nil)
-          last_updated ||= repo.repository_errata.order('updated_at ASC').last.try(:updated_at) || Time.now
-          plan_self(:repo => repo.id, :last_updated => last_updated.to_s, :contents_changed => contents_changed)
+        def plan(repo, contents_changed = nil)
+          plan_self(:repo => repo.id, :contents_changed => contents_changed)
         end
 
         def run
           ::User.current = ::User.anonymous_admin
-
           repo = ::Katello::Repository.find(input[:repo])
+          last_updated = repo.repository_errata.order('updated_at ASC').last.try(:updated_at) || Time.now
           users = ::User.select { |user| user.receives?(:sync_errata) && user.organization_ids.include?(repo.organization.id) && user.can?(:view_products, repo.product) }.compact
-          errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', input[:last_updated].to_datetime).pluck(:erratum_id))
+          errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', last_updated).pluck(:erratum_id))
 
           begin
             MailNotification[:sync_errata].deliver(:users => users, :repo => repo, :errata => errata) unless (users.blank? || errata.blank?)

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

@@ -51,11 +51,11 @@ module Actions
               plan_action(Katello::Repository::FetchPxeFiles, :id => repo.id)
               plan_action(Katello::Repository::CorrectChecksum, repo)
               concurrence do
-                plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
+                plan_action(Katello::Repository::ErrataMail, repo, output[:contents_changed])
                 plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_ids => [repo.id]) if generate_applicability
               end
               plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
-                        :contents_changed => contents_changed)
+                        :contents_changed => output[:contents_changed])
               plan_action(Katello::Repository::SyncHook, :id => repo.id)
             end
           end

data/app/lib/actions/pulp3/abstract.rb

@@ -1,6 +1,6 @@
 module Actions
   module Pulp3
-    class Abstract < Actions::Base
+    class Abstract < Actions::EntryAction
       middleware.use ::Actions::Middleware::RemoteAction
       middleware.use Actions::Middleware::Pulp3ServicesCheck
 

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -11,15 +11,25 @@ module Actions
         def invoke_external_task
           tasks = []
           content_view = ::Katello::ContentView.find(input[:content_view_id])
-          content_view.repository_references.each do |repository_reference|
+          to_delete = content_view.repository_references.select do |repository_reference|
             repo = repository_reference.root_repository.library_instance
-            #force pulp3 in case we've done migrations, but haven't switched over yet
-            tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
+            if delete_href?(repository_reference.repository_href, content_view)
+              #force pulp3 in case we've done migrations, but haven't switched over yet
+              tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
+              true
+            else
+              false
+            end
           end
-          content_view.repository_references.destroy_all
+          to_delete.each(&:destroy)
 
           output[:pulp_tasks] = tasks
         end
+
+        #migrated composites may have the same RepositoryReference as their component
+        def delete_href?(href, content_view)
+          ::Katello::Pulp3::RepositoryReference.where(:repository_href => href).where.not(:content_view_id => content_view.id).empty?
+        end
       end
     end
   end

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

@@ -18,8 +18,7 @@ module Actions
             content_view_version_id: input[:content_view_version_id],
             path: input[:path],
             metadata: input[:metadata],
-            audit_comment: ::Katello::ContentViewVersionImportHistory.generate_audit_comment(path: input[:path],
-                                                                                             user: User.current,
+            audit_comment: ::Katello::ContentViewVersionImportHistory.generate_audit_comment(user: User.current,
                                                                                              content_view_name: input[:content_view_name])
           )
           output[:import_history_id] = history.id

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

@@ -2,16 +2,9 @@ module Actions
   module Pulp3
     module Repository
       class ReclaimSpace < Pulp3::AbstractAsyncTask
-        def plan(repositories, smart_proxy = SmartProxy.pulp_primary)
-          repositories = [repositories] if repositories.is_a?(::Katello::Repository)
-          if repositories.empty?
-            fail _("No repositories selected.")
-          end
-          repositories = repositories.select { |repo| repo.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND }
-          if repositories.empty?
-            fail _("Only On Demand repositories may have space reclaimed.")
-          end
-          repository_hrefs = ::Katello::Pulp3::RepositoryReference.default_cv_repository_hrefs(repositories, Organization.current)
+        def plan(repo, smart_proxy = SmartProxy.pulp_primary)
+          action_subject(repo)
+          repository_hrefs = ::Katello::Pulp3::RepositoryReference.default_cv_repository_hrefs([repo], Organization.current || repositories.first.organization)
           plan_self(repository_hrefs: repository_hrefs, smart_proxy_id: smart_proxy.id)
         end
 

data/app/lib/katello/util/pulpcore_content_filters.rb

@@ -8,8 +8,9 @@ module Katello
       def filter_package_groups_by_pulp_href(package_groups, package_pulp_hrefs)
         rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
         package_groups.reject do |package_group|
+          #copy the package group as long as we have 1 package from the group
           package_group.package_names.empty? ||
-          (package_group.package_names - rpms.pluck(:name)).any?
+          (package_group.package_names & rpms.pluck(:name)).empty?
         end
       end
 

data/app/models/katello/candlepin/repository_mapper.rb

@@ -74,6 +74,7 @@ module Katello
       end
 
       def feed_url
+        return if product.organization.cdn_configuration.airgapped?
         @feed_url ||= if product.cdn_resource&.respond_to?(:repository_url)
                         product.cdn_resource.repository_url(content_label: content.label)
                       else

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

@@ -0,0 +1,17 @@
+module Katello
+  module Concerns::AuditCommentExtensions
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # to prevent PG::StringDataRightTruncation: ERROR:  value too long for type character varying(255)
+      def truncate_audit_comment(long_comment)
+        if long_comment.length > 255
+          Rails.logger.info "Truncating audit comment: #{long_comment}"
+          "#{long_comment[0..250]}..."
+        else
+          long_comment
+        end
+      end
+    end
+  end
+end

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

@@ -401,10 +401,20 @@ module Katello
       end
 
       def package_names_for_job_template(action:, search:)
-        actions = ['install']
+        actions = %w(install remove update).freeze
         case action
         when 'install'
           ::Katello::Rpm.yum_installable_for_host(self).search_for(search).distinct.pluck(:name)
+        when 'remove'
+          return [] if search.empty?
+
+          installed_packages.search_for(search).distinct.pluck(:name)
+        when 'update'
+          return [] if search.empty?
+
+          pkg_names = installed_packages.search_for(search).distinct.pluck(:name)
+          upgrades = ::Katello::Rpm.installable_for_hosts([self]).select(:id, :name, :nvra, :evr).order(evr: :desc).group_by(&:name)
+          pkg_names.map { |p| upgrades[p]&.first&.nvra }.compact
         else
           fail ::Foreman::Exception.new(N_("package_names_for_job_template: Action must be one of %s"), actions.join(', '))
         end

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

@@ -179,6 +179,7 @@ module Katello
           config.scheme = uri.scheme
           pulp3_ssl_configuration(config)
           config.debugging = false
+          config.timeout = SETTINGS[:katello][:rest_client_timeout]
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
           config.password = self.setting(PULP3_FEATURE, 'password')

data/app/models/katello/content_view_version_export_history.rb

@@ -1,6 +1,7 @@
 module Katello
   class ContentViewVersionExportHistory < Katello::Model
     include Authorization::ContentViewVersionExportHistory
+    include Concerns::AuditCommentExtensions
     audited except: :metadata
     delegate :organization, to: :content_view_version
     delegate :id, to: :organization, prefix: true
@@ -58,7 +59,7 @@ module Katello
         export_descriptor = "export of content view '#{content_view_version.content_view.name}' version #{content_view_version.version}"
         export_descriptor += " from #{from_version.name}" if from_version
       end
-      "#{export_type&.capitalize} #{export_descriptor} created by #{user.to_label}"
+      truncate_audit_comment("#{export_type&.capitalize} #{export_descriptor} created by #{user.to_label}")
     end
   end
 end

data/app/models/katello/content_view_version_import_history.rb

@@ -1,6 +1,7 @@
 module Katello
   class ContentViewVersionImportHistory < Katello::Model
     include Authorization::ContentViewVersionImportHistory
+    include Concerns::AuditCommentExtensions
 
     audited except: :metadata
     delegate :organization, to: :content_view_version
@@ -31,12 +32,11 @@ module Katello
     scoped_search :on => :id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :import_type, :rename => :type, :complete_value => ContentViewVersionExportHistory::EXPORT_TYPES
 
-    def self.generate_audit_comment(user:, path:, content_view_name:)
-      _("Content imported from %{path} into content view '%{name}' by %{user}") % {
-        path: path,
+    def self.generate_audit_comment(user:, content_view_name:)
+      truncate_audit_comment(_("Content imported by %{user} into content view '%{name}'") % {
         user: user.to_label,
         name: content_view_name
-      }
+      })
     end
   end
 end

data/app/models/katello/host_available_module_stream.rb

@@ -37,6 +37,16 @@ module Katello
                                              :stream => available_module_stream.stream}).exists?
     end
 
+    def install_status
+      return 'Not installed' if installed_profiles.blank?
+      case status
+      when 'disabled'
+        'Installed'
+      when 'enabled'
+        upgradable? ? 'Upgradable' : 'Up-to-date'
+      end
+    end
+
     def self.upgradable(host)
       upgradable_module_name_streams = ModuleStream.installable_for_hosts([host]).select(:name, :stream)
 

data/app/models/katello/installed_package.rb

@@ -15,6 +15,7 @@ module Katello
     has_many :host_installed_packages, :class_name => "Katello::HostInstalledPackage", :dependent => :destroy, :inverse_of => :installed_package
     has_many :hosts, :through => :host_installed_packages, :class_name => "::Host"
 
+    scoped_search :on => :id, :complete_value => true
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :nvrea
     scoped_search :on => :nvra

data/app/models/katello/root_repository.rb

@@ -62,7 +62,8 @@ module Katello
     validates_lengths_from_database :except => [:label]
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
-    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url, :nil_allowed => proc { |repo| repo.custom? },
+    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url,
+                   :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.airgapped? },
                    :field_name => :url
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :name
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :label
@@ -83,6 +84,7 @@ module Katello
     validate :ensure_valid_deb_constraints, :if => :deb?
     validate :ensure_no_checksum_on_demand
     validate :ensure_valid_mirroring_policy
+    validate :ensure_valid_retain_package_versions_count
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
     validates :product_id, :presence => true
     validates :content_type, :inclusion => {
@@ -306,6 +308,16 @@ module Katello
       end
     end
 
+    def ensure_valid_retain_package_versions_count
+      return unless self.retain_package_versions_count
+      unless yum?
+        errors.add(:retain_package_versions_count, N_("is only allowed for Yum repositories."))
+      end
+      if self.retain_package_versions_count.to_i < 0
+        errors.add(:retain_package_versions_count, N_("must not be a negative value."))
+      end
+    end
+
     def custom_content_path
       parts = []
       # We generate repo path only for custom product content. We add this
@@ -372,7 +384,7 @@ module Katello
 
     def pulp_update_needed?
       changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirroring_policy verify_ssl_on_sync
-                                 upstream_username upstream_password ignorable_content
+                                 upstream_username upstream_password ignorable_content retain_package_versions_count
                                  ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id http_proxy_policy http_proxy_id download_concurrency)
       changeable_attributes += %w(name container_repository_name include_tags exclude_tags) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?

data/app/models/setting/content.rb

@@ -105,8 +105,15 @@ class Setting::Content < Setting
                "/etc/pki/katello/private/pulp-client.key", N_('Pulp client key')),
       self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"),
                "/etc/pki/katello/certs/pulp-client.crt", N_('Pulp client cert')),
-      self.set('sync_connect_timeout', N_("Total timeout in seconds for connections when syncing"),
-               300, N_('Sync Connection Timeout')),
+      self.set('sync_total_timeout', N_("The maximum number of second that Pulp can take to do a single sync operation, e.g., download a single metadata file."),
+               3600, N_('Sync Total Timeout')),
+      self.set('sync_connect_timeout_v2',
+               N_("The maximum number of seconds for Pulp to establish a new connection or for waiting for a free connection from a pool if pool connection limits are exceeded."),
+               60, N_('Sync Connect Timeout')),
+      self.set('sync_sock_connect_timeout', N_("The maximum number of seconds for Pulp to connect to a peer for a new connection not given from a pool."),
+               60, N_('Sync Sock Connect Timeout')),
+      self.set('sync_sock_read_timeout', N_("The maximum number of seconds that Pulp can take to download a file, not counting connection time."),
+               3600, N_('Sync Sock Read Timeout')),
       self.set('remote_execution_by_default', N_("If this is enabled, remote execution is used instead of katello-agent for remote actions"),
                false, N_('Use remote execution by default')),
       self.set('unregister_delete_host', N_("When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host " \

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

@@ -36,6 +36,10 @@ module Katello
           PulpRpmClient::ContentPackageenvironmentsApi.new(api_client)
         end
 
+        def content_modulemd_defaults_api
+          PulpRpmClient::ContentModulemdDefaultsApi.new(api_client)
+        end
+
         def content_repo_metadata_files_api
           PulpRpmClient::ContentRepoMetadataFilesApi.new(api_client)
         end

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

@@ -101,16 +101,18 @@ module Katello
               # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
               # -> I.e. no filters and not an incremental version.
               unless dest_repo_id_map[:base_version]
-                source_repo_for_package_envs = ::Katello::Repository.find(source_repo_ids.first)
-                unless source_repo_for_package_envs.library_instance?
-                  source_repo_for_package_envs = source_repo_for_package_envs.library_instance
+                source_repo_for_content = ::Katello::Repository.find(source_repo_ids.first)
+                unless source_repo_for_content.library_instance?
+                  source_repo_for_content = source_repo_for_content.library_instance
                 end
-                package_env_hrefs = packageenvironments({ :repository_version => source_repo_for_package_envs.version_href }).map(&:pulp_href).sort
+                modulemd_defaults_hrefs = modulemd_defaults({ :repository_version => source_repo_for_content.version_href }).map(&:pulp_href).sort
+                package_env_hrefs = packageenvironments({ :repository_version => source_repo_for_content.version_href }).map(&:pulp_href).sort
                 # Don't perform extra content actions if the repo is a soft copy of its library instance.
                 # Taken care of by the IncrementalUpdate action.
                 unless dest_repo.soft_copy_of_library?
                   tasks << remove_all_content_from_repo(dest_repo_href)
                   tasks << add_content_for_repo(dest_repo_href, package_env_hrefs) unless package_env_hrefs.empty?
+                  tasks << add_content_for_repo(dest_repo_href, modulemd_defaults_hrefs) unless modulemd_defaults_hrefs.empty?
                 end
               end
               source_repo_ids.each do |source_repo_id|
@@ -201,6 +203,7 @@ module Katello
 
           if content_unit_hrefs.sort!.any?
             content_unit_hrefs += packageenvironments({ :repository_version => source_repository.version_href }).map(&:pulp_href).sort
+            content_unit_hrefs += modulemd_defaults({ :repository_version => source_repository.version_href }).map(&:pulp_href).sort
             first_slice = remove_all
             content_unit_hrefs.each_slice(UNIT_LIMIT) do |slice|
               tasks << add_content(slice, first_slice)
@@ -228,6 +231,10 @@ module Katello
           Katello::Pulp3::Api::Core.fetch_from_list { |page_opts| api.content_package_environments_api.list(page_opts.merge(options)) }
         end
 
+        def modulemd_defaults(options = {})
+          Katello::Pulp3::Api::Core.fetch_from_list { |page_opts| api.content_modulemd_defaults_api.list(page_opts.merge(options)) }
+        end
+
         def metadatafiles(options = {})
           api.content_repo_metadata_files_api.list(options)
         end

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

@@ -406,7 +406,10 @@ module Katello
           proxy_url: root.http_proxy&.url,
           proxy_username: root.http_proxy&.username,
           proxy_password: root.http_proxy&.password,
-          total_timeout: Setting[:sync_connect_timeout],
+          total_timeout: Setting[:sync_total_timeout],
+          connect_timeout: Setting[:sync_connect_timeout_v2],
+          sock_connect_timeout: Setting[:sync_sock_connect_timeout],
+          sock_read_timeout: Setting[:sync_sock_read_timeout],
           rate_limit: Setting[:download_rate_limit]
         }
         remote_options[:url] = root.url unless root.url.blank?
@@ -498,7 +501,6 @@ module Katello
         ostree_import.artifact = artifact_href
         ostree_import.repository_name = options[:ostree_repository_name]
         ostree_import.ref = options[:ostree_ref]
-        ostree_import.parent_commit = options[:ostree_parent_commit]
         api.repositories_api.import_commits(repository_reference.repository_href, ostree_import)
       end
 

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

@@ -0,0 +1,19 @@
+<%#
+kind: job_template
+name: Remove Packages by search query - Katello SSH Default
+job_category: Katello
+description_format: 'Remove packages %{Packages search query}'
+feature: katello_packages_remove_by_search
+provider_type: SSH
+template_inputs:
+- name: Packages search query
+  description: Filter criteria for packages to be removed.
+  input_type: user
+  required: true
+%>
+<% package_names = @host.package_names_for_job_template(
+  action: 'remove',
+  search: input('Packages search query')
+) -%>
+
+<%= render_template('Package Action - SSH Default', :action => 'remove', :package => package_names.join(' ')) %> 

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

@@ -0,0 +1,19 @@
+<%#
+kind: job_template
+name: Update Packages by search query - Katello SSH Default
+job_category: Katello
+description_format: 'Update package(s) %{Packages search query}'
+feature: katello_packages_update_by_search
+provider_type: SSH
+template_inputs:
+- name: Packages search query
+  description: Filter criteria for packages to be updated.
+  input_type: user
+  required: false
+%>
+<% package_names = @host.package_names_for_job_template(
+  action: 'update',
+  search: input('Packages search query')
+) -%>
+
+<%= render_template('Package Action - SSH Default', :action => 'update', :package => package_names.join(' ')) %> 

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -36,11 +36,15 @@ node :last_published do |content_view|
   end
 end
 
-child :environments => :environments do
-  attributes :id, :name, :label
-  node :permissions do |env|
+node :environments do |cv|
+  cv.environments.map do |env|
     {
-      :readable => env.readable?
+      id: env.id,
+      label: env.label,
+      name: env.label,
+      activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
+      hosts: cv&.hosts&.in_environment(env)&.ids,
+      permissions: {readable: env.readable?}
     }
   end
 end

data/app/views/katello/api/v2/host_module_streams/base.json.rabl

@@ -2,6 +2,7 @@ object @resource
 
 attributes :status, :installed_profiles
 attributes :upgradable? => :upgradable
+attributes :install_status? => :install_status
 
 glue(@object.available_module_stream) do
   attributes :name, :stream, :module_spec

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -39,6 +39,8 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
     FakeContentViewPuppetEnvironment.delete_all
     FakePuppetModule.delete_all
 
+    ::Katello::RepositoryErratum.where(:repository_id => ::Katello::Repository.where(:root_id => ::Katello::RootRepository.where(:content_type => [:ostree, :puppet]))).delete_all
+
     if puppet_repositories.any?
       User.as_anonymous_admin do
         ::Katello::Repository.delete(puppet_repositories)

data/db/migrate/20211019192121_create_cdn_configuration.katello.rb

@@ -1,4 +1,8 @@
 class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
+  class FakeCdnConfiguration < Katello::Model
+    self.table_name = 'katello_cdn_configurations'
+  end
+
   def up
     create_table :katello_cdn_configurations do |t|
       t.integer :organization_id
@@ -14,17 +18,22 @@ class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
     add_foreign_key :katello_cdn_configurations, :taxonomies, name: 'katello_cdn_configurations_organization_id', column: :organization_id
     add_foreign_key :katello_cdn_configurations, :katello_content_credentials, name: 'katello_cdn_configurations_ssl_ca_credential_id', column: :ssl_ca_credential_id
 
+    FakeCdnConfiguration.reset_column_information
+
     ::Organization.all.each do |org|
-      Katello::CdnConfiguration.where(
-        organization: org,
+      FakeCdnConfiguration.where(
+        organization_id: org.id,
         url: org.redhat_provider.repository_url || ::Katello::Resources::CDN::CdnResource.redhat_cdn_url
       ).first_or_create!
     end
 
     remove_column :katello_providers, :repository_url
+    ::Katello::Provider.reset_column_information
   end
 
   def down
+    add_column :katello_providers, :repository_url, :string
+    ::Katello::Provider.reset_column_information
     drop_table :katello_cdn_configurations
   end
 end

data/db/migrate/20220209205137_expand_sync_timeout_settings.rb

@@ -0,0 +1,23 @@
+class ExpandSyncTimeoutSettings < ActiveRecord::Migration[6.0]
+  def up
+    old_timeout_setting = Setting.find_by(name: 'sync_connect_timeout', category: 'Setting::Content')
+    if old_timeout_setting && (old_timeout_setting&.value != old_timeout_setting&.default)
+      Setting.find_by(name: 'sync_total_timeout')&.update(value: old_timeout_setting&.value)
+      Setting.find_by(name: 'sync_sock_read_timeout')&.update(value: old_timeout_setting&.value)
+    end
+    Setting.where(name: 'sync_connect_timeout', category: 'Setting::Content').delete_all
+  end
+
+  def down
+    timeout = Setting.find_by(name: 'sync_total_timeout', category: 'Setting::Content')&.value
+
+    Setting.where(name: 'sync_total_timeout', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_connect_timeout_v2', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_sock_connect_timeout', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_sock_read_timeout', category: 'Setting::Content').delete_all
+
+    Setting.create(Setting.set('sync_connect_timeout', N_("Timeout in seconds for downloads when syncing"),
+      300, N_('Sync Connection Timeout')))
+    Setting.find_by(name: 'sync_connect_timeout')&.update(value: timeout)
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -10,13 +10,14 @@
  * @requires ContentViewVersion
  * @requires CurrentOrganization
  * @requires Notification
+ * @requires BastionConfig
  *
  * @description
  *   Display confirmation screen and apply Errata.
  */
 angular.module('Bastion.errata').controller('ApplyErrataController',
-    ['$scope', '$window', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification',
-        function ($scope, $window, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification) {
+    ['$scope', '$window', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification', 'BastionConfig',
+        function ($scope, $window, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification, BastionConfig) {
             var applyErrata, incrementalUpdate;
 
             function transitionToTask(task) {
@@ -31,6 +32,8 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
 
             $scope.applyingErrata = false;
 
+            $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+            $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
@@ -133,7 +136,11 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.confirmApply = function() {
                 $scope.applyingErrata = true;
                 if ($scope.updates.length === 0) {
-                    applyErrata();
+                    if ($scope.remoteExecutionPresent && $scope.remoteExecutionByDefault) {
+                        angular.element('#errataActionForm').submit();
+                    } else {
+                        applyErrata();
+                    }
                 } else {
                     incrementalUpdate();
                 }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -119,6 +119,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 if (!_.isEmpty(repository.commaIncludeTags)) {
                     repository["include_tags"] = repository.commaIncludeTags.split(",").map(function(tag) {
                         return tag.trim();
+                    }).filter(function(el) {
+                        return el;
                     });
                 } else {
                     repository["include_tags"] = [];
@@ -126,6 +128,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 if (!_.isEmpty(repository.commaExcludeTags)) {
                     repository["exclude_tags"] = repository.commaExcludeTags.split(",").map(function(tag) {
                         return tag.trim();
+                    }).filter(function(el) {
+                        return el;
                     });
                 } else {
                     repository["exclude_tags"] = [];