katello 4.18.0 → 4.19.0.rc1

data/lib/katello/permission_creator.rb

@@ -38,7 +38,6 @@ module Katello
       @plugin.permission :edit_activation_keys,
                          {
                            'katello/api/v2/activation_keys' => [:update, :content_override,
-                                                                :add_subscriptions, :remove_subscriptions,
                                                                 :add_host_collections, :remove_host_collections],
                          },
                          :resource_type => 'Katello::ActivationKey',
@@ -254,7 +253,7 @@ module Katello
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :content_types, :auto_complete_search, :cancel],
                            'katello/api/v2/packages' => [:index, :thindex, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/srpms' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
+                           'katello/api/v2/debs' => [:index, :thindex, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifest_lists' => [:index, :show, :auto_complete_search, :compare],
@@ -289,6 +288,7 @@ module Katello
                                                         :repo_compare_packages],
                            'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search],
                            'katello/api/v2/host_packages' => [:installed_packages],
+                           'katello/api/v2/host_debs' => [:installed_debs],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :readable

data/lib/katello/permissions/host_permissions.rb

@@ -10,9 +10,6 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/host_packages/upgrade_all',
   'katello/api/v2/host_packages/remove',
   'katello/api/v2/host_packages/auto_complete_search',
-  'katello/api/v2/host_subscriptions/auto_attach',
-  'katello/api/v2/host_subscriptions/add_subscriptions',
-  'katello/api/v2/host_subscriptions/remove_subscriptions',
   'katello/api/v2/host_subscriptions/available_release_versions',
   'katello/api/v2/host_subscriptions/content_override',
   'katello/api/v2/hosts_bulk_actions/bulk_add_host_collections',
@@ -20,9 +17,6 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/install_content',
   'katello/api/v2/hosts_bulk_actions/update_content',
   'katello/api/v2/hosts_bulk_actions/remove_content',
-  'katello/api/v2/hosts_bulk_actions/add_subscriptions',
-  'katello/api/v2/hosts_bulk_actions/remove_subscriptions',
-  'katello/api/v2/hosts_bulk_actions/auto_attach',
   'katello/api/v2/hosts_bulk_actions/content_overrides',
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
   'katello/api/v2/hosts_bulk_actions/release_version',

data/lib/katello/plugin.rb

@@ -221,6 +221,15 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
+  menu :labs_menu,
+       :container_images,
+       :url => '/labs/container_images',
+       :url_hash => {:controller => 'katello/api/v2/container_images_controller',
+                     :action => 'index'},
+       :caption => N_('Container Images'),
+       :parent => :lab_features_menu,
+       :turbolinks => false
+
   extend_template_helpers Katello::KatelloUrlsHelper
   extend_template_helpers Katello::Concerns::BaseTemplateScopeExtensions
 
@@ -242,7 +251,7 @@ Foreman::Plugin.register :katello do
   parameter_filter ::Host::Managed, :host_collection_ids => [],
     :content_facet_attributes => [:content_view_id, :lifecycle_environment_id, :content_source_id,
                                   :host, :kickstart_repository_id],
-    :subscription_facet_attributes => [:release_version, :autoheal, :purpose_usage, :purpose_role, :service_level, :host,
+    :subscription_facet_attributes => [:release_version, :purpose_usage, :purpose_role, :service_level, :host,
                                        {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, {:hypervisor_guest_uuids => []}]
   parameter_filter ::Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
@@ -596,6 +605,12 @@ Foreman::Plugin.register :katello do
         full_name: N_('Delete Host upon unregister'),
         description: N_("When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host such as virtual machines and DNS records may also be deleted.")
 
+      setting 'retain_build_profile_upon_unregistration',
+        type: :boolean,
+        default: false,
+        full_name: N_('Retain build profile upon unregistration'),
+        description: N_("When enabled, provisioning information like content view environments, kickstart repository, and content source will be retained when a host is unregistered. When disabled, this information will be cleared during unregistration.")
+
       setting 'register_hostname_fact',
         type: :string,
         default: '',
@@ -705,13 +720,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Hide Reclaim Space Warning'),
         description: N_('If this is enabled, the Smart Proxy page will suppress the warning message about reclaiming space.')
 
-      setting 'deb_enable_structured_apt',
-        type: :boolean,
-        default: false,
-        full_name: N_('Enable structured APT for deb content'),
-        description: N_("If set, newly created APT repos in Katello will use the same repo structure as the remote repos they are synchronized from. " \
-                        "You may migrate existing APT repos to match the setting, by running 'foreman-rake katello:migrate_structure_content_for_deb'.")
-
       setting 'registry_token_expiration_minutes',
         type: :integer,
         default: 60,

data/lib/katello/tasks/jenkins.rake

@@ -17,7 +17,7 @@ begin
       Rake::Task['rake:test:katello:test'].invoke
     end
 
-    desc "Runs puplcore integration tests"
+    desc "Runs pulpcore integration tests"
     task 'katello:pulpcore' do
       Rake::Task['jenkins:setup:minitest'].invoke
       Rake::Task['rake:test:katello:test:pulpcore'].invoke

data/lib/katello/tasks/upgrades/4.19/enable_structured_apt_for_deb.rake

@@ -0,0 +1,87 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.19' do
+      desc "Migrate all APT repo content using simple mode to use structured APT mode."
+      task :enable_structured_apt_for_deb => ['environment', 'dynflow:client', "check_ping"] do
+        ::ForemanTasks.dynflow.config.remote = true
+        ::ForemanTasks.dynflow.initialize!
+
+        User.current = User.anonymous_api_admin # Set a user
+
+        roots = Katello::RootRepository.deb_type
+
+        if roots.any?
+          puts "Enabling structured APT for all deb type repos not already migrated."
+        else
+          puts "Since there are no deb type repos, enabling structured APT does not require migration. Skipping."
+          exit
+        end
+
+        found_repos_to_migrate = false
+        roots.includes(:repositories).each do |root|
+          next unless root.content_id
+          found_repos_to_migrate = true
+          puts "Migrating root repo '#{root.name}', id='#{root.id}'."
+
+          # Ensure ensure_valid_deb_constraints won't prevent us from saving the root repo.
+          unless root.ensure_valid_deb_constraints.blank?
+            puts "Root repo '#{root.name}' (id='#{root.id}') violates deb constraints, setting url and deb_releases to nil!"
+            root.url = nil
+            root.deb_releases = nil
+          end
+
+          repos = root.repositories
+          library_instance = root.library_instance
+          if root.content_id != 'NEEDS_RE_MIGRATION'
+            begin
+              # Move the content_id from the root to the library instance so that ContentDestroy will destroy it!
+              old_content_id = root.content_id
+              library_instance.content_id = old_content_id
+              library_instance.save!
+              root.content_id = nil
+              root.save!
+              ForemanTasks.sync_task(::Actions::Katello::Product::ContentDestroy, root.library_instance)
+              library_instance.content_id = nil
+              library_instance.save!
+            rescue
+              root.content_id = old_content_id
+              root.save!
+              library_instance.content_id = nil
+              library_instance.save!
+              raise
+            end
+          end
+          begin
+            root.content_id = nil
+            root.save!
+
+            repos.each do |repo|
+              if repo[:content_id].nil?
+                content_create = ForemanTasks.sync_task(::Actions::Katello::Product::ContentCreate, repo)
+                content_id = content_create.input[:content_id]
+              else
+                content_id = repo.content_id
+              end
+              content_view_environment = repo.content_view_environment
+              if content_view_environment
+                ForemanTasks.sync_task(::Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => content_view_environment.cp_id, :content_id => content_id)
+              end
+            end
+          rescue
+            root.content_id = 'NEEDS_RE_MIGRATION'
+            root.save!
+            raise
+          end
+          puts "Successfully migrated root repo '#{root.name}', id='#{root.id}'."
+        end
+
+        if found_repos_to_migrate
+          puts "Successfully migrated all remaining repositories to use structured APT!"
+          puts "IMPORTANT: Any smart proxies serving deb content that was migrated must be re-synced!"
+        else
+          puts "Found no repositories that needed migrating. All existing deb type repos are already using structured APT!"
+        end
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/4.19/populate_repository_version_prns.rake

@@ -0,0 +1,32 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.19' do
+      desc "Populate repository version PRNs for all repositories"
+      task :populate_repository_version_prns => ["dynflow:client", "check_ping"] do
+        User.current = User.anonymous_api_admin
+        api = ::Katello::Pulp3::Api::Core.new(SmartProxy.pulp_primary)
+        updates = []
+        api.core_repository_versions_list_all(fields: 'pulp_href,prn').each do |repo_version|
+          next if repo_version.prn.blank?
+          updates << { version_href: repo_version.pulp_href, prn: repo_version.prn }
+        end
+
+        return if updates.empty?
+
+        updates.each_slice(10_000) do |batch|
+          when_clauses = batch.map do |update|
+            version_href = ::Katello::Repository.connection.quote_string(update[:version_href])
+            prn = ::Katello::Repository.connection.quote_string(update[:prn])
+            "WHEN '#{version_href}' THEN '#{prn}'"
+          end
+
+          version_hrefs = batch.map { |u| u[:version_href] }
+          case_statement = "CASE version_href #{when_clauses.join(' ')} END"
+
+          ::Katello::Repository.where(version_href: version_hrefs)
+                               .update_all("version_prn = #{case_statement}")
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.18.0".freeze
+  VERSION = "4.19.0.rc1".freeze
 end

data/lib/monkeys/fix_rpm_repository_gpgcheck.rb

@@ -0,0 +1,38 @@
+require 'pulp_rpm_client'
+
+# Monkey patch to allow nil values for deprecated gpgcheck and repo_gpgcheck fields
+# These fields were removed in pulp_rpm 3.30.0 but older Pulp versions return null
+# The new bindings don't allow nil, causing ArgumentError when deserializing responses
+[PulpRpmClient::RpmRpmRepositoryResponse, PulpRpmClient::RpmRpmPublicationResponse].each do |klass|
+  klass.class_eval do
+    # Custom attribute writer method with validation
+    # @param [Object] gpgcheck Value to be assigned
+    def gpgcheck=(gpgcheck)
+      # Allow nil for deprecated field - monkey patch here
+      if !gpgcheck.nil? && gpgcheck > 1
+        fail ArgumentError, 'invalid value for "gpgcheck", must be smaller than or equal to 1.'
+      end
+
+      if !gpgcheck.nil? && gpgcheck < 0
+        fail ArgumentError, 'invalid value for "gpgcheck", must be greater than or equal to 0.'
+      end
+
+      @gpgcheck = gpgcheck
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] repo_gpgcheck Value to be assigned
+    def repo_gpgcheck=(repo_gpgcheck)
+      # Allow nil for deprecated field - monkey patch here
+      if !repo_gpgcheck.nil? && repo_gpgcheck > 1
+        fail ArgumentError, 'invalid value for "repo_gpgcheck", must be smaller than or equal to 1.'
+      end
+
+      if !repo_gpgcheck.nil? && repo_gpgcheck < 0
+        fail ArgumentError, 'invalid value for "repo_gpgcheck", must be greater than or equal to 0.'
+      end
+
+      @repo_gpgcheck = repo_gpgcheck
+    end
+  end
+end