katello 4.7.0.rc1 → 4.7.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 366dabf3ddc6fab48cf353603f9ac49fb9ed3c87ac47e965eba48a63b4ce4847
-  data.tar.gz: a8307026cb41c314df92d6a89590ee38ba7547e215bbed82dd454e5fc135c68f
+  metadata.gz: 681115c601daa1728c23ca2aa5f2995c3997f8aebd24d48f465119a9daea07fe
+  data.tar.gz: f83059ee941668d27e4ada30accf702b86f37fd20e475ffa0580fdea0fa01261
 SHA512:
-  metadata.gz: 0b167060d9d9795261b6262d47fbcca7fae09a587b170e173a7cbb9ceb382371c1b8414ef7b361ab51e96088d1485f2be2d35758f34cb8574257f81951d082a5
-  data.tar.gz: 06b29d35d28b57eb6484a34622b9fec4b4395dcb66f938440051bb9cec8323e1f808e1216e0500183f1f6f7e894abd882a30dcd0468207df7a08126bac3e3281
+  metadata.gz: 98206f5b247a2e33f31fe908d0294ac239334106118493c4c6f4749461960975043e560724e788d5ae922d334f0ee151deaa7ded09eb9df79ef4931e52509278
+  data.tar.gz: 5f1528fa18239ddc42e4880b9877a81a75149a8e2c1a37242284e29ba8f6c808752d76c4afceea5b2b988f62df559ec5f3535e125e6a7465c11174ac69c71a09

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

@@ -14,12 +14,12 @@ module Actions
         case state
         when :running
           if self.external_task.nil?
-            _("initiating Candlepin task")
+            _("initiating %s task") % candlepin
           else
-            _("checking Candlepin task status")
+            _("checking %s task status") % candlepin
           end
         when :suspended
-          _("waiting for Candlepin to finish the task")
+          _("waiting for %s to finish the task") % candlepin
         else
           super
         end
@@ -30,6 +30,10 @@ module Actions
         !::Katello::Resources::Candlepin::Job.not_finished?(external_task)
       end
 
+      def candlepin
+        _("Candlepin")
+      end
+
       private
 
       def job_poll_params

data/app/lib/actions/candlepin/owner/{upstream_export.rb → retrieve_upstream_export.rb}

@@ -1,16 +1,16 @@
 module Actions
   module Candlepin
     module Owner
-      class UpstreamExport < Candlepin::Abstract
+      class RetrieveUpstreamExport < Candlepin::Abstract
         input_format do
           param :organization_id
           param :path
-          param :upstream
+          param :export_id
         end
 
         def run
           organization = ::Organization.find(input[:organization_id])
-          output[:response] = organization.redhat_provider.owner_upstream_export(input[:upstream], input[:path], {})
+          output[:response] = organization.redhat_provider.retrieve_owner_upstream_export(input[:upstream], input[:path], input[:export_id])
         end
       end
     end

data/app/lib/actions/candlepin/owner/start_upstream_export.rb

@@ -0,0 +1,24 @@
+module Actions
+  module Candlepin
+    module Owner
+      class StartUpstreamExport < Candlepin::UpstreamAbstractAsyncTask
+        input_format do
+          param :organization_id
+          param :upstream
+        end
+
+        def invoke_external_task
+          organization = ::Organization.find(input[:organization_id])
+          output[:response] = organization.redhat_provider.start_owner_upstream_export(input[:upstream])
+        end
+
+        def humanized_output
+          result_data = output[:task]&.[]('resultData')
+          return '' if result_data&.[]('status').blank?
+          "Upstream Candlepin job status: #{result_data['status']}\n
+          Message: #{result_data['statusMessage']}"
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/candlepin/upstream_abstract_async_task.rb

@@ -0,0 +1,30 @@
+module Actions
+  module Candlepin
+    class UpstreamAbstractAsyncTask < AbstractAsyncTask
+      input_format do
+        param :upstream
+      end
+
+      def done?
+        check_for_errors!(external_task)
+        !::Katello::Resources::Candlepin::UpstreamJob.not_finished?(external_task)
+      end
+
+      def candlepin
+        _("Upstream Candlepin")
+      end
+
+      private
+
+      def poll_external_task
+        ::Katello::Resources::Candlepin::UpstreamJob.get(external_task[:id], input[:upstream])
+      end
+
+      def check_for_errors!(task)
+        if task[:state] == 'FAILED'
+          fail ::Katello::Errors::UpstreamCandlepinError, task[:resultData]
+        end
+      end
+    end
+  end
+end

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

@@ -14,18 +14,28 @@ module Actions
           upstream = details['upstreamConsumer'].blank? ? {} : details['upstreamConsumer']
 
           sequence do
+            plan_self(
+              :organization_id => organization.id,
+              :organization_name => organization.name
+            )
             upstream_update = plan_action(Candlepin::Owner::UpstreamUpdate,
                         :organization_id => organization.id,
                         :upstream => upstream)
-            export_action = plan_action(Candlepin::Owner::UpstreamExport,
+            export_action = plan_action(Candlepin::Owner::StartUpstreamExport,
                         :organization_id => organization.id,
                         :upstream => upstream,
                         :path => path,
                         :dependency => upstream_update.output)
+            retrieved_export = plan_action(Candlepin::Owner::RetrieveUpstreamExport,
+                        :export_id => export_action.output[:task]['resultData']['exportId'],
+                        :organization_id => organization.id,
+                        :upstream => upstream,
+                        :path => path,
+                        :dependency => export_action.output)
             owner_import = plan_action(Candlepin::Owner::Import,
                         :label => organization.label,
                         :path => path,
-                        :dependency => export_action.output)
+                        :dependency => retrieved_export.output)
             import_products = plan_action(Candlepin::Owner::ImportProducts,
               :organization_id => organization.id,
               :dependency => owner_import.output)
@@ -34,11 +44,6 @@ module Actions
             if manifest_update
               plan_refresh_repos(import_products, organization)
             end
-
-            plan_self(
-              :organization_id => organization.id,
-              :organization_name => organization.name
-            )
           end
         end
 

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

@@ -18,7 +18,12 @@ module Actions
       def propagate_candlepin_errors
         yield
       rescue RestClient::ExceptionWithResponse => e
-        raise(::Katello::Errors::CandlepinError.from_exception(e) || e)
+        error_class = if e.response.request.url.include?('/candlepin')
+                        ::Katello::Errors::CandlepinError
+                      else
+                        ::Katello::Errors::UpstreamCandlepinError
+                      end
+        raise(error_class.from_exception(e) || e)
       end
     end
   end

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

@@ -11,6 +11,7 @@ module Actions
                 if proxy.pulp_mirror?
                   plan_action(Actions::Pulp3::OrphanCleanup::RemoveUnneededRepos, proxy)
                   plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanDistributions, proxy)
+                  plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanAlternateContentSources, proxy)
                   plan_action(Actions::Pulp3::OrphanCleanup::DeleteOrphanRemotes, proxy)
                 end
               end

data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_alternate_content_sources.rb

@@ -0,0 +1,16 @@
+module Actions
+  module Pulp3
+    module OrphanCleanup
+      class DeleteOrphanAlternateContentSources < Pulp3::AbstractAsyncTask
+        def plan(smart_proxy)
+          plan_self(:smart_proxy_id => smart_proxy.id)
+        end
+
+        def invoke_external_task
+          smart_proxy_service = ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
+          smart_proxy_service.delete_orphan_alternate_content_sources
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/errors.rb

@@ -128,6 +128,7 @@ module Katello
       end
     end
 
+    class UpstreamCandlepinError < CandlepinError; end
     class UpstreamConsumerGone < StandardError
       def message
         _("The manifest doesn't exist on console.redhat.com. " \

data/app/lib/katello/resources/candlepin/upstream_consumer.rb

@@ -40,7 +40,7 @@ module Katello
             raise ::Katello::Errors::UpstreamEntitlementGone
           end
 
-          def export(url, client_cert, client_key, ca_file)
+          def get_export(url, client_cert, client_key, ca_file)
             logger.debug "Sending GET request to upstream Candlepin: #{url}"
             return resource(url, client_cert, client_key, ca_file).get
           rescue RestClient::Exception => e

data/app/lib/katello/resources/candlepin/upstream_job.rb

@@ -0,0 +1,28 @@
+module Katello
+  module Resources
+    module Candlepin
+      class UpstreamJob < UpstreamCandlepinResource
+        class << self
+          NOT_FINISHED_STATES = %w(CREATED WAITING PENDING RUNNING).freeze unless defined? NOT_FINISHED_STATES
+          API_URL = 'https://subscription.rhsm.redhat.com/subscription'.freeze
+
+          def not_finished?(job)
+            NOT_FINISHED_STATES.include?(job[:state])
+          end
+
+          def get(id, upstream)
+            url = API_URL
+            response = Resources::Candlepin::UpstreamConsumer.get_export("#{url}#{path(id)}", upstream['idCert']['cert'],
+              upstream['idCert']['key'], nil)
+            job = JSON.parse(response)
+            job.with_indifferent_access
+          end
+
+          def path(id = nil)
+            "/jobs/#{id}"
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/katello/content_view_erratum_filter.rb

@@ -34,10 +34,10 @@ module Katello
         # additional_included_errata and inclusion filters don't work together (since it only applies when excluding)
         if self.inclusion?
           errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, [])
-          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, [])
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(repo, errata_ids, [])
         else
           errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
-          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
         end
       else
         clauses = []
@@ -74,10 +74,11 @@ module Katello
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
-    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+    def errata_module_stream_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
       module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten -
         Katello::Erratum.where(:errata_id => additional_included_errata.pluck(:errata_id)).map(&:module_streams).compact.flatten
-      module_streams.pluck(:pulp_id)
+      ModuleStream.joins(:repository_module_streams).
+        where(:id => module_streams.pluck(:id), "#{RepositoryModuleStream.table_name}.repository_id" => repo.id).pluck(:pulp_id)
     end
 
     def errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)

data/app/models/katello/glue/provider.rb

@@ -66,11 +66,6 @@ module Katello
         # Default to Red Hat
         url = upstream['apiUrl'] || API_URL
 
-        # TODO: wait until ca_path is supported
-        #       https://github.com/L2G/rest-client-fork/pull/8
-        #ca_file = '/etc/candlepin/certs/upstream/subscription.rhn.stage.redhat.com.crt'
-        ca_file = nil
-
         params = {}
         params[:capabilities] = Resources::Candlepin::CandlepinPing.ping['managerCapabilities'].inject([]) do |result, element|
           result << {'name' => element}
@@ -80,26 +75,25 @@ module Katello
                                                       upstream['idCert']['key'], ca_file, params)
       end
 
-      def owner_upstream_export(upstream, zip_file_path, _options)
-        if !upstream['idCert'] || !upstream['idCert']['cert'] || !upstream['idCert']['key']
-          Rails.logger.error "Upstream identity certificate not available"
-          fail _("Upstream identity certificate not available")
-        end
-
-        # Default to Red Hat
+      def start_owner_upstream_export(upstream)
+        validate_upstream_identity_cert!(upstream)
         url = upstream['apiUrl'] || API_URL
 
-        # TODO: wait until ca_path is supported
-        #       https://github.com/L2G/rest-client-fork/pull/8
-        #ca_file = '/etc/candlepin/certs/upstream/subscription.rhn.stage.redhat.com.crt'
-        ca_file = nil
+        response = Resources::Candlepin::UpstreamConsumer.get_export("#{url}#{upstream['uuid']}/export/async", upstream['idCert']['cert'],
+          upstream['idCert']['key'], ca_file)
+        JSON.parse(response)
+      end
 
-        data = Resources::Candlepin::UpstreamConsumer.export("#{url}#{upstream['uuid']}/export", upstream['idCert']['cert'],
+      def retrieve_owner_upstream_export(upstream, zip_file_path, export_id)
+        validate_upstream_identity_cert!(upstream)
+        url = upstream['apiUrl'] || API_URL
+
+        data = Resources::Candlepin::UpstreamConsumer.get_export("#{url}#{upstream['uuid']}/export/#{export_id}", upstream['idCert']['cert'],
                                                              upstream['idCert']['key'], ca_file)
 
         File.write(zip_file_path, data, mode: 'wb')
 
-        return true
+        true
       end
 
       def del_owner_import
@@ -168,6 +162,22 @@ module Katello
         redhat_provider? ? candlepin_ping['rulesVersion'] : ''
       end
 
+      private
+
+      def validate_upstream_identity_cert!(upstream)
+        if !upstream['idCert'] || !upstream['idCert']['cert'] || !upstream['idCert']['key']
+          Rails.logger.error "Upstream identity certificate not available"
+          fail _("Upstream identity certificate not available")
+        end
+      end
+
+      def ca_file
+        # TODO: wait until ca_path is supported
+        #       https://github.com/L2G/rest-client-fork/pull/8
+        # ca_file = '/etc/candlepin/certs/upstream/subscription.rhn.stage.redhat.com.crt'
+        nil
+      end
+
       protected
 
       def candlepin_ping

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

@@ -16,7 +16,8 @@ module Katello
 
       def self.content_unit_list(page_opts)
         page_opts[:media_type] = ['application/vnd.docker.distribution.manifest.v1+json',
-                                  'application/vnd.docker.distribution.manifest.v2+json']
+                                  'application/vnd.docker.distribution.manifest.v2+json',
+                                  'application/vnd.oci.image.manifest.v1+json']
         self.content_api.list(page_opts)
       end
 

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

@@ -14,7 +14,8 @@ module Katello
       end
 
       def self.content_unit_list(page_opts)
-        page_opts[:media_type] = ["application/vnd.docker.distribution.manifest.list.v2+json"]
+        page_opts[:media_type] = ['application/vnd.docker.distribution.manifest.list.v2+json',
+                                  'application/vnd.oci.image.index.v1+json']
         self.content_api.list(page_opts)
       end
 

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

@@ -73,6 +73,27 @@ module Katello
             distribution.try(:repository_version).nil?
       end
 
+      def delete_orphan_alternate_content_sources
+        tasks = []
+        known_acs_hrefs = []
+        known_acss = smart_proxy.smart_proxy_alternate_content_sources
+        known_acs_hrefs = known_acss.pluck(:alternate_content_source_href) if known_acss.present?
+
+        file_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'file').alternate_content_source_api
+        yum_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'yum').alternate_content_source_api
+
+        orphan_file_acs_hrefs = file_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+        orphan_yum_acs_hrefs = yum_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+
+        orphan_file_acs_hrefs.each do |orphan_file_acs_href|
+          tasks << file_acs_api.delete(orphan_file_acs_href)
+        end
+
+        orphan_yum_acs_hrefs.each do |orphan_yum_acs_href|
+          tasks << yum_acs_api.delete(orphan_yum_acs_href)
+        end
+      end
+
       def delete_orphan_remotes
         tasks = []
         repo_names = Katello::Repository.pluck(:pulp_id)

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -3925,7 +3925,7 @@ msgid "System Purpose"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
-msgid "System Purpose allows you to set the system's intended use on your network and improves the accuracy of auto attaching subscriptions."
+msgid "System purpose enables you to set the system's intended use on your network and improves reporting accuracy in the Subscriptions service of the Red Hat Hybrid Cloud Console."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html
@@ -4146,7 +4146,7 @@ msgid "This organization has Simple Content Access enabled.  Hosts are not requi
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
-msgid "This organization is not using <a target=\"_blank\" href=\"https://access.redhat.com/articles/simple-content-access\">Simple Content Access.</a> Legacy subscription management is deprecated and will be removed in a future version."
+msgid "This organization is not using <a target=\"_blank\" href=\"https://access.redhat.com/articles/simple-content-access\">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in a future version."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

data/lib/katello/repository_types/docker.rb

@@ -34,7 +34,8 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   content_type Katello::DockerTag,
                :priority => 3,
                :pulp3_service_class => ::Katello::Pulp3::DockerTag,
-               :primary_content => true
+               :primary_content => true,
+               :mutable => true
   content_type Katello::DockerBlob,
                :priority => 4,
                :pulp3_service_class => ::Katello::Pulp3::DockerBlob,

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.0.rc1".freeze
+  VERSION = "4.7.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -1,84 +1,84 @@
 # Autogenerated!
+_("Action with sub plans")
 _("Import facts")
 _("Import Puppet classes")
-_("Action with sub plans")
+_("Abstract async task")
+_("Combined Profile Update")
 _("Create")
 _("Delete Activation Key")
+_("Remote action:")
 _("Update")
-_("Abstract async task")
-_("Update CDN Configuration")
-_("Delete")
-_("Errata mail")
-_("Incremental Update of  Content View Version(s) ")
 _("Agent action")
-_("Create Alternate Content Source")
 _("Destroy Alternate Content Source")
 _("Refresh Alternate Content Source")
-_("Update Alternate Content Source")
-_("Generate host applicability")
+_("Create Alternate Content Source")
 _("Bulk generate applicability for hosts")
 _("Generate repository applicability")
+_("Update Alternate Content Source")
+_("Generate host applicability")
+_("Update CDN Configuration")
 _("Synchronize smart proxy")
 _("Sync capsule")
-_("Promote")
-_("Promotion to Environment")
-_("Publish")
-_("Remove Versions and Associations")
-_("Remove from Environment")
-_("Remove Version")
+_("Syncable export")
+_("Import")
+_("Export Repository")
+_("Export Library")
 _("Export")
-_("Import Content View Version")
-_("Import Default Content View")
-_("Import Repository")
-_("Incremental Update")
-_("Republish Version Repositories")
-_("Delete Lifecycle Environment")
-_("Publish Lifecycle Environment Repositories")
-_("Attach subscriptions")
-_("Auto attach subscriptions")
-_("Destroy Content Host")
-_("Install Applicable Errata")
-_("Hypervisors")
-_("Hypervisors update")
-_("Remove subscriptions")
-_("Update Content Overrides")
-_("Update for host")
-_("Update release version for host")
-_("Updating System Purpose for host")
-_("Package Profile Update")
-_("Combined Profile Update")
-_("Destroy")
-_("Product Create")
-_("Delete Product")
-_("Reindex subscriptions")
-_("Update http proxy")
-_("Delete Package Group")
-_("Discover")
-_("Fetch pxe files")
-_("Filtered index content")
-_("Upload into")
-_("Index content")
-_("Index errata")
-_("Index module streams")
-_("Index package groups")
-_("Instance update")
-_("Remove Content")
-_("Synchronize")
-_("Update content urls")
-_("Update http proxy details")
-_("Update redhat repository")
-_("Create Package Group")
-_("Verify checksum")
-_("Disable")
-_("Enable")
-_("Run Sync Plan:")
-_("Abstract")
-_("Create Export History")
+_("Copy version units to library")
 _("Create Import History")
 _("Create Syncable Export History")
-_("Copy version units to library")
-_("Export Library")
-_("Export Repository")
-_("Import")
-_("Syncable export")
-_("Remote action:")
+_("Create Export History")
+_("Abstract")
+_("Disable")
+_("Run Sync Plan:")
+_("Enable")
+_("Verify checksum")
+_("Create Package Group")
+_("Upload into")
+_("Update redhat repository")
+_("Update http proxy details")
+_("Update content urls")
+_("Synchronize")
+_("Remove Content")
+_("Instance update")
+_("Index package groups")
+_("Index module streams")
+_("Index errata")
+_("Index content")
+_("Filtered index content")
+_("Fetch pxe files")
+_("Errata mail")
+_("Discover")
+_("Delete Package Group")
+_("Delete")
+_("Attach subscriptions")
+_("Publish Lifecycle Environment Repositories")
+_("Update http proxy")
+_("Reindex subscriptions")
+_("Delete Product")
+_("Product Create")
+_("Destroy")
+_("Package Profile Update")
+_("Updating System Purpose for host")
+_("Update release version for host")
+_("Update for host")
+_("Update Content Overrides")
+_("Remove subscriptions")
+_("Hypervisors update")
+_("Hypervisors")
+_("Install Applicable Errata")
+_("Destroy Content Host")
+_("Auto attach subscriptions")
+_("Delete Lifecycle Environment")
+_("Republish Version Repositories")
+_("Incremental Update")
+_("Import Repository")
+_("Import Default Content View")
+_("Import Content View Version")
+_("Remove Version")
+_("Remove from Environment")
+_("Remove Versions and Associations")
+_("Publish")
+_("Promotion to Environment")
+_("Promote")
+_("Incremental Update of  Content View Version(s) ")