katello 4.9.1 → 4.10.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js

@@ -66,6 +66,8 @@ angular.module('Bastion.products').controller('ProductDetailsController',
                     readOnlyReason = 'permissions';
                 } else if (product['published_content_view_ids'].length > 0) {
                     readOnlyReason = 'published';
+                } else if (product['has_last_affected_repo_in_filter']) {
+                    readOnlyReason = 'last_affected_repo_on_filter';
                 }
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -37,14 +37,25 @@
             });
         };
 
+        $scope.repositoryFiltersToDelete = function () {
+            return _.groupBy($scope.repository.filters && $scope.repository.filters.filter(function(filter) {
+                return filter.last_affected_repo === true;
+            }), function(filter) {
+                return filter.content_view_id;
+            });
+        };
+
         $scope.repositoryWrapper = {
             repository: $scope.repository,
             repositoryVersions: {},
-            forceDelete: false
+            repositoryFiltersToDelete: {},
+            forceDeleteCV: false,
+            filterAction: 'delete',
+            showLastFilterDeletion: false
         };
 
-        $scope.updateForceDelete = function () {
-            $scope.repositoryWrapper.forceDelete = !($scope.repositoryWrapper.forceDelete);
+        $scope.updateForceDeleteCV = function () {
+            $scope.repositoryWrapper.forceDeleteCV = !($scope.repositoryWrapper.forceDeleteCV);
         };
 
         $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
@@ -71,6 +82,8 @@
             $scope.page.loading = false;
             $scope.repositoryWrapper.repository = $scope.repository;
             $scope.repositoryWrapper.repositoryVersions = $scope.repositoryVersions();
+            $scope.repositoryWrapper.repositoryFiltersToDelete = $scope.repositoryFiltersToDelete();
+            $scope.repositoryWrapper.showLastFilterDeletion = Object.keys($scope.repositoryWrapper.repositoryFiltersToDelete).length !== 0;
         }, function (response) {
             $scope.page.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
@@ -152,7 +165,7 @@
                 Notification.setSuccessMessage(translate('Repository "%s" successfully deleted').replace('%s', repositoryName));
             };
 
-            Repository.remove({id: repository.id}, success, errorHandler);
+            Repository.remove({id: repository.id, 'delete_orphaned_filters': ($scope.repositoryWrapper.filterAction === 'delete')}, success, errorHandler);
         };
 
         $scope.canRemove = function (repo, product) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html

@@ -95,11 +95,11 @@
         </li>
       </ul>
 
-      <div bst-modal="removeRepository(repository)" model="repositoryWrapper">
+      <div bst-modal="removeRepository(repository, filterAction)" model="repositoryWrapper">
         <div data-block="modal-header" translate>Remove Repository {{ repositoryWrapper.repository.name }}?</div>
         <div data-block="modal-body">
             <div ng-show="repositoryWrapper.repository.content_view_versions.length !== 0" style="margin-bottom: 1em">
-                <span translate>Repository will also be removed from the following published content view versions!</span>
+                <b><span translate>Repository will also be removed from the following published content view versions!</span></b>
                 <table class="table table-striped table-bordered" style="margin-top: 1em">
                     <thead>
                         <tr>
@@ -127,13 +127,62 @@
             </div>
             <input type="checkbox"
                    ng-show="repositoryWrapper.repository.content_view_versions.length !== 0"
-                   ng-model="repositoryWrapper.forceDelete"
-                   ng-change="updateForceDelete()"/>
-            <span translate> Are you sure you want to remove repository {{ repositoryWrapper.repository.name }} from all content views?</span>
+                   ng-model="repositoryWrapper.forceDeleteCV"
+                   ng-change="updateForceDeleteCV()"/>
+            <span translate
+                  ng-show="repositoryWrapper.repository.content_view_versions.length !== 0"
+                  style="margin-bottom: 2em"
+            >
+                Are you sure you want to remove repository {{ repositoryWrapper.repository.name }} from all content views?
+            </span>
+            <div ng-show="repositoryWrapper.showLastFilterDeletion" style="margin-top: 1em; margin-bottom: 1em">
+                <b><span translate> The filters below have this repository as the last affected repository!</span></b>
+                <table class="table table-striped table-bordered" style="margin-top: 1em">
+                    <thead>
+                        <tr>
+                            <th translate>Content View</th>
+                            <th translate>Filters</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                      <tr ng-repeat="filters in repositoryWrapper.repositoryFiltersToDelete">
+                        <td class="align-center">
+                            <a href="/content_views/{{filters[0]['content_view_id']}}/" target="_blank">
+                                {{filters[0]['content_view_name']}}
+                            </a>
+                        </td>
+                        <td class="align-center">
+                            <div ng-repeat="filter in filters">
+                                <a href="/content_views/{{filter['content_view_id']}}#/filters/{{filter['content_view_filter_id']}}" target="_blank">
+                                    {{filter['content_view_filter_name']}}
+                                </a>
+                            </div>
+                        </td>
+                      </tr>
+                    </tbody>
+                </table>
+                <div class="radio">
+                    <label>
+                      <input type="radio" ng-model="repositoryWrapper.filterAction" value="delete" />
+                      <span translate>
+                        Delete filters
+                      </span>
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                      <input type="radio" ng-model="repositoryWrapper.filterAction" value="applyAll" />
+                      <span translate>
+                        Make filters apply to all repositories in the content view
+                      </span>
+                    </label>
+              </div>
+            </div>
         </div>
           <div data-block="modal-footer">
             <span data-block="modal-confirm-button">
-              <button class="btn btn-danger" ng-disabled="repositoryWrapper.repository.content_view_versions.length !== 0 && !repositoryWrapper.forceDelete" ng-click="ok()">
+              <button class="btn btn-danger" ng-disabled="(repositoryWrapper.repository.content_view_versions.length !== 0 &&
+              !repositoryWrapper.forceDeleteCV)" ng-click="ok()">
                 <span translate>Delete</span>
               </button>
             </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -35,7 +35,7 @@
       <dl class="dl-horizontal dl-horizontal-left">
           <dt>
             <span translate>Restrict to architecture</span>
-            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
+            <i class="pficon-info" title="{{ 'The repository will only be available on content hosts with the selected architecture.' | translate }}"></i>
           </dt>
           <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
               selector="repository.arch"
@@ -45,7 +45,7 @@
 
           <dt>
             <span translate>Restrict to <br />OS version</span>
-            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
+            <i class="pficon-info" title="{{ 'The repository will only be available on content hosts with the selected OS version.' | translate }}"></i>
           </dt>
           <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
               selector="selectedOSVersion"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html

@@ -29,9 +29,20 @@
     <button type="button" class="btn btn-default"
             ng-hide="denied('edit_products')"
             ng-click="openModal()"
-            ng-disabled="table.working || table.numSelected === 0">
+            ng-disabled="table.working || table.numSelected === 0 || product.redhat">
       <i class="fa fa-trash-o" ng-hide="table.working"></i>
-      <span translate>Remove Packages</span>
+      <span ng-hide="product.redhat" translate>Remove Packages</span>
+      <span ng-show="product.redhat">
+            <span translate>Cannot Remove</span>
+            <span>
+              <i class="fa fa-question-circle" ng-show="product.redhat"
+                 uib-tooltip="{{ 'You cannot remove content from a redhat repository' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-placement="left"
+                 tooltip-append-to-body="true">
+              </i>
+            </span>
+      </span>
     </button>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -60,7 +60,7 @@
                 ng-options="arch.id as arch.name for arch in architecture">
         </select>
         <p class="help-block" translate>
-          The repository will be enabled by default on content hosts with the selected architecture.
+          The repository will only be available on content hosts with the selected architecture.
         </p>
       </div>
 
@@ -71,7 +71,7 @@
                 ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
         </select>
         <p class="help-block" translate>
-          The repository will be enabled by default on content hosts with the selected OS version.
+          The repository will only be available on content hosts with the selected OS version.
         </p>
       </div>
     </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -45,7 +45,10 @@
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Are you sure you want to remove {{ table.getSelected().length }} repositories?">
+           translate-plural="Repositories that are published in content view
+                             versions or are the last affected repository in a content view filter will be skipped. You can delete those from the repository details page.
+                             "
+      >
         Are you sure you want to remove the {{ table.getSelected()[0].name }} repository?
       </div>
     </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-details.html

@@ -46,6 +46,11 @@
                  tooltip-animation="false"
                  tooltip-append-to-body="true">
               </i>
+              <i class="fa fa-question-circle" ng-switch-when="last_affected_repo_on_filter"
+                 uib-tooltip="{{ 'You cannot remove this product because it has repositories that are the last affected repository on content view filters' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-append-to-body="true">
+              </i>
             </span>
           </span>
         </li>

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -40,10 +40,8 @@ module BastionKatello
         :config_generator =>  lambda do
           { 'consumerCertRPM' => consumer_cert_rpm,
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
-            'katelloAgentPresent' => ::Katello.with_katello_agent?,
             'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-            'hostToolingEnabled' => (::Katello.with_katello_agent? || ::Katello.with_remote_execution?) ? true : false,
-            'remoteExecutionByDefault' => ::Katello.remote_execution_by_default?
+            'hostToolingEnabled' => ::Katello.with_remote_execution?
           }
         end
       )

data/lib/katello/engine.rb

@@ -55,14 +55,6 @@ module Katello
           :queue_name => 'katello.candlepin',
           :subscription_name => 'candlepin_events',
           :client_id => 'katello_candlepin_event_monitor'
-        },
-        :agent => {
-          :client_queue_format => 'pulp.agent.%s',
-          :event_queue_name => 'katello.agent',
-          :broker_url => 'amqps://localhost:5671',
-          :broker_ssl_cert_file => SETTINGS[:ssl_certificate],
-          :broker_ssl_key_file => SETTINGS[:ssl_priv_key],
-          :broker_ssl_ca_file => SETTINGS[:ssl_ca_file]
         }
       }
 
@@ -148,7 +140,6 @@ module Katello
 
       Katello::EventDaemon::Runner.register_service(:candlepin_events, Katello::CandlepinEventListener)
       Katello::EventDaemon::Runner.register_service(:katello_events, Katello::EventMonitor::PollerThread)
-      Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver) if ::Katello.with_katello_agent?
 
       # Lib Extensions
       ::Foreman::Renderer::Scope::Variables::Base.include Katello::Concerns::RendererExtensions
@@ -226,7 +217,6 @@ module Katello
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
       Katello::EventQueue.register_event(Katello::Events::DeleteLatestContentViewVersion::EVENT_TYPE, Katello::Events::DeleteLatestContentViewVersion)
       Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)
-      Katello::EventQueue.register_event(Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, Katello::Events::DeleteHostAgentQueue)
       Katello::EventQueue.register_event(Katello::Events::DeletePool::EVENT_TYPE, Katello::Events::DeletePool)
     end
 
@@ -242,14 +232,6 @@ module Katello
     Foreman::Plugin.installed?("foreman_remote_execution")
   end
 
-  def self.with_katello_agent?
-    !!SETTINGS.dig(:katello, :agent, :enabled)
-  end
-
-  def self.remote_execution_by_default?
-    self.with_katello_agent? ? Setting['remote_execution_by_default'] : true
-  end
-
   def self.with_ansible?
     Foreman::Plugin.installed?("foreman_ansible")
   end

data/lib/katello/permission_creator.rb

@@ -404,7 +404,7 @@ module Katello
       @plugin.permission :edit_alternate_content_sources,
                          {
                            'katello/api/v2/alternate_content_sources' => [:update, :refresh],
-                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources]
+                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources, :refresh_all_alternate_content_sources]
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :editable

data/lib/katello/plugin.rb

@@ -242,7 +242,6 @@ Foreman::Plugin.register :katello do
   logger :registry_proxy, :enabled => true
   logger :katello_events, :enabled => true
   logger :candlepin_events, :enabled => true
-  logger :agent, :enabled => true
 
   widget 'errata_widget', :name => 'Latest Errata', :sizey => 1, :sizex => 6
   widget 'content_views_widget', :name => 'Content Views', :sizey => 1, :sizex => 6
@@ -457,18 +456,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Timeout when refreshing a manifest (in seconds)'),
         description: N_("Manifest refresh timeout")
 
-      setting 'content_action_accept_timeout',
-        type: :integer,
-        default: 20,
-        full_name: N_('Accept action timeout'),
-        description: N_("Time in seconds to wait for a host to pick up a katello-agent action")
-
-      setting 'content_action_finish_timeout',
-        type: :integer,
-        default: 3600,
-        full_name: N_('Finish action timeout'),
-        description: N_("Time in seconds to wait for a host to finish a katello-agent action")
-
       setting 'subscription_connection_enabled',
         type: :boolean,
         default: true,
@@ -575,12 +562,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Sync Sock Read Timeout'),
         description: N_("The maximum number of seconds that Pulp can take to download a file, not counting connection time.")
 
-      setting 'remote_execution_by_default',
-        type: :boolean,
-        default: false,
-        full_name: N_('Use remote execution by default'),
-        description: N_("If this is enabled, remote execution is used instead of katello-agent for remote actions")
-
       setting 'unregister_delete_host',
         type: :boolean,
         default: false,
@@ -612,12 +593,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Expire soon days'),
         description: N_('The number of days remaining in a subscription before you will be reminded about renewing it.')
 
-      setting 'content_view_solve_dependencies',
-        type: :boolean,
-        default: false,
-        full_name: N_('content view Dependency Solving Default'),
-        description: N_('The default dependency solving value for new content views.')
-
       setting 'host_dmi_uuid_duplicates',
         type: :array,
         default: [],

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.9.1".freeze
+  VERSION = "4.10.0.rc2".freeze
 end