katello 3.17.0.rc2.1 → 3.17.3

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/migrate/20150930183738_migrate_content_hosts.rb

@@ -329,7 +329,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def up
-    if User.where(:login => User::ANONYMOUS_API_ADMIN).first.nil?
+    unless User.unscoped.where(:login => User::ANONYMOUS_API_ADMIN).exists?
       logger.warn("Foreman anonymous admin does not exist, skipping content host migration.")
       return
     end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -1,6 +1,6 @@
 class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
   def up
-    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+    if User.unscoped.where(login: User::ANONYMOUS_ADMIN).exists?
       User.as_anonymous_admin do
         copy_data_from_hostgroup
       end
@@ -46,7 +46,10 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        content_facet.save!
+        unless content_facet.save
+          Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
+          Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
+        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>

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

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js

@@ -9,7 +9,6 @@
  * @requires Nutupane
  * @requires BastionConfig
  * @requires hostIds
- * @requires HostTracesResolve
  * @required ContentHostsHelper
  * @requires translate
  *
@@ -18,8 +17,8 @@
  */
 /*jshint camelcase:false*/
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesController',
-    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'HostTracesResolve', 'ContentHostsHelper', 'translate',
-    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, HostTracesResolve, ContentHostsHelper, translate) {
+    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'ContentHostsHelper', 'translate',
+    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, ContentHostsHelper, translate) {
 
         var tracesNutupane = new Nutupane(HostBulkAction, hostIds, 'traces');
         tracesNutupane.enableSelectAllResults();
@@ -46,7 +45,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesContro
                 });
             };
             /* eslint-disable camelcase */
-            HostTracesResolve.resolve({trace_ids: traceids}, onSuccess, onFailure);
+            HostBulkAction.resolveTraces({trace_ids: traceids}, onSuccess, onFailure);
             /* eslint-enable camelcase */
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js

@@ -10,14 +10,13 @@
  * @requires Organization
  * @requires CurrentOrganization
  * @requires CurrentHostsHelper
- * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoController',
-    ['$scope', '$q', 'translate', 'HostSubscription', 'ContentView', 'Organization', 'CurrentOrganization', 'ContentHostsHelper', 'simpleContentAccessEnabled',
-    function ($scope, $q, translate, HostSubscription, ContentView, Organization, CurrentOrganization, ContentHostsHelper, simpleContentAccessEnabled) {
+    ['$scope', '$q', 'translate', 'HostSubscription', 'ContentView', 'Organization', 'CurrentOrganization', 'ContentHostsHelper',
+    function ($scope, $q, translate, HostSubscription, ContentView, Organization, CurrentOrganization, ContentHostsHelper) {
         function doubleColonNotationToObject(dotString) {
             var doubleColonObject = {}, tempObject, parts, part, key, property;
             for (property in dotString) {
@@ -46,7 +45,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.showCVAlert = false;
         $scope.editContentView = false;
         $scope.disableEnvironmentSelection = false;
-        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
         $scope.environments = [];
 
         $scope.environments = Organization.readableEnvironments({id: CurrentOrganization});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js

@@ -23,7 +23,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
             'organization_id': CurrentOrganization,
             enabled: true,
             'full_result': true,
-            'include_available_content': true
+            'include_available_content': true,
+            'content_access_mode_all': $scope.simpleContentAccessEnabled
         };
 
         $scope.controllerName = 'katello_products';
@@ -31,11 +32,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
         $scope.table = $scope.nutupane.table;
 
         $scope.contentAccessModes = {
-            contentAccessModeAll: false,
+            contentAccessModeAll: $scope.simpleContentAccessEnabled,
             contentAccessModeEnv: false
         };
         $scope.toggleFilters = function () {
-            $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.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
             $scope.nutupane.refresh();
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js

@@ -8,14 +8,13 @@
  * @requires Subscription
  * @requires SubscriptionsHelper
  * @requires Notification
- * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification', 'simpleContentAccessEnabled',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification, simpleContentAccessEnabled) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -31,7 +30,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
         $scope.nutupane.primaryOnly = true;
         $scope.isRemoving = false;
         $scope.contextAdd = false;
-        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html

@@ -22,7 +22,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>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js

@@ -26,7 +26,8 @@ angular.module('Bastion.hosts').factory('HostBulkAction',
             releaseVersion: {method: 'PUT', params: {action: 'release_version'}},
             availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}},
             moduleStreams: {method: 'POST', params: {action: 'module_streams'}},
-            traces: {method: 'POST', params: {action: 'traces'}}
+            traces: {method: 'POST', params: {action: 'traces'}},
+            resolveTraces: {method: 'PUT', isArray: true, params: {action: 'resolve_traces'}}
         });
 
     }]

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

@@ -2756,7 +2756,7 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html
 #: app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html
-msgid "Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution."
+msgid "Katello-agent is deprecated and will be removed in a future release."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html

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

@@ -209,7 +209,7 @@
       <dt translate>Publish via HTTPS</dt>
       <dd translate>Yes</dd>
 
-      <span ng-hide="repository.content_type === 'ostree'">
+      <span ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker'">
         <dt translate>Publish via HTTP</dt>
         <dd bst-edit-checkbox="repository.unprotected"
             formatter="booleanToYesNo"

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

@@ -63,7 +63,7 @@
                ng-model="repository.url"
                type="text"/>
         <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
-          URL of the registry you want to sync. Example: https://registry-1.docker.io/
+          URL of the registry you want to sync. Example: https://registry-1.docker.io/ or https://quay.io/
         </p>
         <p class="help-block" ng-show="repository.content_type === 'ansible_collection'" translate>
           Content synced depends on the specifity of the URL and/or the optional requirements.yaml specified below <a class="fa fa-question-circle" ng-show="repository.content_type === 'ansible_collection'"
@@ -144,7 +144,7 @@
                ng-model="repository.docker_upstream_name"
                type="text"/>
         <p class="help-block" translate>
-          Name of the upstream repository you want to sync. Example: 'busybox' or 'fedora/ssh'.
+          Name of the upstream repository you want to sync. Example: 'quay/busybox' or 'fedora/ssh'.
         </p>
 
       </div>