katello 3.17.0.rc2.2 → 3.17.0

data/app/services/katello/pulp3/content_view_version/import_export_common.rb

@@ -0,0 +1,44 @@
+module Katello
+  module Pulp3
+    module ContentViewVersion
+      module ImportExportCommon
+        def generate_name
+          @content_view_version.name.gsub(/\s/, '_')
+        end
+
+        def generate_id
+          "#{@content_view_version.organization.label}_#{generate_name}"
+        end
+
+        def api
+          ::Katello::Pulp3::Api::Core.new(@smart_proxy)
+        end
+
+        def fetch_repository_info(version_href)
+          repo_api = ::Katello::Pulp3::Api::Yum.new(@smart_proxy).repositories_api
+          repo_api.read(version_href_to_repository_href(version_href))
+        end
+
+        def repository_hrefs
+          version_hrefs.map { |href| version_href_to_repository_href(href) }.uniq
+        end
+
+        def version_hrefs
+          repositories.pluck(:version_href).compact
+        end
+
+        def repositories
+          if @content_view_version.default?
+            @content_view_version.repositories.yum_type
+          else
+            @content_view_version.archived_repos.yum_type
+          end
+        end
+
+        def version_href_to_repository_href(version_href)
+          version_href.split("/")[0..-3].join("/") + "/"
+        end
+      end
+    end
+  end
+end

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

@@ -3,10 +3,13 @@ require 'pulp_rpm_client'
 module Katello
   module Pulp3
     class Repository
+      # rubocop:disable Metrics/ClassLength
       class Yum < ::Katello::Pulp3::Repository
         include Katello::Util::Errata
         include Katello::Util::PulpcoreContentFilters
 
+        UNIT_LIMIT = 10_000
+
         def remote_options
           url, sles_token = extract_sles_token
           options = common_remote_options
@@ -109,14 +112,71 @@ module Katello
                 data.config << config
               end
             end
-            # FIXME: data's content being [] causes all content to be copied back
-            tasks << api.copy_api.copy_content(data)
+            tasks << copy_content_chunked(data)
           else
             tasks << remove_all_content_from_mapping(repo_id_map)
           end
           tasks.flatten
         end
 
+        def copy_api_data_dup(data)
+          data_dup = PulpRpmClient::Copy.new
+          data_dup.dependency_solving = data.dependency_solving
+          data_dup.config = []
+          data.config.each do |repo_config|
+            config_hash = {
+              source_repo_version: repo_config[:source_repo_version],
+              dest_repo: repo_config[:dest_repo],
+              content: []
+            }
+            config_hash[:dest_base_version] = repo_config[:dest_base_version] if repo_config[:dest_base_version]
+            data_dup.config << config_hash
+          end
+          data_dup
+        end
+
+        def copy_content_chunked(data)
+          tasks = []
+          # Don't chunk if there aren't enough content units
+          if data.config.sum { |repo_config| repo_config[:content].size } <= UNIT_LIMIT
+            return api.copy_api.copy_content(data)
+          end
+
+          unit_copy_counter = 0
+          i = 0
+          leftover_units = data.config.first[:content].deep_dup
+
+          # Copy data and clear its content fields
+          data_dup = copy_api_data_dup(data)
+
+          while i < data_dup.config.size
+            # Copy all units within repo or only some?
+            if leftover_units.length < UNIT_LIMIT - unit_copy_counter
+              copy_amount = leftover_units.length
+            else
+              copy_amount = UNIT_LIMIT - unit_copy_counter
+            end
+
+            data_dup.config[i][:content] = leftover_units.pop(copy_amount)
+            unit_copy_counter += copy_amount
+            # Do copy call if limit is reached or if we're under the limit but on the last repo config.
+            if unit_copy_counter >= UNIT_LIMIT || (i == data_dup.config.size - 1 && leftover_units.empty?)
+              tasks << api.copy_api.copy_content(data_dup)
+              unit_copy_counter = 0
+            end
+
+            if leftover_units.empty?
+              # Nothing more to copy -- clear current config's content
+              data_dup.config[i][:content] = []
+              i += 1
+              # Fetch unit list for next data config
+              leftover_units = data.config[i][:content].deep_dup unless i == data_dup.config.size
+            end
+          end
+
+          tasks
+        end
+
         def remove_all_content_from_mapping(repo_id_map)
           tasks = []
           repo_id_map.each do |_source_repo_ids, dest_repo_id_map|
@@ -148,6 +208,16 @@ module Katello
           tasks
         end
 
+        def copy_all(source_repository)
+          data = PulpRpmClient::Copy.new
+          data.config = [{
+            source_repo_version: source_repository.version_href,
+            dest_repo: repository_reference.repository_href
+          }]
+
+          [api.copy_api.copy_content(data)]
+        end
+
         def remove_all_content_from_repo(repo_href)
           data = PulpRpmClient::RepositoryAddRemoveContent.new(
             remove_content_units: ['*'])
@@ -271,7 +341,6 @@ module Katello
           end
 
           filters.flatten!.compact!
-
           whitelist_ids = []
           blacklist_ids = []
           filters.each do |filter|
@@ -298,7 +367,6 @@ module Katello
             content_unit_hrefs += additional_content_hrefs(source_repository, content_unit_hrefs)
           end
           content_unit_hrefs += source_repository.srpms.pluck(:pulp_id)
-
           dependency_solving = options[:solve_dependencies] || false
           copy_units(source_repository, content_unit_hrefs.uniq, dependency_solving)
         end

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

@@ -61,7 +61,7 @@ module Katello
       end
 
       def task_group_href
-        task_data[:task_group]
+        task_data[:task_group] || task_data[:created_resources].find { |href| href.starts_with?("/pulp/api/v3/task-groups/") }
       end
 
       def done?
@@ -79,7 +79,7 @@ module Katello
 
       def error
         if task_data[:state] == CANCELED
-          self.new(_("Task canceled"))
+          _("Task canceled")
         elsif task_data[:state] == FAILED
           if task_data[:error][:description].blank?
             _("Pulp task error")
@@ -90,8 +90,8 @@ module Katello
       end
 
       def cancel
-        data = PulpcoreClient::Task.new(state: 'canceled')
-        tasks_api.tasks_cancel(pulp_task['pulp_href'], data)
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_api.tasks_cancel(task_data['pulp_href'], data)
         #the main task may have completed, so cancel spawned tasks too
         task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
       end

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

@@ -73,6 +73,12 @@ module Katello
       end
 
       def cancel
+        tasks_api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+        tasks_response = tasks_api.list(task_group: task_group_data['pulp_href'])
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_response.results.collect do |result|
+          tasks_api.tasks_cancel(result.pulp_href, data)
+        end
       end
     end
   end

data/app/services/katello/ui_notifications/subscriptions/sca_disable_error.rb

@@ -0,0 +1,13 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class SCADisableError < UINotifications::TaskNotification
+        private
+
+        def blueprint
+          @blueprint ||= NotificationBlueprint.find_by(name: 'sca_disable_error')
+        end
+      end
+    end
+  end
+end

data/app/services/katello/ui_notifications/subscriptions/sca_disable_success.rb

@@ -0,0 +1,13 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class SCADisableSuccess < UINotifications::AbstractNotification
+        private
+
+        def blueprint
+          @blueprint ||= NotificationBlueprint.find_by(name: 'sca_disable_success')
+        end
+      end
+    end
+  end
+end

data/app/services/katello/ui_notifications/subscriptions/sca_enable_error.rb

@@ -0,0 +1,13 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class SCAEnableError < UINotifications::TaskNotification
+        private
+
+        def blueprint
+          @blueprint ||= NotificationBlueprint.find_by(name: 'sca_enable_error')
+        end
+      end
+    end
+  end
+end

data/app/services/katello/ui_notifications/subscriptions/sca_enable_success.rb

@@ -0,0 +1,13 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class SCAEnableSuccess < UINotifications::AbstractNotification
+        private
+
+        def blueprint
+          @blueprint ||= NotificationBlueprint.find_by(name: 'sca_enable_success')
+        end
+      end
+    end
+  end
+end

data/app/views/overrides/organizations/_edit_override.html.erb

@@ -15,4 +15,13 @@
                'data-url' => "/katello/api/v2/organizations/#{@taxonomy.id}/download_debug_certificate"
   end %>
 
-<% end%>
+  <% if @can_toggle_sca %>
+    <%= field(f, _('Simple Content Access'),
+              :help_inline => _('Toggling Simple Content Access will refresh your manifest.')) do
+      tag1 = hidden_field_tag 'simple_content_access', '0'
+      tag2 = check_box_tag 'simple_content_access', '1', @taxonomy.simple_content_access?
+      tag1 + tag2
+    end %>
+  <% end %>
+
+<% end %>

data/app/views/overrides/organizations/_index_header_override.html.erb

@@ -0,0 +1,3 @@
+<% if controller_name == 'organizations' %>
+  <th><%= _("Simple Content Access") %></th>
+<% end %>

data/app/views/overrides/organizations/_index_row_override.html.erb

@@ -0,0 +1,3 @@
+<% if taxonomy.is_a?(Organization) %>
+  <td><%= taxonomy.simple_content_access? ? _("Enabled") : _("Disabled") %></td>
+<% end %>

data/config/routes/api/v2.rb

@@ -124,6 +124,7 @@ Katello::Engine.routes.draw do
             get :export_histories
             get :auto_complete_search
             post :incremental_update
+            post :import
           end
         end
 
@@ -309,12 +310,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :traces, :only => [], :controller => 'host_tracer' do
-          collection do
-            put :resolve
-          end
-        end
-
         api_resources :srpms, :only => [:index, :show], :controller => 'srpms' do
           collection do
             get :auto_complete_search

data/config/routes/overrides.rb

@@ -77,6 +77,7 @@ Foreman::Application.routes.draw do
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/traces' => 'hosts_bulk_actions#traces', :via => :post
+            match '/bulk/resolve_traces' => 'hosts_bulk_actions#resolve_traces', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
@@ -114,6 +115,9 @@ Foreman::Application.routes.draw do
           end
 
           resources :traces, :only => [:index], :controller => :host_tracer do
+            collection do
+              put :resolve
+            end
           end
         end
       end

data/db/seeds.d/109-katello-notification-blueprints.rb

@@ -60,6 +60,30 @@ blueprints = [
     name: 'manifest_delete_error',
     message: N_('Deleting manifest in \'%{subject}\' failed.'),
     level: 'error'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'sca_enable_success',
+    message: N_('Simple Content Access has been enabled for \'%{subject}\'.'),
+    level: 'info'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'sca_enable_error',
+    message: N_('Enabling Simple Content Access failed for \'%{subject}\'.'),
+    level: 'error'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'sca_disable_success',
+    message: N_('Simple Content Access has been disabled for \'%{subject}\'.'),
+    level: 'info'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'sca_disable_error',
+    message: N_('Disabling Simple Content Access failed for \'%{subject}\'.'),
+    level: 'error'
   }
 ]
 

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

@@ -9,14 +9,13 @@
  * @requires ActivationKey
  * @requires ContentHostsHelper
  * @requires CurrentOrganization
- * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for activation key associations.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host', 'simpleContentAccessEnabled',
-    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host, simpleContentAccessEnabled) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host',
+    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host) {
         var contentHostsNutupane, nutupaneParams, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -60,7 +59,5 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
 
         $scope.memory = ContentHostsHelper.memory;
-
-        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
     }]
 );

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

@@ -20,7 +20,8 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         params = {
             id: $scope.$stateParams.activationKeyId,
-            'organization_id': CurrentOrganization
+            'organization_id': CurrentOrganization,
+            'content_access_mode_all': $scope.simpleContentAccessEnabled
         };
 
         $scope.controllerName = 'katello_products';
@@ -28,12 +29,12 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
         $scope.table = $scope.nutupane.table;
 
         $scope.contentAccessModes = {
-            contentAccessModeAll: false,
+            contentAccessModeAll: $scope.simpleContentAccessEnabled,
             contentAccessModeEnv: false
         };
         $scope.toggleFilters = function () {
             $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
-            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll;
+            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll || $scope.simpleContentAccessEnabled;
             $scope.nutupane.refresh();
         };
 

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

@@ -9,14 +9,13 @@
  * @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', 'simpleContentAccessEnabled',
-    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper, Notification, simpleContentAccessEnabled) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'Subscription', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper, Notification) {
         var params;
 
         params = {
@@ -33,7 +32,6 @@ 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-repository-sets.html

@@ -17,7 +17,7 @@
   </div>
 
   <div data-block="filters">
-    <label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}">
+    <label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}" ng-if="!simpleContentAccessEnabled">
       <input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
       <span translate>Show All</span>
     </label>