katello 3.14.1 → 3.15.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ea2dd0117ec5d25205f3868df5ebcb700767dcc7a6eda96f6aa2c30c0c7da3
-  data.tar.gz: 2084af6536db98b8525ec9c790bd00b8c3186897a469716d4bf2b52b36057ae0
+  metadata.gz: d92a04a363f6fc1fce64ebcba555c088bbd768040ee7232d4ca97b4c0c8a3350
+  data.tar.gz: 14cb0e3c209c8ed06805a471036c56005c1a4628948a488d7ca5c9db123d1af1
 SHA512:
-  metadata.gz: 38b703df376f2b4dadbbbfc64aac8a399de28e4cb39762bffd6c3d126dc110f89e7b1bb6ea9d925e31b8ee33ea72386ba3db2e47ce18e5830b764eb663d49d46
-  data.tar.gz: 38234d68e96fd389181b11533e1705b3558b0fa4bd198a37da14ddea4074511d06e5698d6f9bd6611065500d49a4bfcd3bb411fbc33e7c4c6cb7e2a25c85ad44
+  metadata.gz: 14306c7cccfcdb9d741fc7cf24c2333d4a4442d85a4542594da4fa476814db26e905bcc7721fa6984366a337c8dc4b13b6baa0c1558d86af8f3528dcdc6a6f25
+  data.tar.gz: 8266f86d199feb3d0884424e8aa55e033787d6580e6a3562daf87242d19f893e1b98d7108fff97893d0e44dcdee3ae4ec13789540e209b73f70a44e6740b7be6

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -252,7 +252,7 @@ module Katello
     #api :PUT, "/consumers/:id", N_("Update consumer information")
     def facts
       User.current = User.anonymous_admin
-      async_task(::Actions::Katello::Host::Update, @host, rhsm_params)
+      @host.update_candlepin_associations(rhsm_params)
       update_host_registered_through(@host, request.headers)
       render :json => {:content => _("Facts successfully updated.")}, :status => :ok
     end

data/app/controllers/katello/api/v2/products_bulk_actions_controller.rb

@@ -50,10 +50,10 @@ module Katello
       respond_for_async :resource => task
     end
 
-    api :PUT, "/products/bulk/http_proxy", N_("Update the http proxy configuration on the repositories of one or more products.")
+    api :PUT, "/products/bulk/http_proxy", N_("Update the HTTP proxy configuration on the repositories of one or more products.")
     param :ids, Array, :desc => N_("List of product ids"), :required => true
-    param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policy for http proxy for content sync")
-    param :http_proxy_id, :number, :desc => N_("Http Proxy identifier to associated"), :required => false
+    param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policy for HTTP proxy for content sync")
+    param :http_proxy_id, :number, :desc => N_("HTTP Proxy identifier to associated"), :required => false
     def update_http_proxy
       task = async_task(::Actions::Katello::Product::UpdateHttpProxy,
                         @products.editable,

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -55,7 +55,7 @@ module Katello
       param :ignore_global_proxy, :bool, :desc => N_("if true, will ignore the globally configured proxy when syncing"), :deprecated => true
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
-      param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for http proxy for content sync")
+      param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
       param :http_proxy_id, :number, :desc => N_("ID of a HTTP Proxy")
     end
 

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -10,7 +10,7 @@ module Katello
 
     def blank_or_inherit_with_id(f, attr)
       return true unless f.object.respond_to?(:parent_id) && f.object.parent_id
-      inherited_value  = f.object.send(attr).try(:id) || ''
+      inherited_value = f.object.send(attr).try(:id) || ''
       %(<option data-id="#{inherited_value}" value="">#{blank_or_inherit_f(f, attr)}</option>)
     end
 

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

@@ -92,6 +92,8 @@ module Actions
         end
 
         def finalize
+          version = ::Katello::ContentViewVersion.find(input[:content_view_version_id])
+          version.update_content_counts!
           # update errata applicability counts for all hosts in the CV & Library
           ::Katello::Host::ContentFacet.where(:content_view_id => input[:content_view_id],
                                               :lifecycle_environment_id => input[:environment_id]).each do |facet|

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

@@ -167,6 +167,7 @@ module Actions
 
         def finalize
           version = ::Katello::ContentViewVersion.find(input[:new_content_view_version_id])
+          version.update_content_counts!
           generate_description(version, output[:added_units]) if version.description.blank?
 
           history = ::Katello::ContentViewHistory.find(input[:history_id])

data/app/lib/actions/katello/host/reassign.rb

@@ -5,8 +5,7 @@ module Actions
         def plan(host, content_view_id, environment_id)
           host.content_facet.content_view = ::Katello::ContentView.find(content_view_id)
           host.content_facet.lifecycle_environment = ::Katello::KTEnvironment.find(environment_id)
-
-          plan_action(::Actions::Katello::Host::Update, host)
+          host.update_candlepin_associations
         end
       end
     end

data/app/lib/actions/katello/host/update_content_view.rb

@@ -6,7 +6,7 @@ module Actions
           if host.content_facet
             host.content_facet.content_view = ::Katello::ContentView.find(content_view_id)
             host.content_facet.lifecycle_environment = ::Katello::KTEnvironment.find(lifecycle_environment_id)
-            plan_action(Actions::Katello::Host::Update, host)
+            host.update_candlepin_associations
             plan_self(:hostname => host.name)
           else
             fail _("Host %s has not been registered with subscription-manager.") % host.name

data/app/lib/actions/katello/host/update_release_version.rb

@@ -10,7 +10,7 @@ module Actions
             else
               host.subscription_facet.release_version = release_version
             end
-            plan_action(Actions::Katello::Host::Update, host)
+            host.update_candlepin_associations
           else
             fail _("Host %s has not been registered with subscription-manager.") % host.name
           end

data/app/lib/actions/katello/organization/manifest_refresh.rb

@@ -10,7 +10,7 @@ module Actions
           action_subject organization
           manifest_update = organization.products.redhat.any?
           path = "/tmp/#{rand}.zip"
-          details  = organization.owner_details
+          details = organization.owner_details
           upstream = details['upstreamConsumer'].blank? ? {} : details['upstreamConsumer']
 
           sequence do

data/app/lib/actions/katello/product/update_http_proxy.rb

@@ -4,7 +4,7 @@ module Actions
       class UpdateHttpProxy < Actions::EntryAction
         def plan(products, http_proxy_policy, http_proxy)
           products.each do |product|
-            roots = product.repositories.map(&:root)
+            roots = product.root_repositories
             next if roots.empty?
             plan_action(::Actions::BulkAction,
                         ::Actions::Katello::Repository::Update,

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

@@ -40,7 +40,7 @@ module Actions
           end
 
           check_matching_content = ::Katello::RepositoryTypeManager.find(new_repository.content_type).metadata_publish_matching_check
-          if new_repository.environment && source_repositories.count == 1 && check_matching_content
+          if new_repository.environment && source_repositories.count == 1 && check_matching_content && !SmartProxy.pulp_master.pulp3_support?(new_repository)
             match_check_output = plan_action(Katello::Repository::CheckMatchingContent,
                                 :source_repo_id => source_repositories.first.id,
                                 :target_repo_id => new_repository.id).output

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

@@ -13,7 +13,8 @@ module Actions
               plan_action(Repository::Create, clone, true, false)
             else
               #only clear if it should be empty, but its not
-              plan_optional_pulp_action([Actions::Pulp::Repository::Clear], clone, SmartProxy.pulp_master) if (!clone.yum? || !clone.empty_in_pulp?)
+              plan_optional_pulp_action([Actions::Pulp::Repository::Clear], clone, SmartProxy.pulp_master)
+              # Do we need to refresh distributors here?
               plan_optional_pulp_action([Actions::Pulp::Orchestration::Repository::RefreshIfNeeded], clone, SmartProxy.pulp_master)
             end
 

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

@@ -48,7 +48,7 @@ module Actions
           ::User.current = ::User.anonymous_api_admin
           unless input[:clone]
             repository = ::Katello::Repository.find(input[:repository_id])
-            ForemanTasks.async_task(Katello::Repository::MetadataGenerate, repository, repository_creation: true)
+            ForemanTasks.async_task(Katello::Repository::MetadataGenerate, repository)
           end
         ensure
           ::User.current = nil

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

@@ -7,23 +7,17 @@ module Actions
         def plan(repository, options = {})
           dependency = options.fetch(:dependency, nil)
           force = options.fetch(:force, false)
-          repository_creation = options.fetch(:repository_creation, false)
           source_repository = options.fetch(:source_repository, nil)
           source_repository ||= repository.target_repository if repository.link?
           smart_proxy = options.fetch(:smart_proxy, SmartProxy.pulp_master)
-          if repository_creation
-            matching_content = false
-          else
-            matching_content = options.fetch(:matching_content, false)
-          end
+          matching_content = options.fetch(:matching_content, false)
 
           plan_pulp_action([Pulp::Repository::DistributorPublish, Pulp3::Orchestration::Repository::GenerateMetadata],
                         repository, smart_proxy,
                         :force => force,
                         :source_repository => source_repository,
                         :matching_content => matching_content,
-                        :dependency => dependency,
-                        :repository_creation => repository_creation)
+                        :dependency => dependency)
         end
       end
     end

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

@@ -2,10 +2,14 @@ module Actions
   module Katello
     module Repository
       class RefreshRepository < Actions::Base
+        include Actions::Katello::PulpSelector
+
         def plan(repo, options = {})
           User.as_anonymous_admin do
             repo = ::Katello::Repository.find(repo.id)
-            plan_action(Pulp::Repository::Refresh, repo, :capsule_id => SmartProxy.default_capsule!.id, :dependency => options[:dependency])
+            plan_pulp_action([Actions::Pulp3::Orchestration::Repository::RefreshIfNeeded,
+                              Actions::Pulp::Orchestration::Repository::RefreshIfNeeded],
+                             repo, SmartProxy.default_capsule!, :dependency => options[:dependency])
             plan_self(:name => repo.name, :dependency => options[:dependency])
           end
         end

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

@@ -24,7 +24,8 @@ module Actions
           incremental = options.fetch(:incremental, false)
           validate_contents = options.fetch(:validate_contents, false)
           skip_metadata_check = options.fetch(:skip_metadata_check, false) || validate_contents
-          generate_applicability = repo.yum?
+          # TODO: Remove the check for Pulp 3 once Pulp 3 errata is working fully
+          generate_applicability = repo.yum? && !SmartProxy.pulp_master.pulp3_support?(repo)
 
           pulp_sync_options = {}
           pulp_sync_options[:download_policy] = ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND if validate_contents
@@ -69,6 +70,10 @@ module Actions
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 
+        def finalize
+          ::Katello::Repository.find(input[:id])&.audit_sync
+        end
+
         def humanized_name
           if input && input[:validate_contents]
             _("Synchronize: Validate Content")

data/app/lib/actions/middleware/execute_if_contents_changed.rb

@@ -12,7 +12,7 @@ module Actions
       private
 
       def execute?
-        if action.input.keys.include?('contents_changed') && !action.input['contents_changed']
+        if action.input.keys.include?('contents_changed') && action.input['contents_changed'] == false
           self.action.output[:post_sync_skipped] = true
           false
         else

data/app/lib/actions/pulp/orchestration/repository/refresh_if_needed.rb

@@ -3,7 +3,7 @@ module Actions
     module Orchestration
       module Repository
         class RefreshIfNeeded < Pulp::Abstract
-          def plan(repository, smart_proxy)
+          def plan(repository, smart_proxy, _options = {})
             plan_action(Actions::Pulp::Repository::Refresh, repository, smart_proxy_id: smart_proxy.id)
           end
         end

data/app/lib/actions/pulp/repository/clear.rb

@@ -3,7 +3,7 @@ module Actions
     module Repository
       class Clear < Actions::Pulp::AbstractAsyncTask
         def plan(repo, smart_proxy)
-          plan_self(:repo_id => repo.id, :smart_proxy_id => smart_proxy.id)
+          plan_self(:repo_id => repo.id, :smart_proxy_id => smart_proxy.id) unless (repo.yum? || repo.empty_in_pulp?)
         end
 
         def invoke_external_task

data/app/lib/actions/pulp/repository/remove_units.rb

@@ -22,7 +22,7 @@ module Actions
             content_type = ::Katello::RepositoryTypeManager.find_content_type(input[:content_unit_type].downcase)
             if input[:contents]
               units = content_type.model_class.where(:id => input[:contents])
-              unit_pulp_ids = units.sort.map(&:pulp_id)
+              unit_pulp_ids = units.map(&:pulp_id).sort
             end
             tasks << ::SmartProxy.pulp_master.content_service(content_type).remove(repo, unit_pulp_ids)
           else

data/app/lib/actions/pulp3/abstract_async_task.rb

@@ -121,8 +121,7 @@ module Actions
       end
 
       def tasks_api
-        api_client = PulpcoreClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpcoreClient::Configuration))
-        PulpcoreClient::TasksApi.new(api_client)
+        ::Katello::Pulp3::Api::Core.new(smart_proxy).tasks_api
       end
 
       def poll_external_task

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

@@ -24,7 +24,7 @@ module Actions
         def invoke_external_task
           repository = ::Katello::Repository.find(input[:repository_id])
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-          output[:response] = repository.backend_service(smart_proxy).create_mirror_publication
+          output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
         end
       end
     end

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

@@ -17,11 +17,11 @@ module Actions
           tasks = options[:tasks]
           repo = ::Katello::Repository.find(input[:repository_id])
           if options[:use_repository_version]
-            output[:response] = repo.backend_service(smart_proxy).refresh_mirror_distributions(:use_repository_version => true)
+            output[:response] = 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
-              output[:response] = repo.backend_service(smart_proxy).refresh_mirror_distributions(:publication => publication_href)
+              output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:publication => publication_href)
             end
           end
         end

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

@@ -11,7 +11,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:pulp_tasks] = repo.backend_service(::SmartProxy.unscoped.find(input[:smart_proxy_id])).sync_mirror
+          output[:pulp_tasks] = repo.backend_service(smart_proxy).with_mirror_adapter.sync
         end
 
         def rescue_strategy_for_self

data/app/lib/actions/pulp3/content_migration.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Pulp3
+    class ContentMigration < Pulp3::AbstractAsyncTask
+      def plan(repository_type_labels, smart_proxy = SmartProxy.pulp_master)
+        sequence do
+          plan_self(repository_type_labels: repository_type_labels, smart_proxy_id: smart_proxy.id)
+          plan_action(Actions::Pulp3::ImportMigration, repository_type_labels)
+        end
+      end
+
+      def invoke_external_task
+        migration_service = ::Katello::Pulp3::Migration.new(smart_proxy, input[:repository_type_labels])
+        migration_service.create_and_run_migration
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/import_migration.rb

@@ -0,0 +1,14 @@
+module Actions
+  module Pulp3
+    class ImportMigration < Pulp3::Abstract
+      def plan(repository_type_labels)
+        plan_self(repository_type_labels: repository_type_labels)
+      end
+
+      def run
+        migration_service = ::Katello::Pulp3::Migration.new(SmartProxy.pulp_master, input[:repository_type_labels])
+        migration_service.import_pulp3_content
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb

@@ -6,10 +6,13 @@ module Actions
           def plan(proxy)
             if proxy.pulp3_enabled?
               sequence do
+                plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanRepositoryVersions, proxy)
+                plan_action(Actions::Pulp3::OrphanCleanup::RemoveOrphans, proxy)
                 if proxy.pulp_mirror?
                   plan_action(Actions::Pulp3::OrphanCleanup::RemoveUnneededRepos, proxy)
+                  plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanDistributions, proxy)
+                  plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanRemotes, proxy)
                 end
-                plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanRepositoryVersions, proxy)
               end
             end
           end

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

@@ -18,11 +18,11 @@ module Actions
                                             filter_ids: filter_ids, solve_dependencies: solve_dependencies,
                                             rpm_filenames: rpm_filenames)
 
-                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, copy_action.output[:pulp_tasks])
+                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_action.output[:pulp_tasks])
                 else
                   #if we are not filtering, copy the version to the cv repository, and the units for each additional repo
                   action = plan_action(Actions::Pulp3::Repository::CopyVersion, source_repositories.first, smart_proxy, target_repo)
-                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, action.output[:pulp_tasks])
+                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: action.output[:pulp_tasks])
                   copy_actions = []
                   #since we're creating a new version from the first repo, start copying at the 2nd
                   source_repositories[1..-1].each do |source_repo|
@@ -32,7 +32,7 @@ module Actions
                                                 rpm_filenames: rpm_filenames)
                   end
 
-                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, copy_actions.last.output[:pulp_tasks])
+                  plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_actions.last.output[:pulp_tasks])
                 end
               end
             else

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

@@ -5,7 +5,9 @@ module Actions
         class Create < Pulp3::Abstract
           def plan(repository, smart_proxy)
             sequence do
-              plan_action(Actions::Pulp3::Repository::Create, repository, smart_proxy)
+              create_action = plan_action(Actions::Pulp3::Repository::Create, repository, smart_proxy)
+              plan_action(Actions::Pulp3::Repository::SaveVersion, repository, repository_details: create_action.output[:response])
+
               if repository.content_view.default? || !smart_proxy.pulp_master?
                 plan_action(Actions::Pulp3::Repository::CreateRemote, repository, smart_proxy)
               end

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

@@ -7,8 +7,6 @@ module Actions
             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
-              plan_action(Actions::Pulp3::Repository::CreateVersion, repository, smart_proxy) if options[:repository_creation]
-
               if options[:source_repository] && publication_content_type
                 plan_self(source_repository_id: options[:source_repository].id, target_repository_id: repository.id)
               elsif publication_content_type

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

@@ -15,7 +15,7 @@ module Actions
                 plan_self(:skip => true)
               end
               action_output = plan_action(Pulp3::Repository::ImportUpload, content_unit_href, repository, smart_proxy).output
-              plan_action(Pulp3::Repository::SaveVersion, repository, action_output[:pulp_tasks]).output
+              plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks]).output
             end
           end
 

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

@@ -0,0 +1,18 @@
+module Actions
+  module Pulp3
+    module Orchestration
+      module Repository
+        class RefreshIfNeeded < Pulp3::AbstractAsyncTask
+          def plan(repository, smart_proxy, _options = {})
+            plan_self(repository_id: repository.id, smart_proxy_id: smart_proxy.id)
+          end
+
+          def invoke_external_task
+            repo = ::Katello::Repository.find(input[:repository_id])
+            repo.backend_service(smart_proxy).refresh_if_needed
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Actions
             param :repository_id
           end
           def fetch_proxy_service(smart_proxy)
-            ::Katello::Pulp3::SmartProxyRepository.new(smart_proxy)
+            ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
           end
 
           def act_on_repo?(repo, smart_proxy)

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

@@ -8,7 +8,7 @@ module Actions
           def plan(repository, smart_proxy, options)
             sequence do
               action_output = plan_action(Actions::Pulp3::Repository::RemoveUnits, repository, smart_proxy, options).output
-              plan_action(Pulp3::Repository::SaveVersion, repository, action_output[:pulp_tasks])
+              plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks])
             end
           end
         end