katello 4.3.0 → 4.4.0.rc1

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

@@ -79,7 +79,11 @@ module Katello
       end
 
       def publication_href
-        api.publications_api.list(:repository_version => version_href).results.first&.pulp_href
+        if repo_service.repo.content_type == "deb"
+          api.publications_verbatim_api.list(:repository_version => version_href).results.first&.pulp_href
+        else
+          api.publications_api.list(:repository_version => version_href).results.first&.pulp_href
+        end
       end
 
       def create_version(options = {})
@@ -127,8 +131,12 @@ module Katello
       def sync(options = {})
         sync_params = repo_service.sync_url_params(options)
         sync_params[:remote] = remote_href
-        sync_params[:mirror] = true
-        sync_params.delete(:sync_policy)
+        if repo.yum?
+          sync_params[:sync_policy] = 'mirror_complete'
+        else
+          sync_params.delete(:sync_policy)
+          sync_params[:mirror] = true
+        end
         repository_sync_url_data = api.repository_sync_url_class.new(sync_params)
         [api.repositories_api.sync(repository_href, repository_sync_url_data)]
       end
@@ -167,8 +175,13 @@ module Katello
 
       def create_publication
         if (href = version_href)
-          publication_data = api.publication_class.new(publication_options(href))
-          api.publications_api.create(publication_data)
+          if repo_service.repo.content_type == "deb"
+            publication_data = api.publication_verbatim_class.new({repository_version: href})
+            api.publications_verbatim_api.create(publication_data)
+          else
+            publication_data = api.publication_class.new(publication_options(href))
+            api.publications_api.create(publication_data)
+          end
         end
       end
 

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

@@ -81,24 +81,24 @@ module Katello
         backend_data['rpm_license']
       end
 
-      def parse_filename(path)
+      def self.parse_filename(path)
         File.split(path).last unless path.blank?
       end
 
-      def update_model(model)
+      def self.generate_model_row(unit)
         custom_json = {}
-        custom_json['modular'] = backend_data['is_modular']
-        custom_json['pulp_id'] = backend_data['pulp_href']
+        custom_json['modular'] = unit['is_modular']
+        custom_json['pulp_id'] = unit['pulp_href']
         (PULP_INDEXED_FIELDS - ['is_modular', 'pulp_href', 'rpm_sourcerpm', 'pkgId', 'location_href']).
-          each { |field| custom_json[field] = backend_data[field] }
-        custom_json['release_sortable'] = Util::Package.sortable_version(backend_data['release'])
-        custom_json['version_sortable'] = Util::Package.sortable_version(backend_data['version'])
-        custom_json['filename'] = parse_filename(backend_data['location_href']) #location_href is the relative path of the rpm in the upstream repo
-        custom_json['checksum'] = backend_data['pkgId']
-        custom_json['sourcerpm'] = backend_data['rpm_sourcerpm']
-        model.assign_attributes(custom_json)
-        model.nvra = model.build_nvra
-        model.save!
+          each { |field| custom_json[field] = unit[field] }
+        custom_json['release_sortable'] = Util::Package.sortable_version(unit['release'])
+        custom_json['version_sortable'] = Util::Package.sortable_version(unit['version'])
+        custom_json['filename'] = parse_filename(unit['location_href']) #location_href is the relative path of the rpm in the upstream repo
+        custom_json['checksum'] = unit['pkgId']
+        custom_json['sourcerpm'] = unit['rpm_sourcerpm']
+        custom_json['nvra'] = Util::Package.build_nvra(custom_json.with_indifferent_access)
+        custom_json['summary'] = custom_json['summary']&.truncate(255)
+        custom_json
       end
     end
   end

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

@@ -64,17 +64,18 @@ module Katello
         backend_data['rpm_license']
       end
 
-      def update_model(model)
+      def self.generate_model_row(unit)
         custom_json = {}
-        custom_json['pulp_id'] = backend_data['pulp_href']
+        custom_json['pulp_id'] = unit['pulp_href']
         (PULP_INDEXED_FIELDS - ['pulp_href', 'pkgId', 'location_href']).
-          each { |field| custom_json[field] = backend_data[field] }
-        custom_json['release_sortable'] = Util::Package.sortable_version(backend_data['release'])
-        custom_json['version_sortable'] = Util::Package.sortable_version(backend_data['version'])
-        custom_json['nvra'] = model.build_nvra
-        custom_json['filename'] = backend_data['location_href']
-        custom_json['checksum'] = backend_data['pkgId']
-        model.update!(custom_json)
+          each { |field| custom_json[field] = unit[field] }
+        custom_json['release_sortable'] = Util::Package.sortable_version(unit['release'])
+        custom_json['version_sortable'] = Util::Package.sortable_version(unit['version'])
+        custom_json['nvra'] = Katello::Util::Package.build_nvra(custom_json)
+        custom_json['filename'] = unit['location_href']
+        custom_json['checksum'] = unit['pkgId']
+        custom_json['summary'] = custom_json['summary']&.truncate(255)
+        custom_json
       end
     end
   end

data/app/services/katello/repository_type.rb

@@ -16,7 +16,8 @@ module Katello
               :pulp3_skip_publication, :configuration_class, :pulp3_api_class,
               :repositories_api_class, :api_class, :remotes_api_class, :repository_versions_api_class,
               :distributions_api_class, :remote_class, :repo_sync_url_class, :client_module_class,
-              :distribution_class, :publication_class, :publications_api_class, :url_description
+              :distribution_class, :publication_class, :publications_api_class, :url_description,
+              :test_url, :test_url_root_options
 
     attr_accessor :metadata_publish_matching_check, :index_additional_data_proc
     attr_reader :id, :unique_content_per_repo
@@ -144,14 +145,14 @@ module Katello
     end
 
     class ContentType
-      attr_accessor :model_class, :priority, :pulp2_service_class, :pulp3_service_class, :index, :uploadable, :removable,
-                    :primary_content, :index_on_pulp3, :generic_browser, :content_type, :repository_import_on_upload
+      attr_accessor :model_class, :priority, :pulp3_service_class, :index, :uploadable, :removable, :mutable,
+                    :primary_content, :index_on_pulp3, :generic_browser, :content_type, :repository_import_on_upload,
+                    :test_upload_path
 
       def initialize(options)
         self.model_class = options[:model_class]
         self.content_type = options[:content_type]
         self.priority = options[:priority] || 99
-        self.pulp2_service_class = options[:pulp2_service_class]
         self.pulp3_service_class = options[:pulp3_service_class]
         self.index = options[:index].nil? ? true : options[:index]
         self.index_on_pulp3 = options[:index_on_pulp3].nil? ? true : options[:index_on_pulp3]
@@ -160,6 +161,8 @@ module Katello
         self.primary_content = options[:primary_content] || false
         self.generic_browser = options[:generic_browser]
         self.repository_import_on_upload = options[:repository_import_on_upload]
+        self.test_upload_path = options[:test_upload_path]
+        self.mutable = options.fetch(:mutable, false)
       end
 
       def label
@@ -174,6 +177,10 @@ module Katello
           removable: removable
         }
       end
+
+      def generic?
+        false
+      end
     end
 
     class GenericContentType < ContentType
@@ -198,6 +205,10 @@ module Katello
         self.content_type
       end
 
+      def generic?
+        true
+      end
+
       def details_columns
         columns = []
         columns << "Name" if self.model_name

data/app/services/katello/repository_type_manager.rb

@@ -151,7 +151,7 @@ module Katello
       def model_class(pulp_service_class)
         enabled_repository_types.values.each do |repo_type|
           repo_type.content_types.each do |content_type|
-            return content_type.model_class if (content_type.pulp2_service_class == pulp_service_class || content_type.pulp3_service_class == pulp_service_class)
+            return content_type.model_class if (content_type.pulp3_service_class == pulp_service_class)
           end
         end
       end

data/app/services/katello/ui_notifications/subscriptions/manifest_expired_warning.rb

@@ -7,7 +7,7 @@ module Katello
         CDN_PATH = '/content/dist/rhel/server/7/listing'.freeze
 
         def self.deliver!(orgs = ::Organization.all)
-          return if Setting[:content_disconnected]
+          return unless Setting[:subscription_connection_enabled]
 
           orgs.each do |org|
             if cdn_inaccessible?(org) || upstream_inaccessible?(org)

data/app/services/katello/upstream_connection_checker.rb

@@ -1,7 +1,7 @@
 module Katello
   class UpstreamConnectionChecker
     POSSIBLE_EXCEPTIONS = [
-      Katello::Errors::DisconnectedMode,
+      Katello::Errors::SubscriptionConnectionNotEnabled,
       Katello::Errors::ManifestExpired,
       Katello::Errors::UpstreamConsumerGone,
       Katello::Errors::UpstreamConsumerNotFound,
@@ -33,7 +33,7 @@ module Katello
     private
 
     def assert_connected
-      fail Katello::Errors::DisconnectedMode if Setting[:content_disconnected]
+      fail Katello::Errors::SubscriptionConnectionNotEnabled unless Setting[:subscription_connection_enabled]
     end
 
     def assert_can_upstream_ping

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

@@ -8,35 +8,5 @@ description_format: Configure subscription manager to new content source
 feature: katello_change_content_source
 %>
 #!/bin/sh
-<%
-    content_source = @host.content_source
--%>
 
-<% if content_source -%>
-SSL_CA_CERT=$(mktemp)
-cat << EOF > $SSL_CA_CERT
-<%= foreman_server_ca_cert %>
-EOF
-
-KATELLO_SERVER_CA_CERT=/etc/rhsm/ca/katello-server-ca.pem
-RHSM_CFG=/etc/rhsm/rhsm.conf
-
-# Prepare SSL certificate
-mkdir -p /etc/rhsm/ca
-cp -f $SSL_CA_CERT $KATELLO_SERVER_CA_CERT
-chmod 644 $KATELLO_SERVER_CA_CERT
-
-# Configure subscription-manager
-test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak
-
-subscription-manager config \
-  --server.hostname="<%= content_source.rhsm_url.host %>" \
-  --server.port="<%= content_source.rhsm_url.port %>" \
-  --server.prefix="<%= content_source.rhsm_url.path %>" \
-  --rhsm.repo_ca_cert="$KATELLO_SERVER_CA_CERT" \
-  --rhsm.baseurl="<%= content_source.pulp_content_url %>"
-
-<% else -%>
-echo "Host [<%= @host.name %>] doesn't have assigned content source!"
-exit 1
-<% end -%>
+<%= change_content_source(@host, foreman_server_ca_cert) %>

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

@@ -2,25 +2,22 @@
 kind: job_template
 name: Install Errata - Katello SSH Default
 job_category: Katello
-description_format: 'Install errata %{Errata search query}'
+description_format: 'Install errata %{errata}'
 feature: katello_errata_install
 provider_type: SSH
 template_inputs:
-- name: Errata search query
-  description: Filter criteria for errata to be installed.
+- name: errata
+  description: A comma-separated list of errata to install
   input_type: user
-  required: false
+  required: true
 foreign_input_sets:
 - template: Package Action - SSH Default
   exclude: action,package
 %>
-
 <% if @host.operatingsystem.family == 'Suse' -%>
     <% advisories = input(:errata).split(',').join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
 <% else %>
-    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
-
-    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
+    <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
-<% end %>
+<% end %>

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

@@ -0,0 +1,26 @@
+<%#
+kind: job_template
+name: Install errata by search query - Katello SSH Default
+job_category: Katello
+description_format: 'Install errata %{Errata search query}'
+feature: katello_errata_install_by_search
+provider_type: SSH
+template_inputs:
+- name: Errata search query
+  description: Filter criteria for errata to be installed.
+  input_type: user
+  required: false
+foreign_input_sets:
+- template: Package Action - SSH Default
+  exclude: action,package
+%>
+
+<% if @host.operatingsystem.family == 'Suse' -%>
+    <% advisories = @host.advisory_ids(search: input("Errata search query")).join(' ') %>
+    <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
+<% else %>
+    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+
+    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
+    <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<%#
+kind: job_template
+name: Install packages by search query - Katello SSH Default
+job_category: Katello
+description_format: 'Install package(s) %{Package search query}'
+feature: katello_package_install_by_search
+provider_type: SSH
+template_inputs:
+- name: Package search query
+  description: Filter criteria for packages to be installed. IMPORTANT- If left blank, the job will attempt to install all possible packages.
+  input_type: user
+  required: false
+%>
+<% package_names = @host.package_names_for_job_template(
+  action: 'install',
+  search: input('Package search query')
+) -%>
+
+<%= render_template('Package Action - SSH Default', :action => 'install', :package => package_names.join(' ')) %>

data/app/views/katello/api/v2/cdn_configurations/show.json.rabl

@@ -1,4 +1,4 @@
-attributes :url, :username, :upstream_organization_label, :ssl_ca_credential_id
+attributes :url, :username, :upstream_organization_label, :ssl_ca_credential_id, :upstream_content_view_label, :upstream_lifecycle_environment_label, :type
 
 node :password_exists do |config|
   config.password.present?

data/app/views/katello/api/v2/environments/show.json.rabl

@@ -46,4 +46,13 @@ node :permissions do |env|
   }
 end
 
+node :content_views do |env|
+  env.content_views.non_default.map do |cv|
+    {
+      :name => cv.name,
+      :id => cv.id
+    }
+  end
+end
+
 extends 'katello/api/v2/common/timestamps'

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -8,6 +8,8 @@ glue(@resource.root) do
   attributes :content_type
   attributes :docker_upstream_name
   attributes :docker_tags_whitelist
+  attributes :include_tags
+  attributes :exclude_tags
   attributes :verify_ssl_on_sync
   attributes :unprotected, :full_path, :checksum_type
   attributes :container_repository_name

data/app/views/katello/layouts/react.html.erb

@@ -7,7 +7,6 @@
 <% end %>
 
 <% content_for(:content) do %>
-    <%= notifications %>
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
     <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
     <div id="reactRoot">

data/app/views/katello/sync_management/_repo.html.erb

@@ -6,37 +6,48 @@
     </label>
   </td>
   <td class="start_time">
-    <%= @repo_status[repo.id][:start_time] %>
+    <%= @repo_status[repo.id][:sync_id] ? @repo_status[repo.id][:start_time] : _('N/A') %>
   </td>
   <td class="duration">
-    <%= @repo_status[repo.id][:duration] %>
+    <%= @repo_status[repo.id][:sync_id] ? @repo_status[repo.id][:duration] : _('N/A') %>
   </td>
   <td class="size" data-size="<%= @repo_status[repo.id][:size] %>">
-    <%= @repo_status[repo.id][:display_size] %>
+    <%= @repo_status[repo.id][:sync_id] ? @repo_status[repo.id][:display_size]  : _('N/A')%>
   </td>
-  <td class="result">
-    <span class="result-info">
-      <a href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
-        <%= @repo_status[repo.id][:state] %>
-      </a>
-    </span>
-    <a class="info-tipsy clickable fa fa-warning <%= 'hidden' if @repo_status[repo.id][:raw_state] != 'error' %>"
-       href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
-      <span class="hidden-text hidden">
-        <div class="la error-tipsy">
-          <ul>
-            <% if @repo_status[repo.id][:error_details].present? && error_state?(@repo_status[repo.id]) %>
-              <% @repo_status[repo.id][:error_details][:messages].each do |error| %>
-                <li>
-                  <%= error %>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
-        </div>
+  <% if @repo_status[repo.id][:sync_id] %>
+    <td class="result">
+      <span class="result-info">
+          <a href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
+            <%= @repo_status[repo.id][:state] %>
+          </a>
       </span>
-    </a>
-  </td>
+      <a class="info-tipsy clickable fa fa-warning <%= 'hidden' if @repo_status[repo.id][:raw_state] != 'error' %>"
+         href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
+        <span class="hidden-text hidden">
+          <div class="la error-tipsy">
+            <ul>
+              <% if @repo_status[repo.id][:error_details].present? && error_state?(@repo_status[repo.id]) %>
+                <% @repo_status[repo.id][:error_details][:messages].each do |error| %>
+                  <li>
+                    <%= error %>
+                  </li>
+                <% end %>
+              <% end %>
+            </ul>
+          </div>
+        </span>
+      </a>
+    </td>
+  <% elsif repo&.latest_sync_audit&.created_at %>
+    <td>
+      <%= _("Synced ") + time_ago_in_words(repo&.latest_sync_audit&.created_at) + _(" ago.") %>
+    </td>
+  <% else%>
+    <td>
+      <%= @repo_status[repo.id][:state] %>
+    </td>
+  <% end %>
+
   <% if @show_org %>
     <td></td>
   <% end %>

data/config/initializers/monkeys.rb

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

data/config/routes/api/v2.rb

@@ -74,6 +74,7 @@ Katello::Engine.routes.draw do
             post :copy
             post :publish
             put :remove
+            put :bulk_delete_versions
             put :remove_filters
             match '/environments/:environment_id' => "content_views#remove_from_environment", :via => :delete
           end

data/config/routes/overrides.rb

@@ -32,6 +32,8 @@ Foreman::Application.routes.draw do
     end
   end
 
+  post '/change_host_content_source/data', to: 'hosts#change_content_source_data'
+
   namespace :api do
     scope "(:api_version)", :module => :v2, :defaults => {:api_version => 'v2'}, :api_version => /v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       match '/hosts/post_index' => 'hosts#index', :via => :post
@@ -80,6 +82,7 @@ Foreman::Application.routes.draw do
             match '/bulk/system_purpose' => 'hosts_bulk_actions#system_purpose', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
+            match '/bulk/change_content_source' => 'hosts_bulk_actions#change_content_source', :via => :put
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
           end
 

data/config/routes.rb

@@ -42,4 +42,6 @@ Katello::Engine.routes.draw do
   match '/labs' => 'react#index', :via => [:get]
   match '/labs/*page' => 'react#index', :via => [:get]
   match '/organization_select' => 'react#index', :via => [:get]
+
+  get '/change_host_content_source', to: 'react#index'
 end

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -38,7 +38,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
     self.table_name = "katello_content_views"
 
     has_many :systems, :class_name => "MigrateContentHosts::System", :dependent => :restrict_with_exception
-    has_many :content_facets, :class_name => "MigrateContentHosts::ContentFacet", :foreign_key => :content_view_id,
+    has_many :content_facets, :class_name => "MigrateContentHosts::ContentFacet",
              :inverse_of => :content_view, :dependent => :restrict_with_exception
   end
 

data/db/migrate/20180612164926_add_content_org_id.rb

@@ -7,8 +7,8 @@ class AddContentOrgId < ActiveRecord::Migration[5.1]
 
   class FakeProductContent < Katello::Model
     self.table_name = 'katello_product_contents'
-    belongs_to :product, :class_name => 'Katello::Product', :foreign_key => 'product_id', :inverse_of => :product_contents
-    belongs_to :content, :class_name => 'FakeContent', :foreign_key => 'content_id', :inverse_of => :product_contents
+    belongs_to :product, :class_name => 'Katello::Product', :inverse_of => :product_contents
+    belongs_to :content, :class_name => 'FakeContent', :inverse_of => :product_contents
   end
 
   class FakeProduct < Katello::Model

data/db/migrate/20211201154845_add_unique_indexes.rb

@@ -0,0 +1,20 @@
+class AddUniqueIndexes < ActiveRecord::Migration[6.0]
+  def up
+    ::Katello::Util::DeduplicationMigrator.new.execute!
+    add_index :katello_capsule_lifecycle_environments, [:capsule_id, :lifecycle_environment_id], unique: true, name: 'katello_capsule_lifecycle_environments_unique_index'
+    add_index :katello_content_view_erratum_filter_rules, [:errata_id, :content_view_filter_id], unique: true, name: 'katello_content_view_erratum_filter_rules_unique_index'
+    add_index :katello_content_view_module_stream_filter_rules, [:module_stream_id, :content_view_filter_id], unique: true, name: 'katello_content_view_module_stream_filter_rules_unique_index'
+    add_index :katello_content_view_package_group_filter_rules, [:uuid, :content_view_filter_id], unique: true, name: 'katello_content_view_package_group_filter_rules_unique_index'
+    add_index :katello_content_view_repositories, [:content_view_id, :repository_id], unique: true, name: 'katello_content_view_repositories_unique_index'
+    add_index :katello_content_views, [:name, :organization_id], unique: true, name: 'katello_content_views_name_unique_index'
+  end
+
+  def down
+    remove_index :katello_capsule_lifecycle_environments, name: 'katello_capsule_lifecycle_environments_unique_index'
+    remove_index :katello_content_view_erratum_filter_rules, name: 'katello_content_view_erratum_filter_rules_unique_index'
+    remove_index :katello_content_view_module_stream_filter_rules, name: 'katello_content_view_module_stream_filter_rules_unique_index'
+    remove_index :katello_content_view_package_group_filter_rules, name: 'katello_content_view_package_group_filter_rules_unique_index'
+    remove_index :katello_content_view_repositories, name: 'katello_content_view_repositories_unique_index'
+    remove_index :katello_content_views, name: 'katello_content_views_name_unique_index'
+  end
+end

data/db/migrate/20211208034230_add_content_view_and_lifecycle_environment.rb

@@ -0,0 +1,6 @@
+class AddContentViewAndLifecycleEnvironment < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_cdn_configurations, :upstream_content_view_label, :string
+    add_column :katello_cdn_configurations, :upstream_lifecycle_environment_label, :string
+  end
+end