katello 3.15.0.rc1.3 → 3.15.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a6bd47c5fa7163ee343c23d652b46abc14fdba414c1630b3b56335196aa6941
-  data.tar.gz: 18829650fef9ffdad3cea5d73a30a7bb31eca9305db9bbbda85d922b3ca93d90
+  metadata.gz: 85ee4f1e17bf63eec8c349a58dbe28aea05c1736937fa253c921c997e50247f8
+  data.tar.gz: 696c9f65f17d7a2405f4b2c807d6db42a269b728bb30cb10484fe0c6b75a88b5
 SHA512:
-  metadata.gz: 7ab1ee973db81ec2f17436659b364cf1e7529aac79616bc7e8f6b7cf4fecad4b0821abafaeaf90077bcbaccaba6882731050719586d05239f6204ecadd506968
-  data.tar.gz: 3583ab23ec2bdb236ec056f79dd789d2d8455f2e071b93b200f4836845371f6c5aee7616077cb6d7f34b8ed9cd08ee5ec30fdabbaac97f6b6d27f4b7b96c4dd0
+  metadata.gz: 882b95014f435cf75227bf1969ce47294f45988d29f757c61d6c5c3a02d43af75d4b4238b8c654609cc03fa1269bed5afbc43bc2590ff49d59fab908c508a812
+  data.tar.gz: 9edd9187a9e65364ccd41687adf5a81414a8651eb9a02d20524e7d22fb56ddcd41d817b64d81112ba851ce7b13327eadb9640796e7f8db7e247936f819de9d90

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

@@ -35,6 +35,11 @@ module Katello
       @resource_class ||= "Katello::#{resource_name.classify}".constantize
     end
 
+    def deprecate_katello_agent
+      ::Foreman::Deprecation.api_deprecation_warning("Remote actions using katello-agent are deprecated and will be removed in Katello 4.0.  " \
+                                                         "You may consider switching to Remote Execution.")
+    end
+
     def full_result_response(collection)
       { :results => collection,
         :total => collection.count,

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

@@ -6,6 +6,7 @@ module Katello
     before_action :require_packages_only, :only => [:upgrade]
     before_action :find_editable_host_with_facet, :except => :index
     before_action :find_host, :only => :index
+    before_action :deprecate_katello_agent, :only => [:install, :remove, :upgrade, :upgrade_all]
 
     resource_description do
       api_version 'v2'

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

@@ -10,6 +10,7 @@ module Katello
     before_action :find_deletable_hosts, :only => [:destroy_hosts]
     before_action :find_readable_hosts, :only => [:applicable_errata, :installable_errata, :available_incremental_updates]
     before_action :find_errata, :only => [:available_incremental_updates]
+    before_action :deprecate_katello_agent, :only => [:install_content, :update_content, :remove_content]
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
 
@@ -118,7 +119,6 @@ module Katello
           :desc => N_("The type of content.  The following types are supported: 'package', 'package_group' and 'errata'."),
           :required => true
     param :content, Array, :desc => N_("List of content (e.g. package names, package group names or errata ids)")
-    param :install_all, :bool, :desc => N_("Only used for errata, but will install all installable errata.")
     def install_content
       content_action
     end

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

@@ -17,6 +17,7 @@ module Actions
               end
             end
 
+            plan_action(Actions::Pulp3::ContentView::DeleteRepositoryReferences, content_view, SmartProxy.pulp_master)
             plan_self
           end
         end

data/app/lib/actions/katello/host/erratum/applicable_errata_install.rb

@@ -11,7 +11,7 @@ module Actions
             errata_ids = options.fetch(:errata_ids, nil)
 
             applicable_errata = host.content_facet.applicable_errata
-            applicable_errata = applicable_errata.with_identifiers(errata_ids) if errata_ids
+            applicable_errata = applicable_errata.with_identifiers(errata_ids) unless options[:update_all]
             plan_action(Actions::Katello::Host::Erratum::Install, host, applicable_errata.pluck(:errata_id))
             plan_self(:hostname => host.name)
           end

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -0,0 +1,26 @@
+module Actions
+  module Pulp3
+    module ContentView
+      class DeleteRepositoryReferences < Pulp3::AbstractAsyncTask
+        def plan(content_view, smart_proxy)
+          if content_view.repository_references.any?
+            plan_self(:content_view_id => content_view.id, :smart_proxy_id => smart_proxy.id)
+          end
+        end
+
+        def invoke_external_task
+          tasks = []
+          content_view = ::Katello::ContentView.find(input[:content_view_id])
+          content_view.repository_references.each do |repository_reference|
+            repo = repository_reference.root_repository.library_instance
+            #force pulp3 in case we've done migrations, but haven't switched over yet
+            tasks << repo.backend_service(smart_proxy, true).delete(repository_reference.repository_href)
+          end
+          content_view.repository_references.destroy_all
+
+          output[:pulp_tasks] = tasks
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,14 @@ module Actions
             sequence do
               plan_action(Actions::Pulp3::Repository::DeleteRemote, repository.id, smart_proxy) if repository.remote_href
               plan_action(Actions::Pulp3::Repository::DeleteDistributions, repository.id, smart_proxy)
-              plan_action(Actions::Pulp3::Repository::Delete, repository.id, smart_proxy)
+
+              if repository.content_view.default?
+                #we're deleting the library instance, so just delete the whole pulp3 repo
+                plan_action(Actions::Pulp3::Repository::Delete, repository.id, smart_proxy)
+              elsif repository.environment.nil?
+                #we're deleting the archived instance, so delete the version
+                plan_action(Actions::Pulp3::Repository::DeleteVersion, repository, smart_proxy)
+              end
             end
           end
         end

data/app/lib/actions/pulp3/repository/delete_version.rb

@@ -0,0 +1,20 @@
+module Actions
+  module Pulp3
+    module Repository
+      class DeleteVersion < Pulp3::AbstractAsyncTask
+        def plan(repository, smart_proxy)
+          #A version from library might be reused in a composite, or could have been copied
+          # from a library repository, so only delete the version if its the last
+          if ::Katello::Repository.where(:version_href => repository.version_href).count == 1
+            plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id)
+          end
+        end
+
+        def invoke_external_task
+          repo = ::Katello::Repository.find(input[:repository_id])
+          output[:response] = repo.backend_service(smart_proxy).delete_version
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -7,7 +7,8 @@ module Katello
         def allowed_helpers
           super + [:errata, :host_subscriptions, :host_applicable_errata_ids, :host_applicable_errata_filtered,
                    :host_latest_applicable_rpm_version, :load_pools, :load_errata_applications, :host_content_facet,
-                   :host_sla, :host_products, :sub_name, :sub_sku, :registered_through, :last_checkin]
+                   :host_sla, :host_products, :sub_name, :sub_sku, :registered_through, :last_checkin, :host_collections,
+                   :host_subscriptions_names, :host_subscriptions, :host_products_names, :host_collections_names]
         end
       end
 
@@ -23,6 +24,10 @@ module Katello
         host.subscriptions
       end
 
+      def host_subscriptions_names(host)
+        host.subscriptions.map(&:name)
+      end
+
       def host_content_facet(host)
         host.content_facet
       end
@@ -35,6 +40,23 @@ module Katello
         host_subscription_facet(host)&.installed_products
       end
 
+      def host_products_names(host)
+        products = host_products(host)
+        if products
+          products.map(&:name)
+        else
+          []
+        end
+      end
+
+      def host_collections(host)
+        host.host_collections
+      end
+
+      def host_collections_names(host)
+        host.host_collections.map(&:name)
+      end
+
       def sub_name(pool)
         return unless pool
         pool.subscription&.name

data/app/lib/katello/errors.rb

@@ -115,6 +115,8 @@ module Katello
       end
     end
 
+    class Pulp3MigrationError < StandardError; end
+
     class PulpError < StandardError
       def self.from_task(task)
         if %w(error canceled).include?(task[:state])

data/app/models/katello/repository.rb

@@ -171,8 +171,8 @@ module Katello
       joins(:root).where("#{RootRepository.table_name}.content_type" => content_type)
     end
 
-    def backend_service(smart_proxy)
-      if smart_proxy.pulp3_support?(self)
+    def backend_service(smart_proxy, force_pulp3 = false)
+      if force_pulp3 || smart_proxy.pulp3_support?(self)
         @service ||= Katello::Pulp3::Repository.instance_for_type(self, smart_proxy)
       else
         @service ||= Katello::Pulp::Repository.instance_for_type(self, smart_proxy)
@@ -301,17 +301,52 @@ module Katello
         group("#{errata}.id").count
     end
 
+    def self.errata_with_module_stream_counts(repo)
+      repository_errata = Katello::RepositoryErratum.table_name
+      errata = Katello::Erratum.table_name
+      erratum_package = Katello::ErratumPackage.table_name
+      repository_module_stream = Katello::RepositoryModuleStream.table_name
+      msep = ::Katello::ModuleStreamErratumPackage.table_name
+      ::Katello::Erratum.joins(
+        "INNER JOIN #{erratum_package} on #{erratum_package}.erratum_id = #{errata}.id",
+        "INNER JOIN #{msep} on #{msep}.erratum_package_id = #{erratum_package}.id",
+        "INNER JOIN #{repository_errata} on #{repository_errata}.erratum_id = #{errata}.id",
+        "INNER JOIN #{repository_module_stream} on #{repository_module_stream}.module_stream_id = #{msep}.module_stream_id").
+        where("#{repository_module_stream}.repository_id" => repo.id).
+        where("#{repository_errata}.repository_id" => repo.id).
+        group("#{errata}.id").count
+    end
+
+    def fetch_package_errata_to_keep
+      errata_counts = ::Katello::Repository.errata_with_package_counts(self)
+      if errata_counts.any?
+        errata_counts_in_library = ::Katello::Repository.errata_with_package_counts(library_instance)
+        errata_counts.keep_if { |id| errata_counts[id] == errata_counts_in_library[id] }
+        errata_counts.keys
+      else
+        []
+      end
+    end
+
+    def fetch_module_errata_to_filter
+      errata_counts = ::Katello::Repository.errata_with_module_stream_counts(self)
+      errata_counts_in_library = ::Katello::Repository.errata_with_module_stream_counts(library_instance)
+      if errata_counts_in_library.any?
+        errata_counts_in_library.keep_if { |id| errata_counts[id] != errata_counts_in_library[id] }
+        errata_counts_in_library.keys
+      else
+        []
+      end
+    end
+
     def partial_errata
       return [] if library_instance?
 
-      errata_with_package_counts = ::Katello::Repository.errata_with_package_counts(self)
       partial_errata = self.errata
-      if errata_with_package_counts.any?
-        errata_with_packages_in_library = ::Katello::Repository.errata_with_package_counts(library_instance)
-        errata_with_package_counts.keep_if { |id| errata_with_package_counts[id] == errata_with_packages_in_library[id] }
-        unless errata_with_package_counts.empty?
-          partial_errata = self.errata.where("#{Katello::Erratum.table_name}.id NOT IN (?)", errata_with_package_counts.keys)
-        end
+      errata_to_keep = fetch_package_errata_to_keep - fetch_module_errata_to_filter
+
+      if errata_to_keep.any?
+        partial_errata = self.errata.where("#{Katello::Erratum.table_name}.id NOT IN (?)", errata_to_keep)
       end
 
       partial_errata

data/app/models/setting/content.rb

@@ -10,9 +10,15 @@ class Setting::Content < Setting
     Hash[parameters.map { |p| [p, p] }]
   end
 
+  def self.deprecate_background(policies_hash)
+    policies_hash['background'] = 'background (deprecated)'
+    policies_hash
+  end
+
   def self.default_settings
-    download_policies = proc { hashify_parameters(::Runcible::Models::YumImporter::DOWNLOAD_POLICIES) }
-    proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
+    download_policies = proc { deprecate_background(hashify_parameters(::Runcible::Models::YumImporter::DOWNLOAD_POLICIES)) }
+
+    proxy_download_policies = proc { deprecate_background(hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES)) }
     dependency_solving_options = proc { hashify_parameters(['conservative', 'greedy']) }
     http_proxy_select = [{
       name: _("HTTP Proxies"),

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

@@ -11,9 +11,19 @@ module Katello
         Katello::Repository::DOCKER_TYPE
       ].freeze
 
+      MUTABLE_CONTENT_TYPES = [
+        Katello::DockerTag,
+        Katello::Erratum
+      ].freeze
+
       def initialize(smart_proxy, repository_types = REPOSITORY_TYPES)
-        @smart_proxy = smart_proxy
+        if (repository_types - smart_proxy.supported_pulp_types[:pulp3][:overriden_to_pulp2]).any?
+          fail ::Katello::Errors::Pulp3MigrationError, _("Pulp 3 migration cannot run. Types %s have already been migrated.") %
+            (repository_types - smart_proxy.supported_pulp_types[:pulp3][:overriden_to_pulp2]).join(', ')
+        end
+
         @repository_types = repository_types
+        @smart_proxy = smart_proxy
       end
 
       def api_client
@@ -36,8 +46,8 @@ module Katello
         create_migrations.map { |href| start_migration(href) }
       end
 
-      def self.content_types_for_migration
-        content_types = REPOSITORY_TYPES.collect do |repository_type_label|
+      def content_types_for_migration
+        content_types = @repository_types.collect do |repository_type_label|
           Katello::RepositoryTypeManager.repository_types[repository_type_label].content_types_to_index
         end
 
@@ -111,7 +121,12 @@ module Katello
       end
 
       def import_content_type(content_type)
-        content_type.model_class.where(:migrated_pulp3_href => nil).select(:id, :pulp_id).find_in_batches(batch_size: GET_QUERY_ID_LENGTH) do |needing_hrefs|
+        unmigrated_units = content_type.model_class
+        #mutable content types have to be completely re-indexed every time
+        unless MUTABLE_CONTENT_TYPES.include?(content_type.model_class)
+          unmigrated_units = unmigrated_units.where(:migrated_pulp3_href => nil)
+        end
+        unmigrated_units.select(:id, :pulp_id).find_in_batches(batch_size: GET_QUERY_ID_LENGTH) do |needing_hrefs|
           migrated_units = pulp2_content_api.list(pulp2_id__in: needing_hrefs.map { |unit| unit.pulp_id }.join(','))
           migrated_units.results.each do |migrated_unit|
             matching_record = needing_hrefs.find { |db_unit| db_unit.pulp_id == migrated_unit.pulp2_id }

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

@@ -231,6 +231,10 @@ module Katello
         create_version(:base_version => from_repository.version_href)
       end
 
+      def delete_version
+        api.repository_versions_api.delete(repo.version_href)
+      end
+
       def create_version(options = {})
         api.repositories_api.modify(repository_reference.repository_href, options)
       end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -36,6 +36,19 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
             $scope.panel.loading = false;
         }
 
+        $scope.autoAttachOptions = function () {
+            return [
+                {
+                    id: true,
+                    name: translate("Yes")
+                },
+                {
+                    id: false,
+                    name: translate("No")
+                }
+            ];
+        };
+
         $scope.activationKey = ActivationKey.get({id: $scope.$stateParams.activationKeyId}, function (activationKey) {
             $scope.$broadcast('activationKey.loaded', activationKey);
             $scope.panel.loading = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js

@@ -9,13 +9,14 @@
  * @requires ActivationKey
  * @requires SubscriptionsHelper
  * @requires Notification
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the activation key subscriptions details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'Subscription', 'SubscriptionsHelper', 'Notification',
-    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper, Notification) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'Subscription', 'SubscriptionsHelper', 'Notification', 'simpleContentAccessEnabled',
+    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper, Notification, simpleContentAccessEnabled) {
         var params;
 
         params = {
@@ -32,6 +33,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
         $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.isRemoving = false;
         $scope.contextAdd = false;
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-subscriptions.html

@@ -1,21 +1,24 @@
 <span page-title ng-model="activationKey">{{ 'Subscriptions for Activation Key:' | translate }} {{ activationKey.name }}</span>
 
 <section>
-  <h4 translate>Activation Key Type:</h4>
-
+  <h4 translate>Subscription Details</h4>
   <div class="details">
     <span class="info-label" translate>Auto-Attach</span>
+    <span class="info-value" ng-if="simpleContentAccessEnabled" translate>Not Applicable</span>
     <span class="info-value"
-          bst-edit-checkbox="activationKey.auto_attach"
-          formatter="booleanToYesNo"
-          readonly="denied('edit_activation_keys', activationKey)"
-          on-save="save(activationKey)">
+      ng-if="!simpleContentAccessEnabled"
+      bst-edit-select="activationKey.auto_attach"
+      selector="activationKey.auto_attach"
+      options="autoAttachOptions()"
+      formatter="booleanToYesNo"
+      readonly="denied('edit_activation_keys', activationKey)"
+      on-save="save(activationKey)">
     </span>
   </div>
-  <p bst-alert="info" ng-hide="!activationKey.auto_attach">
+  <p bst-alert="info" ng-hide="simpleContentAccessEnabled || !activationKey.auto_attach">
     <span>When Auto Attach is enabled, registering systems will be attached to all associated custom products and only associated Red Hat subscriptions required to satisfy the system's installed products.</span>
   </p>
-  <p bst-alert="info" ng-hide="activationKey.auto_attach">
+  <p bst-alert="info" ng-hide="simpleContentAccessEnabled || activationKey.auto_attach">
     <span translate>When Auto Attach is disabled, registering systems will be attached to all associated subscriptions.</span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html

@@ -0,0 +1,8 @@
+<section>
+  <p bst-alert="warning" >
+    <span translate>
+      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+    </span>
+  </p>
+</section>
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

@@ -26,6 +26,8 @@
       </div>
     </div>
 
+    <div data-extend-template="common/views/katello-agent-notice.html"></div>
+
     <div ng-show="showTable()" data-extend-template="layouts/partials/table.html">
       <div data-block="list-actions">
         <button class="btn btn-default" type="button"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html

@@ -8,6 +8,8 @@
       </div>
     </div>
 
+    <div data-extend-template="common/views/katello-agent-notice.html"></div>
+
     <span uib-dropdown class="input-group-btn">
       <button class="btn btn-default"
               type="button"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -5,6 +5,8 @@
   <h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h3>
 </div>
 
+<div data-extend-template="common/views/katello-agent-notice.html"></div>
+
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
 </div>