katello 4.0.0 → 4.0.2

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

@@ -61,7 +61,7 @@ module Katello
             )
             unless distribution.results.first.variants.empty?
               unless distribution.results.first.variants.first.name.nil?
-                repo.update!(:distribution_variant => distribution.results.first.variants.first.name)
+                repo.update!(:distribution_variant => distribution.results.first.variants.map(&:name).join(','))
               end
             end
           end

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

@@ -5,6 +5,7 @@ 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/views/overrides/smart_proxies/_download_policy.erb

@@ -1,3 +1,3 @@
-<% if @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) %>
+<% if @smart_proxy.pulp_mirror? %>
   <%= select_f(f, :download_policy, download_policies, :label, :name, :size => "col-md-8" ) %>
 <% 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
+        unless content_facet.save(validate: false)
           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

@@ -24,29 +24,32 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
     self.table_name = 'katello_ostree_branches'
   end
 
+  def puppet_repositories
+    puppet_query = "SELECT \"katello_repositories\".* FROM \"katello_repositories\"" \
+      " INNER JOIN \"katello_root_repositories\" ON \"katello_root_repositories\".\"id\" =" \
+      " \"katello_repositories\".\"root_id\" WHERE \"katello_root_repositories\".\"content_type\" = 'puppet'"
+    ::Katello::Repository.find_by_sql(puppet_query)
+  end
+
   def up
-    if Katello::Repository.ostree_type.any? || Katello::Repository.puppet_type.any?
-      User.as_anonymous_admin do
-        FakeContentViewPuppetModule.delete_all
-        FakeContentViewPuppetEnvironmentPuppetModule.delete_all
-        FakeRepositoryPuppetModule.delete_all
-
-        FakeContentViewPuppetEnvironment.delete_all
-        FakePuppetModule.delete_all
-
-        Katello::Repository.puppet_type.delete_all
-
-        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)
-
-        Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
-          version.content_counts.except!('ostree', 'puppet_module')
-          version.save
-        end
-      end
+    FakeContentViewPuppetModule.delete_all
+    FakeContentViewPuppetEnvironmentPuppetModule.delete_all
+    FakeRepositoryPuppetModule.delete_all
+
+    FakeContentViewPuppetEnvironment.delete_all
+    FakePuppetModule.delete_all
+
+    ::Katello::Repository.delete(puppet_repositories) if puppet_repositories.any?
+
+    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)
+
+    Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
+      version.content_counts.except!('ostree', 'puppet_module')
+      version.save
     end
   end
 

data/db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb

@@ -0,0 +1,11 @@
+class FixRedHatRootRepositoryArch < ActiveRecord::Migration[6.0]
+  def up
+    ::Katello::RootRepository.
+      joins("INNER JOIN katello_contents ON katello_contents.cp_content_id = katello_root_repositories.content_id").
+      where.not(arch: 'noarch').where.not("katello_contents.content_url ILIKE '%$basearch%'").update(arch: 'noarch')
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html

@@ -12,7 +12,7 @@
 
     <div class="help-block">
       <span translate>
-        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced. Selecting "Validate Content" will cause only Yum repositories using the "Immediate" or "Background" download policies will be synced.
+        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced. Selecting "Validate Content" will cause only Yum repositories using the "Immediate" download policy to be synced.
       </span>
     </div>
 
@@ -23,4 +23,4 @@
       <span translate>Sync</span>
     </button>
   </span>
-</div>
+</div>

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

@@ -108,7 +108,7 @@
                ng-model="repository.deb_releases"
                type="text"/>
         <p class="help-block" translate>
-          Comma separated list of releases (suite or codename) to sync from. Default: stable
+          Whitespace-separated list of releases (suite or codename) to sync from. Default: stable
         </p>
       </div>
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Components' | translate }}">
@@ -117,7 +117,7 @@
                ng-model="repository.deb_components"
                type="text"/>
         <p class="help-block" translate>
-          Comma separated list of components to sync from (leave clear to sync all). Example: main
+          Whitespace-separated list of components to sync from (leave clear to sync all). Example: main
         </p>
       </div>
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Architectures' | translate }}">
@@ -126,7 +126,7 @@
                ng-model="repository.deb_architectures"
                type="text"/>
         <p class="help-block" translate>
-          Comma separated list of processor architectures to filter the sync by. Example: amd64
+          Whitespace-separated list of processor architectures to filter the sync by. Example: amd64
         </p>
       </div>
 
@@ -216,7 +216,6 @@
         <p class="help-block" translate>
           For On Demand synchronization, only the metadata is downloaded during sync and packages are fetched and stored on the filesystem when clients request them.
           On Demand is not recommended for custom repositories unless the upstream repository maintains older versions of packages within the repository.
-          For Background synchronization, a background task will download all packages after the initial sync (Deprecated).
           The Immediate option will download all metadata and packages immediately during the sync.
         </p>
       </div>

data/lib/katello.rb

@@ -28,6 +28,6 @@ module Katello
   require "katello/engine"
 
   def self.pulp_server
-    Katello::Pulp::Server.config(SETTINGS[:katello][:pulp][:url], User.remote_user)
+    Katello::Pulp::Server.config(::SmartProxy.pulp_primary.url + '/pulp/api/v2/', User.remote_user)
   end
 end

data/lib/katello/engine.rb

@@ -34,7 +34,6 @@ module Katello
         },
         :pulp => {
           :default_login => 'admin',
-          :url => 'https://localhost/pulp/api/v2/',
           :bulk_load_size => 2000,
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
@@ -79,16 +78,6 @@ module Katello
       require 'katello/apipie/validators'
     end
 
-    # make sure the Katello plugin is initialized before `after_initialize`
-    # hook so that the resumed Dynflow tasks can rely on everything ready.
-    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do
-      ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
-      require 'katello/plugin'
-
-      # extend builtin permissions from core with new actions
-      require 'katello/permissions'
-    end
-
     initializer "katello.register_actions", :before => :finisher_hook do |_app|
       ForemanTasks.dynflow.require!
       if (Setting.table_exists? rescue(false)) && Setting['host_tasks_workers_pool_size'].to_i > 0
@@ -99,6 +88,17 @@ module Katello
                         #{Katello::Engine.root}/app/lib/headpin/actions
                         #{Katello::Engine.root}/app/lib/katello/actions)
       ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
+      ForemanTasks.dynflow.eager_load_actions!
+    end
+
+    # make sure the Katello plugin is initialized before `after_initialize`
+    # hook so that the resumed Dynflow tasks can rely on everything ready.
+    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do
+      ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
+      require 'katello/plugin'
+
+      # extend builtin permissions from core with new actions
+      require 'katello/permissions'
     end
 
     initializer "katello.set_dynflow_middlewares", :before => :finisher_hook do |_app|

data/lib/katello/plugin.rb

@@ -3,7 +3,7 @@ require 'katello/repository_types.rb'
 require 'katello/host_status_manager.rb'
 # rubocop:disable Metrics/BlockLength
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 2.3'
+  requires_foreman '>= 2.4'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -229,7 +229,8 @@ Foreman::Plugin.register :katello do
   apipie_documented_controllers ["#{Katello::Engine.root}/app/controllers/katello/api/v2/*.rb"]
   apipie_ignored_controllers %w(::Api::V2::OrganizationsController)
   ApipieDSL.configuration.dsl_classes_matchers.concat [
-    "#{Katello::Engine.root}/app/models/katello/**/*.rb"
+    "#{Katello::Engine.root}/app/models/katello/**/*.rb",
+    "#{Katello::Engine.root}/app/lib/actions/**/*.rb"
   ]
 
   parameter_filter ::Host::Managed, :host_collection_ids => [],
@@ -413,4 +414,6 @@ Foreman::Plugin.register :katello do
   precompile.concat(bastion_locale_files)
 
   precompile_assets(precompile)
+
+  extend_observable_events(::Dynflow::Action.descendants.select { |klass| klass <= ::Actions::ObservableAction }.map(&:namespaced_event_names))
 end

data/lib/katello/tasks/clean_backend_objects.rake

@@ -4,27 +4,18 @@ namespace :katello do
     class BackendCleaner
       def initialize
         @candlepin_uuids = []
-        @pulp_uuids = []
         @katello_candlepin_uuids = []
-        @katello_pulp_uuids = []
       end
 
       def populate!
         @candlepin_uuids = Katello::Resources::Candlepin::Consumer.all_uuids
         @katello_candlepin_uuids = Katello::Host::SubscriptionFacet.pluck(:uuid).compact
-
-        @pulp_uuids = ::Katello.pulp_server.extensions.consumer.retrieve_all.map { |consumer| consumer['id'] }
-        @katello_pulp_uuids = Katello::Host::ContentFacet.pluck(:uuid).compact
       end
 
       def hosts_with_no_subscriptions
         ::Host.where(:id => Katello::Host::SubscriptionFacet.where(:uuid => @katello_candlepin_uuids - @candlepin_uuids).select(:host_id))
       end
 
-      def hosts_with_no_content
-        ::Host.where(:id => Katello::Host::ContentFacet.where(:uuid => @katello_pulp_uuids - @pulp_uuids).select(:host_id))
-      end
-
       def hosts_with_nil_facets
         nil_sub = Katello::Host::SubscriptionFacet.where(:uuid => nil).select(:host_id).to_sql
         ::Host.where(" id in (#{nil_sub})")
@@ -33,10 +24,6 @@ namespace :katello do
       def cp_orphaned_host_uuids
         @candlepin_uuids - @katello_candlepin_uuids
       end
-
-      def pulp_orphaned_host_uuids
-        @pulp_uuids - @katello_pulp_uuids
-      end
     end
 
     def cleanup_hosts(cleaner)
@@ -49,11 +36,6 @@ namespace :katello do
         print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing subscription information.  Un-registering\n"
         execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
-
-      cleaner.hosts_with_no_content.each do |host|
-        print "Host #{host.id} #{host.name} #{host.content_facet.try(:uuid)} is partially missing content information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
-      end
     end
 
     def clean_backend_orphans(cleaner)
@@ -63,13 +45,6 @@ namespace :katello do
       cp_uuids.each do |consumer_id|
         execute("exception when destroying candlepin consumer #{consumer_id}") { Katello::Resources::Candlepin::Consumer.destroy(consumer_id) }
       end
-
-      pulp_uuids = cleaner.pulp_orphaned_host_uuids
-      print "#{pulp_uuids.count} orphaned consumer id(s) found in pulp.\n"
-      print "Pulp orphaned consumers: #{pulp_uuids}\n"
-      pulp_uuids.each do |consumer_id|
-        execute("exception when destroying pulp consumer #{consumer_id}") { Katello.pulp_server.extensions.consumer.delete(consumer_id) }
-      end
     end
 
     def host_unregister_options(host)

data/lib/katello/tasks/fix_hostgroup_facets.rake

@@ -0,0 +1,8 @@
+namespace :katello do
+  desc "This task collates hostgroup content facts that were missed during the upgrade from audit.\
+        It then updates the hostgroup content_facet accordingly."
+  task :fix_hostgroup_facets => :environment do
+    User.current = User.anonymous_admin
+    ::Katello::Util::HostgroupFacetsHelper.new.main
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.0.0".freeze
+  VERSION = "4.0.2".freeze
 end

data/lib/proxy_api/container_gateway.rb

@@ -1,21 +1,32 @@
 module ProxyAPI
   class ContainerGateway < ::ProxyAPI::Resource
     def initialize(args)
-      @url = args[:url] + "/container_gateway/v2"
+      @url = args[:url] + "/container_gateway"
       super args
     end
 
-    def unauthenticated_repository_list(args = {})
-      # get '/v2/unauthenticated_repository_list/?'
-      # put '/v2/unauthenticated_repository_list/?'
-      @url += "/unauthenticated_repository_list"
-      if args.empty?
-        @unauthenticated_repo_list = parse get
-      else
-        parse put(args)
-      end
+    def repository_list(args)
+      # put '/v2/repository_list/?'
+      @url += "/repository_list"
+      parse put(args)
     rescue => e
-      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to perform unauthenticated repository list operation"))
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to update the repository list"))
+    end
+
+    def user_repository_mapping(args)
+      # put '/v2/user_repository_mapping/?'
+      @url += "/user_repository_mapping"
+      parse put(args)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to update the user-repository mapping"))
+    end
+
+    def users
+      # get '/v2/users/?'
+      @url += "/users"
+      @users = parse get
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to get users"))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,30 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -354,20 +368,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
@@ -930,6 +944,8 @@ files:
 - app/lib/actions/katello/host/update_system_purpose.rb
 - app/lib/actions/katello/host/upload_package_profile.rb
 - app/lib/actions/katello/host/upload_profiles.rb
+- app/lib/actions/katello/jail_concern/content_view.rb
+- app/lib/actions/katello/jail_concern/organization.rb
 - app/lib/actions/katello/organization/create.rb
 - app/lib/actions/katello/organization/destroy.rb
 - app/lib/actions/katello/organization/manifest_delete.rb
@@ -1073,7 +1089,6 @@ files:
 - app/lib/actions/pulp3/abstract.rb
 - app/lib/actions/pulp3/abstract_async_task.rb
 - app/lib/actions/pulp3/capsule_content/generate_metadata.rb
-- app/lib/actions/pulp3/capsule_content/refresh_content_guard.rb
 - app/lib/actions/pulp3/capsule_content/refresh_distribution.rb
 - app/lib/actions/pulp3/capsule_content/sync.rb
 - app/lib/actions/pulp3/content_guard/refresh.rb
@@ -1203,6 +1218,7 @@ files:
 - app/lib/katello/util/docker_manifest_clause_generator.rb
 - app/lib/katello/util/errata.rb
 - app/lib/katello/util/filter_clause_generator.rb
+- app/lib/katello/util/hostgroup_facets_helper.rb
 - app/lib/katello/util/http_proxy.rb
 - app/lib/katello/util/model.rb
 - app/lib/katello/util/module_stream_clause_generator.rb
@@ -2164,6 +2180,7 @@ files:
 - db/migrate/20210201163238_migrate_background_download_policy_to_migrate.rb
 - db/migrate/20210208213920_add_available_module_stream_context.rb
 - db/migrate/20210218214048_change_default_content_view_version_export_history.rb
+- db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4518,6 +4535,7 @@ files:
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
 - lib/katello/tasks/delete_orphaned_content.rake
+- lib/katello/tasks/fix_hostgroup_facets.rake
 - lib/katello/tasks/import_applicability.rake
 - lib/katello/tasks/import_subscriptions.rake
 - lib/katello/tasks/jenkins.rake
@@ -5194,7 +5212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman