katello 4.1.1 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4894a5652b92e0d8b87f5de6abb4b25229cd4e5ef32f5d5aafe62961d04eb4a4
-  data.tar.gz: 2ba9d4e9c8b572b23dd90c69d49a191abae7eb82c3599ffc80f65bdff9f1c73e
+  metadata.gz: 6c5585f90b341b73cc8ff5d0b5adea7f31e794da93c42e6f755de36b86f0fe12
+  data.tar.gz: fea8f7973ec98df5967310fcd025767d7fe03ee8077a388c64bb8b50101190b1
 SHA512:
-  metadata.gz: 4cff5dfc8027b6a31f9da80e513cd3d936427de6e133dc612dda6c0e1d375676f8470357331ed9a7af40272501d9b55c649b2f3e84c6a142603b5c09bce6a374
-  data.tar.gz: af3829a6c7eafa17dee7833fe17cbcf32e6a819ccf007cc7da1f82ac9652e97f030bd624a8edf8d439cc6b585bea300291d2cbd6205a148002924216bd7accee
+  metadata.gz: aabf11851850da36e0a135c9a8dc0e0561ab4791c234bdd47e63caef2342cd60bf8428060399161f17eafe22878144dac4b7277250b68ae1a9c15e63c7ed4fac
+  data.tar.gz: 4b72e1f19961cf571056f14291e2bb811c29c353ae7453175a8afd2bf83b29f02709ad540a82230fcbc982923e5025cb19f37730373ea90c16afe7818f745c66

data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb

@@ -19,7 +19,9 @@ module Katello
 
       def host_setup_extension
         if params['host']['lifecycle_environment_id']
-          @host.update!(lifecycle_environment: KTEnvironment.readable.find(params['host']['lifecycle_environment_id']))
+          new_lce = KTEnvironment.readable.find(params['host']['lifecycle_environment_id'])
+          @host.content_facet.lifecycle_environment = new_lce
+          @host.update_candlepin_associations
         end
 
         super

data/app/lib/actions/katello/content_view_version/create_repos.rb

@@ -10,7 +10,7 @@ module Actions
             source_repositories.each do |repositories|
               new_repository = repositories.first.build_clone(content_view: version.content_view,
                                                              version: version)
-              plan_action(Repository::Create, new_repository, true, false)
+              plan_action(Repository::Create, new_repository, clone: true)
               repository_mapping[repositories] = new_repository
             end
           end

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

@@ -10,7 +10,7 @@ module Actions
 
           sequence do
             if clone.new_record?
-              plan_action(Repository::Create, clone, true, false)
+              plan_action(Repository::Create, clone, clone: true)
             else
               #only clear if it should be empty, but its not
               plan_optional_pulp_action([Actions::Pulp::Repository::Clear], clone, SmartProxy.pulp_primary)

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

@@ -2,19 +2,18 @@ module Actions
   module Katello
     module Repository
       class Create < Actions::EntryAction
-        include Actions::Katello::PulpSelector
-
-        def plan(repository, clone = false, plan_create = false)
+        def plan(repository, args = {})
+          clone = args[:clone] || false
+          force_repo_create = args[:force_repo_create] || false
           repository.save!
           root = repository.root
 
           action_subject(repository)
 
           org = repository.organization
-          pulp2_create_action = plan_create ? Actions::Pulp::Repository::CreateInPlan : Actions::Pulp::Repository::Create
           sequence do
-            create_action = plan_pulp_action([pulp2_create_action, Pulp3::Orchestration::Repository::Create],
-                                        repository, SmartProxy.pulp_primary)
+            create_action = plan_action(Pulp3::Orchestration::Repository::Create,
+                                        repository, SmartProxy.pulp_primary, force_repo_create)
 
             return if create_action.error
 
@@ -25,8 +24,10 @@ module Actions
               if repository.product.redhat?
                 plan_action(Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => view_env.cp_id, :content_id => repository.content_id)
               else
-                content_create = plan_action(Katello::Product::ContentCreate, root)
-                plan_action(Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => view_env.cp_id, :content_id => content_create.input[:content_id])
+                unless root.content
+                  content_create = plan_action(Katello::Product::ContentCreate, root)
+                  plan_action(Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => view_env.cp_id, :content_id => content_create.input[:content_id])
+                end
               end
             end
 

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

@@ -10,7 +10,7 @@ module Actions
           repository.relative_path = repository.custom_repo_path
           repository.save!
           action_subject(repository)
-          plan_action(::Actions::Katello::Repository::Create, repository, false, true)
+          plan_action(::Actions::Katello::Repository::Create, repository)
         end
 
         def humanized_name

data/app/lib/actions/katello/repository_set/enable_repository.rb

@@ -15,7 +15,7 @@ module Actions
             fail ::Katello::Errors::ConflictException, _("The repository is already enabled")
           end
           repository = mapper.build_repository
-          plan_action(Repository::Create, repository, false, true)
+          plan_action(Repository::Create, repository, clone: false)
           action_subject(repository)
           plan_self
         end

data/app/lib/actions/pulp3/capsule_content/generate_metadata.rb

@@ -22,6 +22,11 @@ module Actions
         end
 
         def invoke_external_task
+          if input[:options][:sync_task_output] &&
+              ::Katello::Pulp3::Task.publication_href(input[:options][:sync_task_output]).present?
+            return input[:options][:sync_task_output]
+          end
+
           repository = ::Katello::Repository.find(input[:repository_id])
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
           output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication

data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb

@@ -19,9 +19,10 @@ module Actions
           if options[:use_repository_version]
             repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:use_repository_version => true)
           elsif tasks && tasks[:pulp_tasks] && tasks[:pulp_tasks].first
-            publication_href = tasks[:pulp_tasks].first[:created_resources].first
-            if publication_href
+            if (publication_href = ::Katello::Pulp3::Task.publication_href(tasks[:pulp_tasks]))
               repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:publication => publication_href)
+            else
+              fail "Unable to refresh distribution for repo #{repository.id}, could not find a publication_href"
             end
           end
         end

data/app/lib/actions/pulp3/capsule_content/sync.rb

@@ -5,7 +5,8 @@ module Actions
         include ::Actions::Helpers::SmartProxySyncHistoryHelper
         def plan(repository, smart_proxy, options = {})
           sequence do
-            plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :options => options)
+            sync_task = plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :options => options)
+            options[:sync_task_output] = sync_task.output[:pulp_tasks]
             plan_action(GenerateMetadata, repository, smart_proxy, options)
           end
         end

data/app/lib/actions/pulp3/orchestration/repository/create.rb

@@ -3,9 +3,9 @@ module Actions
     module Orchestration
       module Repository
         class Create < Pulp3::Abstract
-          def plan(repository, smart_proxy)
+          def plan(repository, smart_proxy, force = false)
             sequence do
-              create_action = plan_action(Actions::Pulp3::Repository::Create, repository, smart_proxy)
+              create_action = plan_action(Actions::Pulp3::Repository::Create, repository, smart_proxy, force)
               plan_action(Actions::Pulp3::Repository::SaveVersion, repository, repository_details: create_action.output[:response])
 
               if repository.content_view.default? || !smart_proxy.pulp_primary?

data/app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb

@@ -6,6 +6,7 @@ module Actions
           def plan(repository, smart_proxy, options = {})
             options[:contents_changed] = (options && options.key?(:contents_changed)) ? options[:contents_changed] : true
             publication_content_type = !::Katello::RepositoryTypeManager.find(repository.content_type).pulp3_skip_publication
+
             sequence do
               if options[:source_repository] && publication_content_type
                 plan_self(source_repository_id: options[:source_repository].id, target_repository_id: repository.id, smart_proxy_id: smart_proxy.id)

data/app/lib/actions/pulp3/orchestration/repository/sync.rb

@@ -11,7 +11,7 @@ module Actions
 
               force_fetch_version = true if options[:optimize] == false
               version_output = plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks], :force_fetch_version => force_fetch_version).output
-              plan_action(Pulp3::Orchestration::Repository::GenerateMetadata, repository, smart_proxy, :contents_changed => version_output[:contents_changed])
+              plan_action(Pulp3::Orchestration::Repository::GenerateMetadata, repository, smart_proxy, :contents_changed => version_output[:contents_changed], :skip_publication_creation => version_output[:publication_provided])
               plan_self(:subaction_output => version_output)
             end
           end

data/app/lib/actions/pulp3/repository/create.rb

@@ -2,13 +2,14 @@ module Actions
   module Pulp3
     module Repository
       class Create < Pulp3::Abstract
-        def plan(repository, smart_proxy)
-          plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id)
+        def plan(repository, smart_proxy, force = false)
+          plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :force => force)
         end
 
         def run
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.create
+          force = input[:force] || false
+          output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.create(force)
         end
       end
     end

data/app/lib/actions/pulp3/repository/create_publication.rb

@@ -5,14 +5,17 @@ module Actions
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
         def plan(repository, smart_proxy, options)
           sequence do
-            action = plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :contents_changed => options[:contents_changed], :options => options)
+            action = plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :contents_changed => options[:contents_changed],
+                               :skip_publication_creation => options[:skip_publication_creation])
             plan_action(SavePublication, repository, action.output, :contents_changed => options[:contents_changed])
           end
         end
 
         def invoke_external_task
-          repository = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
+          unless input[:skip_publication_creation]
+            repository = ::Katello::Repository.find(input[:repository_id])
+            output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
+          end
         end
       end
     end

data/app/lib/actions/pulp3/repository/refresh_remote.rb

@@ -9,7 +9,7 @@ module Actions
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
           backend = repo.backend_service(smart_proxy)
-          backend.update_remote if backend.remote_needs_updates?
+          backend.update_remote
         end
       end
     end

data/app/lib/actions/pulp3/repository/save_version.rb

@@ -9,17 +9,24 @@ module Actions
 
         def run
           repo = ::Katello::Repository.find(input[:repository_id])
-
           if input[:force_fetch_version]
             version_href = fetch_version_href(repo)
           elsif input[:repository_details].present?
             version_href = input[:repository_details][:latest_version_href]
           elsif input[:tasks].present?
-            version_href = input[:tasks].last[:created_resources].first
+            version_href = ::Katello::Pulp3::Task.version_href(input[:tasks])
           else
             version_href = fetch_version_href(repo)
           end
 
+          output[:publication_provided] = false
+          if input[:tasks].present?
+            if (publication_href = ::Katello::Pulp3::Task.publication_href(input[:tasks]))
+              repo.update(:publication_href => publication_href)
+              output[:publication_provided] = true
+            end
+          end
+
           if version_href
             if repo.version_href != version_href || input[:force_fetch_version]
               output[:contents_changed] = true

data/app/lib/katello/agent/base_message.rb

@@ -12,10 +12,7 @@ module Katello
           replyto: reply_to,
           request: {
             args: [
-              units,
-              {
-                importkeys: true
-              }
+              units, options
             ],
             classname: "Content",
             cntr: [[], {}],
@@ -30,6 +27,12 @@ module Katello
         }
       end
 
+      def options # may be overridden by children
+        {
+          importkeys: true
+        }
+      end
+
       def to_s
         json.to_json
       end

data/app/lib/katello/agent/update_package_message.rb

@@ -10,7 +10,15 @@ module Katello
 
       protected
 
+      def options
+        ops = super
+        ops[:all] = true if @packages.blank?
+        ops
+      end
+
       def units
+        return [{ type_id: @content_type, unit_key: {}}] if @packages.blank?
+
         @packages.map do |package|
           {
             type_id: @content_type,

data/app/lib/katello/qpid/connection.rb

@@ -74,11 +74,13 @@ module Katello
       def initialize(url:, ssl_cert_file:, ssl_key_file:, ssl_ca_file:)
         @url = url
         ssl_domain = ::Qpid::Proton::SSLDomain.new(::Qpid::Proton::SSLDomain::MODE_CLIENT)
+        ssl_domain.peer_authentication(::Qpid::Proton::SSLDomain::VERIFY_PEER_NAME)
         ssl_domain.credentials(ssl_cert_file, ssl_key_file, nil) if ssl_cert_file && ssl_key_file
         ssl_domain.trusted_ca_db(ssl_ca_file) if ssl_ca_file
         @connection_options = {
           ssl_domain: ssl_domain,
-          sasl_allowed_mechs: 'external'
+          sasl_allowed_mechs: 'external',
+          virtual_host: URI.parse(url).host
         }
       end
 

data/app/models/katello/candlepin/repository_mapper.rb

@@ -44,7 +44,7 @@ module Katello
       end
 
       def validate!
-        return if katello_content_type == Repository::OSTREE_TYPE
+        return if katello_content_type == Repository::OSTREE_TYPE || Setting[:content_disconnected]
         substitutor.validate_substitutions(content, substitutions)
       end
 

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

@@ -215,10 +215,15 @@ module Katello
         new_ids = new_available_module_streams.keys - old_associated_ids
         new_ids.each do |new_id|
           module_stream = new_available_module_streams[new_id]
+          status = module_stream["status"]
+          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
+          if enabled_module_stream_inactive?(module_stream)
+            status = "unknown"
+          end
           self.host_available_module_streams.create!(host_id: self.id,
                                                      available_module_stream_id: new_id,
                                                      installed_profiles: module_stream["installed_profiles"],
-                                                     status: module_stream["status"])
+                                                     status: status)
         end
 
         upgradable_streams.each do |hams|
@@ -228,6 +233,10 @@ module Katello
           if hams.attributes.slice(*shared_keys) != module_stream_data
             hams.update!(module_stream_data)
           end
+          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
+          if enabled_module_stream_inactive?(module_stream)
+            hams.update!(status: "unknown")
+          end
         end
       end
 
@@ -347,6 +356,10 @@ module Katello
         self.get_status(::Katello::TraceStatus).refresh!
         self.refresh_global_status!
       end
+
+      def enabled_module_stream_inactive?(module_stream)
+        !module_stream["active"].nil? && module_stream["active"] == false && module_stream["status"] == "enabled"
+      end
     end
   end
 end

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

@@ -89,6 +89,10 @@ module Katello
         end
 
         def self.with_environment(environment, include_default = false)
+          (pulp2_proxies_with_environment(environment, include_default) + pulpcore_proxies_with_environment(environment)).try(:uniq)
+        end
+
+        def self.pulp2_proxies_with_environment(environment, include_default = false)
           features = [PULP_NODE_FEATURE]
           features << PULP_FEATURE if include_default
 
@@ -96,6 +100,11 @@ module Katello
               where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
+        def self.pulpcore_proxies_with_environment(environment)
+          unscoped.where(id: unscoped.select { |p| p.pulp_mirror? }.pluck(:id)).joins(:capsule_lifecycle_environments).
+              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
+        end
+
         def self.sync_needed?(environment)
           Setting[:foreman_proxy_content_auto_sync] && unscoped.with_environment(environment).any?
         end

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

@@ -42,7 +42,7 @@ module Katello
       def sync_status
         all_repos = repos(self.library, nil, false)
         task = last_repo_sync_task
-        last_synced_repo = task ? all_repos.find { |repo| task.locks.where(:resource_type => ::Katello::Repository.name).pluck(:resource_id).map(&:to_s).include?(repo.id.to_s) } : nil
+        last_synced_repo = task ? all_repos.find { |repo| task.links.where(:resource_type => ::Katello::Repository.name).pluck(:resource_id).map(&:to_s).include?(repo.id.to_s) } : nil
         ::Katello::SyncStatusPresenter.new(last_synced_repo, task).sync_progress
       end
 

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -92,7 +92,8 @@ module Katello
         ::Katello::ModuleStream.
           joins("inner join katello_available_module_streams on
             katello_module_streams.name = katello_available_module_streams.name and
-            katello_module_streams.stream = katello_available_module_streams.stream").
+            katello_module_streams.stream = katello_available_module_streams.stream and
+            katello_module_streams.context = katello_available_module_streams.context").
           joins("inner join katello_host_available_module_streams on
             katello_available_module_streams.id = katello_host_available_module_streams.available_module_stream_id").
           where("katello_host_available_module_streams.host_id = :content_facet_id and

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

@@ -16,6 +16,14 @@ module Katello
         @smart_proxy = smart_proxy
       end
 
+      def self.version_href?(href)
+        /.*\/versions\/\d*\//.match(href)
+      end
+
+      def self.publication_href?(href)
+        href.include?('/publications/')
+      end
+
       def partial_repo_path
         fail NotImplementedError
       end
@@ -124,7 +132,7 @@ module Katello
 
       def refresh_if_needed
         tasks = []
-        tasks << update_remote if remote_needs_updates?
+        tasks << update_remote #always update remote
         tasks << update_distribution if distribution_needs_update?
         tasks.compact
       end
@@ -133,21 +141,6 @@ module Katello
         api.remotes_api.read(href)
       end
 
-      def remote_needs_updates?
-        if repo.remote_href
-          remote = get_remote
-          # The proxy auth creds are not returned by the Pulp API.
-          # The creds don't need to be checked here because they
-          # won't be updated outside of UpdateRemote.
-          computed = compute_remote_options.slice!(:proxy_username, :proxy_password)
-          computed.keys.any? { |key| remote.send(key) != computed[key] }
-        elsif repo.url
-          true
-        else
-          false
-        end
-      end
-
       def get_distribution(href = distribution_reference.href)
         api.get_distribution(href)
       end
@@ -168,14 +161,16 @@ module Katello
         computed_options.except(:name, :client_key)
       end
 
-      def create
-        unless repository_reference
-          response = api.repositories_api.create(
-            name: generate_backend_object_name)
-          RepositoryReference.create!(
-           root_repository_id: repo.root_id,
-           content_view_id: repo.content_view.id,
-           repository_href: response.pulp_href)
+      def create(force = false)
+        if force || !repository_reference
+          response = api.repositories_api.create(name: generate_backend_object_name)
+          RepositoryReference.where(
+            root_repository_id: repo.root_id,
+            content_view_id: repo.content_view.id).destroy_all
+          RepositoryReference.where(
+            root_repository_id: repo.root_id,
+            content_view_id: repo.content_view.id,
+            repository_href: response.pulp_href).create!
           response
         end
       end

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

@@ -47,7 +47,7 @@ module Katello
         create_remote unless fetch_remote
       end
 
-      def create
+      def create(_force = false)
         api.repositories_api.create(name: backend_object_name)
       end
 

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

@@ -51,6 +51,22 @@ module Katello
         end
       end
 
+      def self.version_href(tasks)
+        tasks = [tasks] unless tasks.is_a?(Array)
+        version_hrefs = tasks.map { |task| task[:created_resources] }.flatten
+        version_hrefs = version_hrefs.select { |href| ::Katello::Pulp3::Repository.version_href?(href) }
+        Rails.logger.error("Got multiple version_hrefs for pulp task: #{tasks}") if version_hrefs.length > 2
+        version_hrefs.last
+      end
+
+      def self.publication_href(tasks)
+        tasks = [tasks] unless tasks.is_a?(Array)
+        publication_hrefs = tasks.map { |task| task[:created_resources] }.flatten
+        publication_hrefs = publication_hrefs.select { |href| ::Katello::Pulp3::Repository.publication_href?(href) }
+        Rails.logger.error("Got multiple publication hrefs for pulp task: #{tasks}") if publication_hrefs.length > 2
+        publication_hrefs.last #return the last href to workaround https://pulp.plan.io/issues/9098
+      end
+
       def task_data(force_refresh = false)
         @pulp_data = nil if force_refresh
         @pulp_data ||= tasks_api.read(@href).as_json.with_indifferent_access

data/app/services/katello/registration_manager.rb

@@ -249,6 +249,8 @@ module Katello
       end
 
       def delete_agent_queue(host)
+        return unless ::Katello.with_katello_agent?
+
         queue_name = Katello::Agent::Dispatcher.host_queue_name(host)
         Katello::EventQueue.push_event(::Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, host.id) do |attrs|
           attrs[:metadata] = { queue_name: queue_name }

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -39,13 +39,23 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
     FakeContentViewPuppetEnvironment.delete_all
     FakePuppetModule.delete_all
 
-    ::Katello::Repository.delete(puppet_repositories) if puppet_repositories.any?
+    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
-    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)
+
+    if Katello::Repository.ostree_type.any?
+      User.as_anonymous_admin do
+        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')

data/db/seeds.d/111-upgrade_tasks.rb

@@ -4,6 +4,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:upgrades:4.0:remove_ostree_puppet_content'},
     {:name => 'katello:upgrades:4.1:sync_noarch_content'},
-    {:name => 'katello:upgrades:4.1:fix_invalid_pools'}
+    {:name => 'katello:upgrades:4.1:fix_invalid_pools'},
+    {:name => 'katello:upgrades:4.1:update_content_import_export_perms'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -55,6 +55,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.initialLoad = true;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.allHostsSelected = hostIds.allResultsSelected;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -126,7 +126,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
 
         $scope.performViaKatelloAgent = function () {
             var errataIds = $scope.selectedErrataIds();
-            HostErratum.apply({id: $scope.host.id, 'bulk_errata_ids': errataIds},
+            HostErratum.apply({id: $scope.host.id, 'bulk_errata_ids': angular.toJson(errataIds)},
                                function (task) {
                                     $scope.table.selectAll(false);
                                     $scope.transitionTo('content-host.tasks.details', {taskId: task.id});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html

@@ -13,7 +13,7 @@
     <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
     <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
     <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
-    <input type="hidden" name="bulk_host_ids" ng-value="moduleStreamActionFormValues.hostHostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="moduleStreamActionFormValues.bulkHostIds"/>
     <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
   </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -37,7 +37,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
-                hostIds: IncrementalUpdate.getBulkContentHosts().included.ids.join(','),
+                bulkHostIds: angular.toJson({ included: { ids: IncrementalUpdate.getBulkContentHosts().included.ids }}),
                 customize: false
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -18,7 +18,7 @@
   <form id="errataActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" value="errata_install"/>
     <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="errataActionFormValues.bulkHostIds"/>
     <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
     <input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
@@ -132,4 +132,3 @@
     </button>
   </form>
 </section>
-

data/lib/katello/tasks/repository.rake

@@ -114,20 +114,21 @@ namespace :katello do
   def repo_exists?(repo)
     if SmartProxy.pulp_primary!.pulp3_support?(repo)
       backend_service = repo.backend_service(SmartProxy.pulp_primary!)
+      return false unless backend_service&.repository_reference&.repository_href
       backend_service.api.repositories_api.read(backend_service.repository_reference.repository_href)
     else
       Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
     end
     true
-  rescue RestClient::ResourceNotFound, PulpRpmClient::ApiError
-    false
+  rescue StandardError => e
+    return false if e.code == 404
   end
 
   def handle_missing_repo(repo)
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo) if commit?
+      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true) if commit?
     else
       puts "Deleting #{repo.id}"
       ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo) if commit?

data/lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake

@@ -5,11 +5,13 @@ namespace :katello do
       task :remove_ostree_puppet_content => ["environment", "check_ping"] do
         contents = Katello::Content.where(content_type: ['ostree', 'puppet'])
         contents.each do |content|
-          Katello::Resources::Candlepin::Content.destroy(content.organization.label, content.cp_content_id)
+          unless content.products.any?(&:redhat?)
+            Katello::Resources::Candlepin::Content.destroy(content.organization.label, content.cp_content_id)
+            content.destroy
+          end
         rescue RestClient::NotFound
           #skip content not found
         end
-        contents.destroy_all
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.1".freeze
+  VERSION = "4.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.4
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 13.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 13.0.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +98,16 @@ dependencies:
   name: foreman-tasks-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,16 @@ dependencies:
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +391,7 @@ dependencies:
         version: 3.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -415,7 +401,7 @@ dependencies:
         version: 3.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: pulp_certguard_client
   requirement: !ruby/object:Gem::Requirement
@@ -5114,7 +5100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman