katello 3.17.0.rc2.2 → 3.17.0

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/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/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>

data/lib/katello/permission_creator.rb

@@ -134,7 +134,7 @@ module Katello
       @plugin.permission :publish_content_views,
                          {
                            'katello/api/v2/content_views' => [:publish],
-                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories]
+                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories, :import]
                          },
                          :resource_type => 'Katello::ContentView'
       @plugin.permission :promote_or_remove_content_views,

data/lib/katello/permissions/host_permissions.rb

@@ -27,6 +27,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
   'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/v2/hosts_bulk_actions/traces',
+  'katello/api/v2/hosts_bulk_actions/resolve_traces',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',

data/lib/katello/tasks/pulp3_post_migration_check.rake

@@ -1,8 +1,9 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
 
 namespace :katello do
   desc "Runs a post Pulp3 migration check for supported content types."
-  task :pulp3_post_migration_check => :environment do
+  task :pulp3_post_migration_check => [:environment, :disable_dynflow] do
     User.current = User.anonymous_admin
     repository_types = Katello::Pulp3::Migration.repository_types_for_migration
 

data/lib/katello/tasks/reimport.rake

@@ -12,7 +12,7 @@ namespace :katello do
   end
 
   desc "Reimports information from backend systems"
-  task :reimport => ["environment", "katello:check_ping"] do
+  task :reimport => ["dynflow:client", "katello:check_ping"] do
     User.current = User.anonymous_admin #set a user for orchestration
     Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.17.0.rc2.2".freeze
+  VERSION = "3.17.0".freeze
 end

data/webpack/index.js

@@ -13,4 +13,3 @@ componentRegistry.register({
   name: 'katello',
   type: Application,
 });
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.17.0.rc2.2
+  version: 3.17.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -860,6 +860,7 @@ files:
 - app/lib/actions/katello/content_view_version/create_repos.rb
 - app/lib/actions/katello/content_view_version/destroy.rb
 - app/lib/actions/katello/content_view_version/export.rb
+- app/lib/actions/katello/content_view_version/import.rb
 - app/lib/actions/katello/content_view_version/incremental_update.rb
 - app/lib/actions/katello/content_view_version/republish_repositories.rb
 - app/lib/actions/katello/environment/destroy.rb
@@ -1043,10 +1044,15 @@ files:
 - app/lib/actions/pulp3/content_migration.rb
 - app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/content_view_version/create_exporter.rb
+- app/lib/actions/pulp3/content_view_version/create_importer.rb
 - app/lib/actions/pulp3/content_view_version/destroy_exporter.rb
+- app/lib/actions/pulp3/content_view_version/destroy_importer.rb
 - app/lib/actions/pulp3/content_view_version/export.rb
+- app/lib/actions/pulp3/content_view_version/import.rb
 - app/lib/actions/pulp3/import_migration.rb
+- app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/export.rb
+- app/lib/actions/pulp3/orchestration/content_view_version/import.rb
 - app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
 - app/lib/actions/pulp3/orchestration/repository/create.rb
@@ -1406,6 +1412,7 @@ files:
 - app/services/katello/event_monitor/poller_thread.rb
 - app/services/katello/event_queue.rb
 - app/services/katello/host_status_manager.rb
+- app/services/katello/host_trace_manager.rb
 - app/services/katello/managed_content_medium_provider.rb
 - app/services/katello/product_content_finder.rb
 - app/services/katello/product_content_importer.rb
@@ -1452,6 +1459,8 @@ files:
 - app/services/katello/pulp3/api/yum.rb
 - app/services/katello/pulp3/content.rb
 - app/services/katello/pulp3/content_view_version/export.rb
+- app/services/katello/pulp3/content_view_version/import.rb
+- app/services/katello/pulp3/content_view_version/import_export_common.rb
 - app/services/katello/pulp3/distribution.rb
 - app/services/katello/pulp3/docker_blob.rb
 - app/services/katello/pulp3/docker_manifest.rb
@@ -1495,6 +1504,10 @@ files:
 - app/services/katello/ui_notifications/subscriptions/manifest_import_success.rb
 - app/services/katello/ui_notifications/subscriptions/manifest_refresh_error.rb
 - app/services/katello/ui_notifications/subscriptions/manifest_refresh_success.rb
+- app/services/katello/ui_notifications/subscriptions/sca_disable_error.rb
+- app/services/katello/ui_notifications/subscriptions/sca_disable_success.rb
+- app/services/katello/ui_notifications/subscriptions/sca_enable_error.rb
+- app/services/katello/ui_notifications/subscriptions/sca_enable_success.rb
 - app/services/katello/ui_notifications/task_notification.rb
 - app/services/katello/upstream_connection_checker.rb
 - app/views/common/400.html
@@ -1758,6 +1771,8 @@ files:
 - app/views/overrides/activation_keys/_host_tab.html.erb
 - app/views/overrides/activation_keys/_host_tab_pane.html.erb
 - app/views/overrides/organizations/_edit_override.html.erb
+- app/views/overrides/organizations/_index_header_override.html.erb
+- app/views/overrides/organizations/_index_row_override.html.erb
 - app/views/overrides/organizations/_step_1_override.html.erb
 - app/views/overrides/smart_proxies/_download_policy.erb
 - app/views/overrides/smart_proxies/_environment_tab.html.erb
@@ -4202,7 +4217,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-module-streams.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/hosts.module.js
@@ -4995,9 +5009,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js

@@ -1,18 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.hosts.factory:HostTracesResolve
- *
- * @requires BastionResource
- *
- * @description
- *   Provides a BastionResource for resolving traces on a set of systems.
- */
-angular.module('Bastion.hosts').factory('HostTracesResolve',
-    ['BastionResource', function (BastionResource) {
-
-        return BastionResource('katello/api/v2/traces/:action', {}, {
-            resolve: {method: 'PUT', isArray: true, params: {action: 'resolve'}}
-        });
-
-    }]
-);