katello 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47586318c412278d01e596abf029eb1ac5daf00c
-  data.tar.gz: c6b70b2b09c74778a46cd0e9956bf1dea2026e7b
+  metadata.gz: 93cb21818ee2cbe71bd6c1397c5bcb3e654be074
+  data.tar.gz: 1e38b306b83721ab0dbd4ccdf775a75086eb8b2f
 SHA512:
-  metadata.gz: e34da099dcbe80e6719c48e0aaca5384612b1b12c4aa629f1a573ba1608e36a1526f215b154dcacebcb01bc4fec32bc266ea3017b771025e0a7dedbf6949f438
-  data.tar.gz: b5a4629b88bb63be9fc35de61179d7db463b7dc5ee7d3c8c6b6f8a9bc0afe071c6529894612f3a3ecf338e28c3ea3da6d7e0484d66a79fff0d1566f920ddd445
+  metadata.gz: 7b963f48b6f230b4cd16b47863186afc3912be25fd40feb4527fb64cc72c09a9727081b50b3ab410a97baa0f02d1b34881422e1cd8c9f3395b17461456b7b467
+  data.tar.gz: b84f6c7e67ad83144190bb5c14e9373db5a327f2899eb49efc931d4f6fcfa7c6dc41ae0244b872fffda803bf93ae827cabe66479adb661c1f415f138403cac9f

data/app/controllers/katello/concerns/hosts_controller_extensions.rb

@@ -19,8 +19,11 @@ module Katello
         prepend Overrides
 
         def destroy
-          Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
-          process_success
+          if Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
+            process_success(:success_redirect => hosts_path)
+          else
+            process_error :redirect => :back, :error_msg => _("Failed to delete %{host}: %{errors}") % { :host => @host, :errors => @host.errors.full_messages }
+          end
         rescue StandardError => ex
           process_error(:object => @host, :error_msg => ex.message, :redirect => saved_redirect_url_or(send("#{controller_name}_url")))
         end

data/app/jobs/create_pulp_disk_space_notifications.rb

@@ -1,10 +1,8 @@
 class CreatePulpDiskSpaceNotifications < ApplicationJob
-  after_perform do
-    self.class.set(:wait => 12.hours).perform_later
-  end
-
   def perform
     Katello::UINotifications::Pulp::ProxyDiskSpace.deliver!
+  ensure
+    self.class.set(:wait => 12.hours).perform_later
   end
 
   def humanized_name

data/app/jobs/send_expire_soon_notifications.rb

@@ -1,10 +1,8 @@
 class SendExpireSoonNotifications < ApplicationJob
-  after_perform do
-    self.class.set(:wait => 12.hours).perform_later
-  end
-
   def perform
     Katello::UINotifications::Subscriptions::ExpireSoon.deliver!
+  ensure
+    self.class.set(:wait => 12.hours).perform_later
   end
 
   def humanized_name

data/app/lib/actions/katello/foreman/content_update.rb

@@ -16,18 +16,20 @@ module Actions
         end
 
         def finalize
-          environment  = ::Katello::KTEnvironment.find(input[:environment_id])
-          content_view = ::Katello::ContentView.find(input[:content_view_id])
-          repository = ::Katello::Repository.find(input[:repository_id]) if input[:repository_id]
+          User.as_anonymous_admin do
+            environment  = ::Katello::KTEnvironment.find(input[:environment_id])
+            content_view = ::Katello::ContentView.find(input[:content_view_id])
+            repository = ::Katello::Repository.find(input[:repository_id]) if input[:repository_id]
 
-          if content_view.default? && repository
-            if repository.distribution_bootable?
-              os = Redhat.find_or_create_operating_system(repository)
-              arch = Architecture.where(:name => repository.distribution_arch).first_or_create!
-              os.architectures << arch unless os.architectures.include?(arch)
+            if content_view.default? && repository
+              if repository.distribution_bootable?
+                os = Redhat.find_or_create_operating_system(repository)
+                arch = Architecture.where(:name => repository.distribution_arch).first_or_create!
+                os.architectures << arch unless os.architectures.include?(arch)
+              end
+            else
+              ::Katello::Foreman.update_puppet_environment(content_view, environment)
             end
-          else
-            ::Katello::Foreman.update_puppet_environment(content_view, environment)
           end
         end
       end

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

@@ -9,10 +9,10 @@ module Actions
         def finalize
           ::User.current = ::User.anonymous_admin
           repo = ::Katello::Repository.find(input[:repo_id])
-          found_checksum = repo.pulp_checksum_type
 
-          if found_checksum && repo.checksum_type != found_checksum
-            repo.checksum_type = found_checksum
+          if repo.pulp_scratchpad_checksum_type &&
+              repo.pulp_scratchpad_checksum_type != repo.source_repo_checksum_type
+            repo.source_repo_checksum_type = repo.pulp_scratchpad_checksum_type
             repo.save!
           end
         ensure

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

@@ -50,7 +50,7 @@ module Katello
         scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => true
         scoped_search :on => :name, :relation => :hypervisor_host, :complete_value => true, :rename => :hypervisor_host, :ext_method => :find_by_hypervisor_host
         scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
-        scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id
+        scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id, :only_explicit => true
       end
 
       module ClassMethods

data/app/models/katello/glue/pulp/repo.rb

@@ -126,8 +126,8 @@ module Katello
         pulp_repo_facts.merge(as_json).merge(:sync_state => sync_state)
       end
 
-      def pulp_checksum_type
-        find_distributor['config']['checksum_type'] if self.try(:yum?) && find_distributor
+      def pulp_scratchpad_checksum_type
+        pulp_repo_facts&.dig('scratchpad', 'checksum_type')
       end
 
       def pulp_counts_differ?

data/app/models/katello/host/content_facet.rb

@@ -83,13 +83,14 @@ module Katello
       end
 
       def update_applicability_counts
-        self.update_attributes!(
+        self.assign_attributes(
             :installable_security_errata_count => self.installable_errata.security.count,
             :installable_bugfix_errata_count => self.installable_errata.bugfix.count,
             :installable_enhancement_errata_count => self.installable_errata.enhancement.count,
             :applicable_rpm_count => self.content_facet_applicable_rpms.count,
             :upgradable_rpm_count => self.installable_rpms.count
         )
+        self.save!(:validate => false)
       end
 
       def import_rpm_applicability(partial)

data/app/models/katello/repository.rb

@@ -253,6 +253,10 @@ module Katello
       content_view_version && content_view_version.default_content_view?
     end
 
+    def on_demand?
+      download_policy == Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND
+    end
+
     def self.in_environments_products(env_ids, product_ids)
       in_environment(env_ids).in_product(product_ids)
     end
@@ -470,10 +474,10 @@ module Katello
                      :content_id => self.content_id,
                      :content_view_version => to_version,
                      :content_type => self.content_type,
+                     :checksum_type => checksum_type || source_repo_checksum_type,
                      :docker_upstream_name => self.docker_upstream_name,
                      :download_policy => download_policy,
                      :unprotected => self.unprotected) do |clone|
-        clone.checksum_type = self.checksum_type
         options = {
           :repository => self,
           :environment => to_env,

data/app/models/katello/rpm.rb

@@ -16,7 +16,7 @@ module Katello
     scoped_search :on => :release, :complete_value => true, :ext_method => :scoped_search_release
     scoped_search :on => :arch, :complete_value => true
     scoped_search :on => :epoch, :complete_value => true
-    scoped_search :on => :evr, :ext_method => :scoped_search_evr
+    scoped_search :on => :evr, :ext_method => :scoped_search_evr, :only_explicit => true
     scoped_search :on => :filename, :complete_value => true
     scoped_search :on => :sourcerpm, :complete_value => true
     scoped_search :on => :checksum

data/db/migrate/20180612163403_add_foreign_key_to_hypervisor_id.rb

@@ -1,5 +1,8 @@
 class AddForeignKeyToHypervisorId < ActiveRecord::Migration[5.1]
   def up
+    # Update all pools that have a hypervisor reference that's not a host before we add the FK
+    ::Katello::Pool.where.not(hypervisor_id: nil).where.not(hypervisor_id: Host::Managed.all).update_all(hypervisor_id: nil)
+
     add_foreign_key(:katello_pools, :hosts,
                     :name => 'katello_pools_hypervisor_fk', :column => 'hypervisor_id')
   end

data/db/migrate/20180917173645_add_source_repo_checksum_type_to_katello_repositories.rb

@@ -0,0 +1,5 @@
+class AddSourceRepoChecksumTypeToKatelloRepositories < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_repositories, :source_repo_checksum_type, :string
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-available-content-views.controller.js

@@ -65,6 +65,7 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
                                                     components: components}, function () {
                     var newContentIds = _.map(selectedRows, 'id');
                     $scope.saveSuccess();
+                    $scope.fetchContentView();
                     params['without[]'] = params["without[]"].concat(newContentIds);
                     nutupane.setParams(params);
                     nutupane.refresh();

data/lib/katello/tasks/clean_backend_objects.rake

@@ -42,17 +42,17 @@ namespace :katello do
     def cleanup_hosts(cleaner)
       cleaner.hosts_with_nil_facets.each do |host|
         print "Host #{host.id} #{host.name} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
 
       cleaner.hosts_with_no_subscriptions.each do |host|
         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) }
+        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) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
     end
 
@@ -72,6 +72,15 @@ namespace :katello do
       end
     end
 
+    def host_unregister_options(host)
+      if host.managed? || host.compute_resource
+        print "Leaving provisioning record for #{host.name} in place, it is either managed or assigned to a compute resource."
+        {:unregistering => true}
+      else
+        {}
+      end
+    end
+
     # rubocop:disable HandleExceptions
     def execute(error_msg)
       if ENV['COMMIT'] == 'true'

data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake

@@ -0,0 +1,32 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.8' do
+      desc "Clear checksum type for on-demand repositories"
+      task :clear_checksum_type => %w(environment) do
+        User.current = User.anonymous_admin
+
+        Katello::Repository.yum_type.find_each do |repo|
+          repo.transaction do
+            begin
+              if repo.on_demand? && repo.url.present?
+                repo.update_attribute(:checksum_type, nil)
+
+                if repo.find_distributor[:config]&.delete(:checksum_type)
+                  Katello.pulp_server.resources.repository.update_distributor(
+                    repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
+                end
+              end
+
+              if repo.library_instance?
+                repo.update_attributes!(
+                  source_repo_checksum_type: repo.pulp_scratchpad_checksum_type)
+              end
+            # rubocop:disable HandleExceptions
+            rescue RestClient::ResourceNotFound
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.8.0".freeze
+  VERSION = "3.8.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1568,6 +1568,7 @@ files:
 - db/migrate/20180614184822_add_unauthenticated_pull.rb
 - db/migrate/20180618195941_add_description_to_repository.rb
 - db/migrate/20180626160422_add_upstream_pool_id_to_katello_pool.rb
+- db/migrate/20180917173645_add_source_repo_checksum_type_to_katello_repositories.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -2169,6 +2170,7 @@ files:
 - lib/katello/tasks/upgrades/3.6/republish_file_repos.rake
 - lib/katello/tasks/upgrades/3.7/import_pools.rake
 - lib/katello/tasks/upgrades/3.7/make_all_ks_repos_bootable.rake
+- lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb