Fixes #38912 - Update deb content URL options via metadata generate

Author: quba42

app/lib/actions/katello/repository/metadata_generate.rb

@@ -3,7 +3,8 @@ module Katello
     module Repository
       class MetadataGenerate < Actions::EntryAction
         def plan(repository, options = {})
-          return if repository.root.is_container_push && repository.library_instance?
+          root = repository.root
+          return if root.is_container_push && repository.library_instance?
           action_subject(repository)
           repository.check_ready_to_act!
           source_repository = options.fetch(:source_repository, nil)
@@ -17,6 +18,20 @@ def plan(repository, options = {})
                         :force_publication => force_publication,
                         :source_repository => source_repository,
                         :matching_content => matching_content)
+
+          if repository.deb? && repository.content && !repository.content.content_url.end_with?(repository.deb_content_url_options)
+            plan_action(::Actions::Candlepin::Product::ContentUpdate,
+                        owner:           repository.organization.label,
+                        repository_id:   repository.id,
+                        name:            root.name,
+                        type:            root.content_type,
+                        arches:          root.format_arches,
+                        label:           repository.content.label,
+                        content_url:     root.custom_content_path,
+                        gpg_key_url:     repository.yum_gpg_key_url,
+                        os_versions:     root.os_versions&.join(','),
+                        metadata_expire: root.metadata_expire)
+          end
         end
 
         def resource_locks

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

@@ -27,7 +27,7 @@ def initialize_empty
         def pulp_components
           return [] if repo.version_href.blank?
           return ["all"] if version_missing_structure_content?
-          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| x.plain_component }.uniq
+          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| x.plain_component }.uniq.sort
         end
 
         def sanitize_pulp_distribution(distribution)
@@ -40,7 +40,7 @@ def sanitize_pulp_distribution(distribution)
         def pulp_distributions
           return [] if repo.version_href.blank?
           return ["default"] if version_missing_structure_content?
-          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| sanitize_pulp_distribution(x.distribution) }.uniq
+          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| sanitize_pulp_distribution(x.distribution) }.uniq.sort
         end
 
         def remote_options

test/actions/katello/repository/metadata_generate_test.rb

@@ -8,9 +8,11 @@ module Actions
 
     let(:action_class) { ::Actions::Katello::Repository::MetadataGenerate }
     let(:pulp_metadata_generate_class) { ::Actions::Pulp3::Orchestration::Repository::GenerateMetadata }
+    let(:candlepin_product_content_update_class) { ::Actions::Candlepin::Product::ContentUpdate }
     let(:success_task) { ForemanTasks::Task::DynflowTask.create!(state: :success, result: "good") }
     let(:yum_repo) { katello_repositories(:fedora_17_x86_64) }
     let(:yum_repo2) { katello_repositories(:fedora_17_x86_64_dev) }
+    let(:deb_repo) { katello_repositories(:debian_10_amd64) }
     let(:action_options) do
       {
         :source_repository => nil,
@@ -27,6 +29,7 @@ module Actions
 
       assert_action_planned_with(action, pulp_metadata_generate_class, yum_repo, SmartProxy.pulp_primary,
             action_options)
+      refute_action_planned(action, candlepin_product_content_update_class)
     end
 
     it 'plans a yum refresh in other location' do
@@ -77,5 +80,33 @@ module Actions
       assert_action_planned_with(action, pulp_metadata_generate_class, yum_repo, SmartProxy.pulp_primary,
                                 yum_action_options)
     end
+
+    it 'plans a deb metadata generate' do
+      action = create_action(action_class)
+      action.stubs(:task).returns(success_task)
+      action.expects(:action_subject).with(deb_repo)
+      deb_repo.expects(:deb_content_url_options).returns("/?comp=main&rel=bookworm")
+
+      plan_action(action, deb_repo)
+
+      assert_equal(deb_repo.content.content_url, "/custom/Debian_12/Debian_12_amd64_main/?comp=main&rel=bookworm")
+      assert_action_planned_with(action, pulp_metadata_generate_class, deb_repo, SmartProxy.pulp_primary,
+            action_options)
+      refute_action_planned(action, candlepin_product_content_update_class)
+    end
+
+    it 'plans a deb metadata generate with changed deb_content_url_options' do
+      action = create_action(action_class)
+      action.stubs(:task).returns(success_task)
+      action.expects(:action_subject).with(deb_repo)
+      deb_repo.expects(:deb_content_url_options).returns("/?comp=main,contrib&rel=bookworm")
+
+      plan_action(action, deb_repo)
+
+      assert_equal(deb_repo.content.content_url, "/custom/Debian_12/Debian_12_amd64_main/?comp=main&rel=bookworm")
+      assert_action_planned_with(action, pulp_metadata_generate_class, deb_repo, SmartProxy.pulp_primary,
+            action_options)
+      assert_action_planned(action, candlepin_product_content_update_class)
+    end
   end
 end

test/fixtures/models/katello_contents.yml

@@ -30,6 +30,14 @@ deb_content_v3:
   content_url:  /custom/Debian_12/Debian_10_amd64_main/?comp=main&rel=buster
   content_type: "deb"
 
+deb_content_empty:
+  name:         debian
+  label:        debian
+  cp_content_id: 114
+  organization_id: <%= ActiveRecord::FixtureSet.identify(:empty_organization) %>
+  content_url:  /custom/Debian_12/Debian_12_amd64_main/?comp=empty&rel=katello
+  content_type: "deb"
+
 some_content:
   name:         Fedora
   cp_content_id: 1

test/fixtures/models/katello_repositories.yml

@@ -26,6 +26,7 @@ debian_10_amd64:
 debian_10_amd64_duplicate:
   root_id:              <%= ActiveRecord::FixtureSet.identify(:debian_10_amd64_duplicate_root) %>
   pulp_id:              Debian_10_duplicate
+  content_id:           114
   relative_path:        'ACME_Corporation/library/debian_10_duplicate_label'
   environment_id:       <%= ActiveRecord::FixtureSet.identify(:library) %>
   content_view_version_id: <%= ActiveRecord::FixtureSet.identify(:library_default_version) %>