katello 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4894a5652b92e0d8b87f5de6abb4b25229cd4e5ef32f5d5aafe62961d04eb4a4
-  data.tar.gz: 2ba9d4e9c8b572b23dd90c69d49a191abae7eb82c3599ffc80f65bdff9f1c73e
+  metadata.gz: e1df4c90d3b97976268e14d23a3a58a006ef9659059f029f4c5eff51099dca23
+  data.tar.gz: 228835f2dff702bcef05b93738aca3248e94e03d7f1f8874eabf7648964f7d3f
 SHA512:
-  metadata.gz: 4cff5dfc8027b6a31f9da80e513cd3d936427de6e133dc612dda6c0e1d375676f8470357331ed9a7af40272501d9b55c649b2f3e84c6a142603b5c09bce6a374
-  data.tar.gz: af3829a6c7eafa17dee7833fe17cbcf32e6a819ccf007cc7da1f82ac9652e97f030bd624a8edf8d439cc6b585bea300291d2cbd6205a148002924216bd7accee
+  metadata.gz: 73cff67750374c2235cbe78cfe11a3a0d8d1f86982d05bba2288eda2a416ff622466d089ea3a3633fa59b3cad27a28dfaf022c917e0809ebfdf741580d2199da
+  data.tar.gz: b5478182ea63c8a1c0386c9952c40481bea38a549b7e93c7566016a39a08c43f7ac495a175d473ee9cf39fb85279725949326a1f8179dc20edfe05d195883d7a

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/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_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/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/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

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/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/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.1".freeze
+  VERSION = "4.1.2".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.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-26 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
@@ -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