katello 4.0.3 → 4.1.0.rc1

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

@@ -282,6 +282,24 @@ module Katello
         tasks
       end
 
+      def copy_all(source_repository, mirror: false)
+        if mirror
+          data = api.class.add_remove_content_class.new(
+                    base_version: source_repository.version_href)
+
+          [api.repositories_api.modify(repository_reference.repository_href, data)]
+        elsif api.respond_to? :copy_api
+          data = api.class.copy_class.new
+          data.config = [{
+            source_repo_version: source_repository.version_href,
+            dest_repo: repository_reference.repository_href
+          }]
+          [api.copy_api.copy_content(data)]
+        else
+          copy_content_for_source(source_repository)
+        end
+      end
+
       def copy_version(from_repository)
         create_version(:base_version => from_repository.version_href)
       end
@@ -330,7 +348,8 @@ module Katello
           tls_validation: root.verify_ssl_on_sync,
           name: generate_backend_object_name,
           url: root.url,
-          proxy_url: root.http_proxy&.full_url
+          proxy_url: root.http_proxy&.full_url,
+          total_timeout: Setting[:sync_connect_timeout]
         }
         remote_options[:url] = root.url unless root.url.blank?
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?

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

@@ -111,6 +111,10 @@ module Katello
         backend_data['rpm_license']
       end
 
+      def parse_filename(path)
+        File.split(path).last unless path.blank?
+      end
+
       def update_model(model)
         custom_json = {}
         custom_json['modular'] = backend_data['is_modular']
@@ -119,7 +123,7 @@ module Katello
           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'] = backend_data['location_href']
+        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)

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

@@ -56,8 +56,10 @@ module Katello
         @pulp_data ||= tasks_api.read(@href).as_json.with_indifferent_access
       end
 
-      def tasks_api
-        ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+      delegate :tasks_api, to: :core_api
+
+      def core_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy)
       end
 
       def task_group_href
@@ -72,6 +74,10 @@ module Katello
         task_data['progress_reports']
       end
 
+      def correlation_id
+        task_data['logging_cid']
+      end
+
       def poll
         task_data(true)
         self
@@ -94,10 +100,11 @@ module Katello
       end
 
       def cancel
-        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
-        tasks_api.tasks_cancel(task_data['pulp_href'], data)
+        core_api.cancel_task(task_data['pulp_href'])
         #the main task may have completed, so cancel spawned tasks too
-        task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
+        task_data['spawned_tasks']&.each do |spawned|
+          core_api.cancel_task(spawned['pulp_href'])
+        end
       end
     end
   end

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

@@ -79,12 +79,17 @@ module Katello
         end
       end
 
+      def core_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy)
+      end
+
       def cancel
-        tasks_api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
-        tasks_response = tasks_api.list(task_group: task_group_data['pulp_href'])
-        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
-        tasks_response.results.collect do |result|
-          tasks_api.tasks_cancel(result.pulp_href, data)
+        tasks_api = core_api.tasks_api
+        tasks_response = core_api.fetch_from_list do |page_opts|
+          tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: 'running,waiting'))
+        end
+        tasks_response.collect do |result|
+          ::Katello::Pulp3::Api::Core.new(@smart_proxy).cancel_task(result.pulp_href)
         end
       end
     end

data/app/services/katello/smart_proxy_helper.rb

@@ -35,7 +35,7 @@ module Katello
       if repository
         [repository]
       else
-        repositories_available_to_capsule(environment, content_view) + puppet_environments_available_to_capsule(environment, content_view)
+        repositories_available_to_capsule(environment, content_view)
       end
     end
 
@@ -45,12 +45,5 @@ module Katello
       yum_repos = yum_repos.in_content_views([content_view]) if content_view
       yum_repos.smart_proxy_syncable
     end
-
-    def puppet_environments_available_to_capsule(environments, content_view)
-      environments = @smart_proxy.lifecycle_environments if environments.nil?
-      puppet_environments = Katello::ContentViewPuppetEnvironment.in_environment(environments)
-      puppet_environments = puppet_environments.in_content_view(content_view) if content_view
-      puppet_environments
-    end
   end
 end

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -5,7 +5,6 @@ module Katello
         class << self
           def deliver!
             SmartProxy.unscoped.with_content.each do |proxy|
-              percentage = proxy.pulp_disk_usage[0]['percentage']
               if percentage < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
               elsif update_notifications(proxy).empty? && percentage > 90

data/app/services/katello/ui_notifications/system_error.rb

@@ -0,0 +1,25 @@
+module Katello
+  module UINotifications
+    class SystemError < ::UINotifications::Base
+      private
+
+      def create
+        if unexpired_notifications.zero?
+          Notification.create!(
+            initiator: initiator,
+            audience: ::Notification::AUDIENCE_ADMIN,
+            notification_blueprint: blueprint
+          )
+        end
+      end
+
+      def unexpired_notifications
+        blueprint.notifications.update_all(expired_at: blueprint.expired_at)
+      end
+
+      def blueprint
+        @blueprint ||= NotificationBlueprint.find_by(name: 'system_status_error')
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ child :content_view => :content_view do
 end
 
 child :latest_version => :content_view_version do
-  attributes :id, :name, :label, :content_view_id, :version, :puppet_module_count
+  attributes :id, :name, :label, :content_view_id, :version
 
   child :content_view => :content_view do
     attributes :id, :name, :label, :description

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

@@ -21,7 +21,6 @@ child :content_view => :content_view do
         :package => repo.rpms.count,
         :package_group => repo.package_groups.count,
         :erratum => repo.errata.count,
-        :puppet_module => repo.puppet_modules.count,
         :module_stream => repo.module_streams.count
       }
     end

data/app/views/katello/api/v2/{puppet_modules → content_view_version_import_histories}/index.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
-  extends "katello/api/v2/puppet_modules/base"
+  extends 'katello/api/v2/content_view_version_import_histories/show'
 end

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

@@ -0,0 +1,14 @@
+object @resource
+
+attributes :path, :id, :metadata
+attributes :import_type => :type
+
+node :content_view_version do |h|
+  h.content_view_version.name
+end
+
+node :content_view_version_id do |h|
+  h.content_view_version.id
+end
+
+extends 'katello/api/v2/common/timestamps'

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

@@ -45,8 +45,8 @@ version = @object || @resource
 child :environments => :environments do
   attributes :id, :name, :label
 
-  node :puppet_environment_id do |environment|
-    version.puppet_env(environment).try(:puppet_environment).try(:id)
+  node :publish_date do |env|
+    time_ago_in_words(version.env_promote_date(env))
   end
 
   node :permissions do |env|

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

@@ -1,10 +1,3 @@
 object @resource
 
 extends "katello/api/v2/content_view_versions/base"
-
-child :puppet_modules => :puppet_modules do
-  attributes :id
-  attributes :name
-  attributes :author
-  attributes :version
-end

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

@@ -4,9 +4,8 @@ extends 'katello/api/v2/common/org_reference'
 attributes :composite
 attributes :component_ids
 attributes :default
-attributes :force_puppet_environment
 attributes :version_count
-attributes :latest_version
+attributes :latest_version, :latest_version_id
 attributes :auto_publish
 attributes :solve_dependencies
 attributes :import_only
@@ -15,6 +14,20 @@ node :next_version do |content_view|
   content_view.next_version.to_f.to_s
 end
 
+child :last_task => :last_task do |_task|
+  attributes :task_id => :id
+  attributes :status => :result
+  node :last_sync_words do |object|
+    if object.try(:created_at)
+      time_ago_in_words(Time.parse(object.created_at.to_s))
+    end
+  end
+end
+
+child :latest_version_env => :latest_version_environments do
+  attributes :id, :name, :label
+end
+
 node :last_published do |content_view|
   unless content_view.versions.empty?
     content_view.versions.order(:created_at).last.created_at
@@ -42,12 +55,6 @@ else
   attributes :repository_ids
 end
 
-child :puppet_modules => :puppet_modules do
-  attributes :id, :name, :author, :uuid
-  attributes :created_at
-  attributes :updated_at
-end
-
 child :versions => :versions do
   attributes :id, :version
   attributes :created_at => :published
@@ -65,7 +72,7 @@ node :permissions do |cv|
 end
 
 child :components => :components do
-  attributes :id, :name, :label, :content_view_id, :version, :puppet_module_count
+  attributes :id, :name, :label, :content_view_id, :version
 
   child :environments => :environments do
     attributes :id, :name, :label
@@ -88,4 +95,8 @@ child :activation_keys => :activation_keys do
   attributes :id, :name
 end
 
+child :hosts => :hosts do
+  attributes :id, :name
+end
+
 extends 'katello/api/v2/common/timestamps'

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

@@ -26,7 +26,6 @@ node :counts do |env|
   if env.library?
     repos = env.repositories.in_default_view
     counts[:packages] = Katello::Rpm.total_for_repositories(repos)
-    counts[:puppet_modules] = Katello::PuppetModule.in_repositories(repos).count
     counts[:module_streams] = Katello::ModuleStream.in_repositories(repos).count
     counts[:errata] = partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(Katello::Erratum.in_repositories(repos)))
     counts[:yum_repositories] = repos.yum_type.count

data/app/views/katello/api/v2/package_groups/index.json.rabl

@@ -4,4 +4,8 @@ extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
   extends "katello/api/v2/package_groups/base"
+
+  if params[:include_filter_ids]
+    node(:filter_ids) { |package_group| package_group.content_view_filters.pluck(:id) }
+  end
 end

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

@@ -35,7 +35,6 @@ node :content_counts do |repo|
     :package => repo.rpms.count,
     :package_group => repo.package_groups.count,
     :erratum => repo.errata.count,
-    :puppet_module => repo.puppet_modules.count,
     :file => repo.files.count,
     :deb => repo.debs.count,
     :module_stream => repo.module_streams.count,

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

@@ -13,7 +13,7 @@ glue(@resource.root) do
   attributes :container_repository_name
   attributes :download_policy
   attributes :url
-  attributes :ansible_collection_requirements
+  attributes :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token
   attributes :gpg_key_id
   attributes :ssl_ca_cert_id
   attributes :ssl_client_cert_id

data/app/views/katello/api/v2/repository_sets/index.json.rabl

@@ -1,3 +1,6 @@
 object false
+extends "katello/api/v2/common/metadata"
 
-extends 'katello/api/v2/common/index'
+child @collection[:results] => :results do
+  extends 'katello/api/v2/repository_sets/show'
+end

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

@@ -25,7 +25,29 @@ if @resource.product
   end
 end
 
+# For backwards compatibility with the original
+# ActivationKeys#product_contents
+
+child :content => :content do
+  attributes :id, :name, :label, :vendor, :content_type, :content_url, :gpg_url
+end
+
 child @resource.repositories => :repositories do
   attributes :id, :name, :arch
   attributes :minor => :releasever
 end
+
+node :override do |pc|
+  pc.override
+end
+
+node :overrides do |pc|
+  pc.content_overrides.map do |override|
+    {:name => override.name, :value => override.computed_value}
+  end
+end
+
+node :enabled_content_override do |pc|
+  override = pc.enabled_content_override
+  override&.computed_value
+end

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

@@ -5,7 +5,7 @@ extends "katello/api/v2/subscriptions/base"
 attributes :arch
 attributes :description
 attributes :support_type
-attributes :role, :usage, :addons
+attributes :roles, :usage, :addons
 
 node(:host_count) do |subscription|
   subscription.hosts.count

data/app/views/overrides/activation_keys/_host_media_type_select.html.erb

@@ -9,7 +9,7 @@
 
 <div class="clear-fix" id="media_selection_section">
   <div class="form-group ">
-     <label class="col-md-2 control-label" for="use_install_media">Media Selection</label>
+     <label class="col-md-2 control-label" for="use_install_media"><%= _('Media Selection') %></label>
      <div class="col-md-4">
         <label class="radio-inline">
           <input data-media-selector="true" id="host_use_synced_content" name="media_selector" value="synced_content" type="radio" <%= synced_content_radio  %> <%= synced_content_disabled %>/> <%= _('Synced Content') %>

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

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

data/config/initializers/monkeys.rb

@@ -1,5 +1,4 @@
 #place where monkey patches are required
-require 'monkeys/passenger_tee_input'
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'

data/config/katello.yaml.example

@@ -47,7 +47,6 @@
     :url: https://localhost/pulp/api/v2/
 
     :sync_threads: 4
-    :bulk_load_size: 100
     # refers to the apache certificate
     # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
     # to connect to pulp over https.

data/config/routes/api/v2.rb

@@ -33,7 +33,7 @@ Katello::Engine.routes.draw do
         api_resources :activation_keys, :only => [:index, :create, :show, :update, :destroy] do
           get :auto_complete_search, :on => :collection
           member do
-            match '/product_content' => 'activation_keys#product_content', :via => :get
+            match '/product_content' => 'repository_sets#index', :via => :get, :entity => :activation_key
             match '/content_override' => 'activation_keys#content_override', :via => :put
             post :copy
             put :add_subscriptions
@@ -74,15 +74,8 @@ Katello::Engine.routes.draw do
             post :copy
             post :publish
             put :remove
-            get :available_puppet_modules
-            get :available_puppet_module_names
             match '/environments/:environment_id' => "content_views#remove_from_environment", :via => :delete
           end
-          api_resources :content_view_puppet_modules do
-            collection do
-              get :auto_complete_search
-            end
-          end
           api_resources :filters, :controller => :content_view_filters do
             collection do
               get :auto_complete_search
@@ -95,7 +88,6 @@ Katello::Engine.routes.draw do
               get :auto_complete_search
             end
           end
-          api_resources :puppet_modules, :only => [:index]
           api_resources :repositories, :only => [:index] do
             collection do
               match '/show_all' => "content_view_repositories#show_all", :via => :get
@@ -107,21 +99,26 @@ Katello::Engine.routes.draw do
         api_resources :content_view_filters do
           api_resources :errata, :only => [:index]
           api_resources :package_groups, :only => [:index]
-          api_resources :rules, :controller => :content_view_filter_rules
+          api_resources :rules, :controller => :content_view_filter_rules do
+            collection do
+              get :auto_complete_search
+            end
+          end
           collection do
             get :auto_complete_search
           end
         end
 
-        api_resources :content_exports, :only => [] do
+        api_resources :content_exports, :only => [:index] do
           collection do
             post :version
             post :library
             get :index
-            get :api_status
           end
         end
 
+        api_resources :content_imports, :only => [:index]
+
         api_resources :content_export_incrementals, :only => [] do
           collection do
             post :version
@@ -197,7 +194,6 @@ Katello::Engine.routes.draw do
 
         api_resources :environments, :only => [:index, :show, :create, :update, :destroy] do
           api_resources :activation_keys, :only => [:index, :create]
-          api_resources :puppet_modules, :only => [:index]
         end
 
         api_resources :errata, :only => [:index, :show] do
@@ -297,12 +293,6 @@ Katello::Engine.routes.draw do
             end
           end
         end
-        api_resources :puppet_modules, :only => [:index, :show] do
-          collection do
-            get :auto_complete_search
-            get :compare
-          end
-        end
 
         api_resources :repositories, :only => [:index, :create, :show, :destroy, :update] do
           collection do
@@ -395,7 +385,6 @@ Katello::Engine.routes.draw do
           api_resources :package_groups, :only => [:index, :show]
           api_resources :files, :only => [:index, :show], :controller => 'file_units'
           api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-\+%_.:]+/}
-          api_resources :puppet_modules, :only => [:index, :show]
           api_resources :docker_manifests, :only => [:index, :show]
           api_resources :docker_manifest_lists, :only => [:index, :show]
           api_resources :docker_tags, :only => [:index, :show]
@@ -410,7 +399,6 @@ Katello::Engine.routes.draw do
           member do
             get :gpg_key_content
             put :remove_packages, :action => :remove_content
-            put :remove_puppet_modules, :action => :remove_content
             put :remove_docker_manifests, :action => :remove_content
             put :remove_content
             post :sync

data/config/routes/overrides.rb

@@ -22,7 +22,6 @@ Foreman::Application.routes.draw do
   match "/api/v2/organizations/:id", via: :delete, to: proc { [404, {}, [override_message]] }
 
   resources :hosts, :only => [] do
-    get 'puppet_environment_for_content_view', :on => :collection
     get :content_hosts, :on => :collection
   end
 
@@ -106,7 +105,7 @@ Foreman::Application.routes.draw do
           resources :subscriptions, :only => [:index], :controller => :host_subscriptions do
             collection do
               put :auto_attach
-              get :product_content
+              match '/product_content' => 'repository_sets#index', :via => :get, :entity => :host
               get :available_release_versions
               put :content_override
               put :remove_subscriptions

data/db/migrate/20140422000001_update_products_add_organization.rb

@@ -1,5 +1,6 @@
 class UpdateProductsAddOrganization < ActiveRecord::Migration[4.2]
-  class Katello::Product < ApplicationRecord
+  class FakeProduct < ApplicationRecord
+    self.table_name = 'katello_products'
     belongs_to :provider
     self.inheritance_column = nil
   end
@@ -7,7 +8,7 @@ class UpdateProductsAddOrganization < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_products, :organization_id, :integer, :null => true
 
-    Katello::Product.all.each do |product|
+    FakeProduct.all.each do |product|
       product.organization_id = product.provider.organization_id
       product.save!
     end

data/db/migrate/20160701180402_add_sortable_version_to_puppet_modules.rb

@@ -15,6 +15,8 @@ class AddSortableVersionToPuppetModules < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_puppet_modules, :sortable_version, :string
 
+    return unless Object.const_defined?('::Katello::PuppetModule')
+
     Katello::PuppetModule.find_each do |puppet_mod|
       puppet_mod.update_attribute(:sortable_version, sortable_version(puppet_mod.version))
     end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -46,7 +46,7 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        unless content_facet.save(validate: false)
+        unless content_facet.save
           Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
           Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
         end

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -32,34 +32,28 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
   end
 
   def up
-    FakeContentViewPuppetModule.delete_all
-    FakeContentViewPuppetEnvironmentPuppetModule.delete_all
-    FakeRepositoryPuppetModule.delete_all
+    if Katello::Repository.ostree_type.any? || puppet_repositories.any?
+      User.as_anonymous_admin do
+        FakeContentViewPuppetModule.delete_all
+        FakeContentViewPuppetEnvironmentPuppetModule.delete_all
+        FakeRepositoryPuppetModule.delete_all
 
-    FakeContentViewPuppetEnvironment.delete_all
-    FakePuppetModule.delete_all
+        FakeContentViewPuppetEnvironment.delete_all
+        FakePuppetModule.delete_all
 
-    if puppet_repositories.any?
-      User.as_anonymous_admin do
         ::Katello::Repository.delete(puppet_repositories)
-        ::Katello::RootRepository.where(content_type: 'puppet').destroy_all
-      end
-    end
-
-    FakeRepositoryOstreeBranch.delete_all
-    FakeOstreeBranch.delete_all
 
-    if Katello::Repository.ostree_type.any?
-      User.as_anonymous_admin do
+        FakeRepositoryOstreeBranch.delete_all
+        FakeOstreeBranch.delete_all
         Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
         Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
         Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
-      end
-    end
 
-    Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
-      version.content_counts.except!('ostree', 'puppet_module')
-      version.save
+        Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
+          version.content_counts.except!('ostree', 'puppet_module')
+          version.save
+        end
+      end
     end
   end
 

data/db/migrate/20210224160921_remove_disabled_products_from_sync_plans.rb

@@ -0,0 +1,6 @@
+class RemoveDisabledProductsFromSyncPlans < ActiveRecord::Migration[6.0]
+  def change
+    disabled = ::Katello::Product.redhat.where.not(:id => Katello::Product.enabled)
+    disabled.update_all(:sync_plan_id => nil)
+  end
+end