katello 4.17.1 → 4.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 522d23e5be01ddc111e940e111a09d858a2dfa686c9cbb17ac0c883b14f224bc
-  data.tar.gz: 6f6dc2887f0eafdd0500edeb62792318da9bd25612565fcef2027423b364d2c5
+  metadata.gz: 89755fa3c2987395a5af752bbf273da998d09d4f0f45029915596c04ecf60eb1
+  data.tar.gz: 18d7cebcfd3dc55158d2eaec48db546d9b6253ddd9d645c4560a4182dd68e19f
 SHA512:
-  metadata.gz: 597e47e1205993f0223f0151f24accea76c030eb0a98536f9b9e05cb1d1f49341c69543bf79a4781b700fa948f6df53769dbaa44d6c54399f504362bd1729b68
-  data.tar.gz: 263fe1e31f8469f6a7ea74c932c1fa8bab9769200d72aca0f3a94c47d5772a4a5c8c10661ea1abe0bebdcc53b416584fa17a98c1c12e1a94e8519eab4fbf93b9
+  metadata.gz: 9e1649be7b107364a96ddd4cd07b82b048dc50ef7046e2570ea0ca38bd5bd787360d9a072cdb77fc62fa20f20ed129f6940d9ebfbebfd50f3972c2f4bffb866d
+  data.tar.gz: cd12cfad7c854933a4a8418715b0d86bd920f0840d4acf42c314790e89ad531a21b258cf2fdad84c8808aa138f7f236d143c65d1d60bc1ca8a479536496ad7b8

data/app/lib/actions/helpers/smart_proxy_sync_helper.rb

@@ -0,0 +1,12 @@
+module Actions
+  module Helpers
+    module SmartProxySyncHelper
+      def schedule_async_repository_proxy_sync(repository)
+        return unless Setting[:foreman_proxy_content_auto_sync]
+        if SmartProxy.unscoped.pulpcore_proxies_with_environment(repository.environment).exists?
+          ForemanTasks.async_task(::Actions::Katello::Repository::CapsuleSync, repository)
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/content_view/add_rolling_repo_clone.rb

@@ -2,6 +2,8 @@ module Actions
   module Katello
     module ContentView
       class AddRollingRepoClone < Actions::EntryAction
+        include Helpers::SmartProxySyncHelper
+
         def plan(content_view, repository_ids)
           library = content_view.organization.library
           clone_ids = []
@@ -27,10 +29,8 @@ module Actions
         end
 
         def run
-          if Setting[:foreman_proxy_content_auto_sync]
-            ::Katello::Repository.where(id: input[:repository_ids]).each do |repo|
-              ForemanTasks.async_task(::Actions::Katello::Repository::CapsuleSync, repo)
-            end
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            schedule_async_repository_proxy_sync(repository)
           end
         end
       end

data/app/lib/actions/katello/content_view/remove_rolling_repo_clone.rb

@@ -20,7 +20,15 @@ module Actions
         end
 
         def run
-          ::Katello::Repository.where(id: input[:repository_ids]).destroy_all
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            SmartProxy.unscoped.with_repo(repository).each do |smart_proxy|
+              next if smart_proxy.pulp_primary?
+
+              smart_proxy.content_counts&.dig("content_view_versions", repository.content_view_version_id.to_s, "repositories")&.delete(repository.id.to_s)
+              smart_proxy.save
+            end
+            repository.destroy!
+          end
         end
       end
     end

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

@@ -96,8 +96,9 @@ module Actions
         end
 
         def handle_redhat_content(repository)
-          if repository.content_view.content_view_environment(repository.environment)
-            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, repository.content_view.content_view_environment(repository.environment))
+          content_view_environment = repository.content_view.content_view_environment(repository.environment)
+          if content_view_environment && !repository.content_view.rolling?
+            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, content_view_environment)
           end
         end
 

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

@@ -4,6 +4,7 @@ module Actions
     module Repository
       class ImportUpload < Actions::EntryAction
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
 
         # rubocop:disable Metrics/MethodLength
         def plan(repository, uploads, options = {})
@@ -63,9 +64,7 @@ module Actions
 
         def run
           repository = ::Katello::Repository.find(input[:repository_id])
-          if input[:sync_capsule] && (Setting[:foreman_proxy_content_auto_sync])
-            ForemanTasks.async_task(Katello::Repository::CapsuleSync, repository)
-          end
+          schedule_async_repository_proxy_sync(repository) if input[:sync_capsule]
           output[:upload_results] = results_to_json(input[:upload_results])
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end

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

@@ -6,6 +6,7 @@ module Actions
         extend ApipieDSL::Class
         include Helpers::Presenter
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
         include ::Actions::ObservableAction
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
@@ -72,7 +73,7 @@ module Actions
             update_rolling_content_views_async(repo, input[:contents_changed])
           end
           repo.clear_smart_proxy_sync_histories if input[:contents_changed]
-          ForemanTasks.async_task(Repository::CapsuleSync, repo) if Setting[:foreman_proxy_content_auto_sync]
+          schedule_async_repository_proxy_sync(repo)
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 

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

@@ -7,6 +7,7 @@ module Actions
     module Repository
       class UploadFiles < Actions::EntryAction
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
 
         def plan(repository, files, content_type = nil, options = {})
           action_subject(repository)
@@ -52,7 +53,7 @@ module Actions
 
         def run
           repository = ::Katello::Repository.find(input[:repository][:id])
-          ForemanTasks.async_task(Repository::CapsuleSync, repository) if Setting[:foreman_proxy_content_auto_sync]
+          schedule_async_repository_proxy_sync(repository)
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 

data/app/models/katello/deb.rb

@@ -4,8 +4,6 @@ module Katello
 
     CONTENT_TYPE = 'deb'.freeze
 
-    has_many :repository_debs, :class_name => "Katello::RepositoryDeb", :dependent => :destroy, :inverse_of => :deb
-    has_many :repositories, :through => :repository_debs, :class_name => "Katello::Repository"
     has_many :content_facet_applicable_debs, :class_name => "Katello::ContentFacetApplicableDeb",
              :dependent => :destroy, :inverse_of => :deb
     has_many :content_facets, :through => :content_facet_applicable_debs, :class_name => "Katello::Host::ContentFacet"

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.17.1".freeze
+  VERSION = "4.17.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.17.1
+  version: 4.17.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-31 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +107,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +117,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.2.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -800,6 +812,7 @@ files:
 - app/lib/actions/helpers/output_propagator.rb
 - app/lib/actions/helpers/presenter.rb
 - app/lib/actions/helpers/rolling_cv_repos.rb
+- app/lib/actions/helpers/smart_proxy_sync_helper.rb
 - app/lib/actions/helpers/smart_proxy_sync_history_helper.rb
 - app/lib/actions/katello/activation_key/create.rb
 - app/lib/actions/katello/activation_key/destroy.rb
@@ -5549,7 +5562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman