katello 3.18.0.rc1 → 3.18.0.rc2

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/repository_type.rb

@@ -70,7 +70,8 @@ module Katello
       {
         :name => self.id.to_s,
         :id => self.id,
-        :creatable => @allow_creation_by_user
+        :creatable => @allow_creation_by_user,
+        :pulp3_support => SmartProxy.pulp_primary.pulp3_repository_type_support?(self)
       }
     end
 

data/app/services/katello/smart_proxy_helper.rb

@@ -21,6 +21,15 @@ module Katello
       end
     end
 
+    def clear_smart_proxy_sync_histories(repo_list = [])
+      if repo_list.empty?
+        @smart_proxy.smart_proxy_sync_histories.delete_all
+        return
+      end
+      repo_ids = repo_list.map(&:id)
+      @smart_proxy.smart_proxy_sync_histories.where("repository_id IN (?)", repo_ids).delete_all
+    end
+
     def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
       lifecycle_environment_check(environment, repository)
       if repository

data/app/views/foreman/hosts/_registration.html.erb

@@ -0,0 +1,12 @@
+<div class='form-group'>
+  <label class='col-md-2 control-label'>
+    <%= _('Activation Key(s)') %>
+    <% help = _('Activation key(s) for Subscription Manager. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3.') %>
+    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
+      <span class="pficon pficon-info "></span>
+    </a>
+  </label>
+  <div class='col-md-4'>
+    <%= text_field_tag 'activation_key', params[:activation_key], class: 'form-control' %>
+  </div>
+</div>

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -9,6 +9,7 @@ attributes :version_count
 attributes :latest_version
 attributes :auto_publish
 attributes :solve_dependencies
+attributes :import_only
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s

data/db/migrate/20200929200357_create_katello_smart_proxy_sync_history.rb

@@ -0,0 +1,13 @@
+class CreateKatelloSmartProxySyncHistory < ActiveRecord::Migration[6.0]
+  def change
+    create_table :katello_smart_proxy_sync_history do |t|
+      t.references :smart_proxy, :null => false
+      t.references :repository, :null => false
+      t.datetime :started_at
+      t.datetime :finished_at
+    end
+    add_index "katello_smart_proxy_sync_history", ["smart_proxy_id"], :name => "index_spsh_smart_proxy_id"
+    add_index "katello_smart_proxy_sync_history", ["repository_id"], :name => "index_spsh_repository_id"
+    add_index "katello_smart_proxy_sync_history", [:smart_proxy_id, :repository_id], :unique => true, :name => 'index_spsh_smart_proxy_repository_unique'
+  end
+end

data/db/migrate/20201021150008_add_import_only_to_katello_content_view.rb

@@ -0,0 +1,5 @@
+class AddImportOnlyToKatelloContentView < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_views, :import_only, :boolean, :default => false, :null => false
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.controller.js

@@ -13,8 +13,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-views').controller('ContentViewsController',
-    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization',
-    function ($scope, Nutupane, ContentView, CurrentOrganization) {
+    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization', 'RepositoryTypesService',
+    function ($scope, Nutupane, ContentView, CurrentOrganization, RepositoryTypesService) {
 
         var nutupane = new Nutupane(ContentView, {
             'nondefault': true,
@@ -26,5 +26,9 @@ angular.module('Bastion.content-views').controller('ContentViewsController',
         $scope.controllerName = 'katello_content_views';
 
         $scope.table = nutupane.table;
+
+        $scope.importOnlyEnabled = function() {
+            return RepositoryTypesService.pulp3Supported('yum');
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js

@@ -84,5 +84,17 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         };
 
         $scope.fetchContentView();
+
+        $scope.$watch('contentView.import_only', function () {
+            if ($scope.contentView.import_only) {
+                /* eslint-disable camelcase */
+                $scope.contentView.solve_dependencies = false;
+                /* eslint-enable camelcase */
+            }
+        });
+
+        $scope.importOnlyEnabled = function() {
+            return RepositoryTypesService.pulp3Supported('yum');
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html

@@ -13,7 +13,7 @@
   </div>
 
   <nav data-block="item-actions">
-    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView)"
+    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
             ui-sref="content-view.publish">
       <span translate>Publish New Version</span>
     </button>
@@ -73,7 +73,7 @@
               Repositories
             </a>
           </li>
-          <li>
+          <li ng-hide="contentView.import_only">
             <a ui-sref="content-view.yum.filters" translate>
               Filters
             </a>
@@ -82,21 +82,21 @@
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.deb')}"
-          ng-hide="contentView.composite || !repositoryTypeEnabled('deb')">
+          ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('deb')">
         <a ui-sref="content-view.repositories.deb.list" translate>
           Apt Repositories
         </a>
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.file')}"
-          ng-hide="contentView.composite || !repositoryTypeEnabled('file')">
+          ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('file')">
         <a ui-sref="content-view.repositories.file.list" translate>
           File Repositories
         </a>
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.puppet-modules')}"
-          ng-hide="contentView.composite || !repositoryTypeEnabled('puppet')">
+          ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('puppet')">
         <a ui-sref="content-view.puppet-modules.list" translate>
           Puppet Modules
         </a>
@@ -104,7 +104,7 @@
 
       <li uib-dropdown
           ng-class="{active: stateIncludes('content-view.repositories.docker') || stateIncludes('content-view.docker.filters')}"
-          ng-hide="contentView.composite || !repositoryTypeEnabled('docker')">
+          ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('docker')">
         <a uib-dropdown-toggle>
           <span translate>Container Images</span>
           <i class="fa fa-chevron-down"></i>
@@ -124,7 +124,7 @@
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.ostree')}"
-          ng-hide="contentView.composite || !repositoryTypeEnabled('ostree')">
+          ng-hide="contentView.composite || contentView.import_only || !repositoryTypeEnabled('ostree')">
         <a ui-sref="content-view.repositories.ostree.list" translate>
           OSTree Content
         </a>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html

@@ -24,6 +24,12 @@
       <dd ng-show="contentView.composite" translate>Yes</dd>
       <dd ng-hide="contentView.composite" translate>No</dd>
 
+      <div ng-show="importOnlyEnabled()">
+        <dt translate>Import-only</dt>
+        <dd ng-show="contentView.import_only" translate>Yes</dd>
+        <dd ng-hide="contentView.import_only" translate>No</dd>
+      </div>
+
       <dt translate>Force Puppet Environment</dt>
       <dd>
         <div bst-edit-checkbox="contentView.force_puppet_environment"
@@ -50,7 +56,7 @@
         </dd>
       </div>
 
-      <div>
+      <div ng-if="!contentView.import_only">
         <dt translate>Solve Dependencies</dt>
         <dd>
           <div bst-edit-checkbox="contentView.solve_dependencies"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/content-view-new.controller.js

@@ -11,8 +11,8 @@
  * @description
  */
 angular.module('Bastion.content-views').controller('NewContentViewController',
-    ['$scope', 'ContentView', 'FormUtils', 'CurrentOrganization', 'contentViewSolveDependencies',
-    function ($scope, ContentView, FormUtils, CurrentOrganization, contentViewSolveDependencies) {
+    ['$scope', 'ContentView', 'FormUtils', 'CurrentOrganization', 'contentViewSolveDependencies', 'RepositoryTypesService',
+    function ($scope, ContentView, FormUtils, CurrentOrganization, contentViewSolveDependencies, RepositoryTypesService) {
 
         function success(response) {
             var successState = 'content-view.repositories.yum.available';
@@ -44,17 +44,31 @@ angular.module('Bastion.content-views').controller('NewContentViewController',
             contentView.$save(success, error);
         };
 
+        $scope.importOnlyEnabled = function() {
+            return RepositoryTypesService.pulp3Supported('yum');
+        };
+
         $scope.$watch('contentView.name', function () {
-            if ($scope.contentViewForm.name) {
+            if ($scope.contentViewForm && $scope.contentViewForm.name) {
                 $scope.contentViewForm.name.$setValidity('server', true);
                 FormUtils.labelize($scope.contentView);
             }
         });
 
+        $scope.$watch('contentView.import_only', function () {
+            if ($scope.contentView.import_only) {
+                $scope.contentView.composite = false;
+                /* eslint-disable camelcase */
+                $scope.contentView.solve_dependencies = false;
+                /* eslint-enable camelcase */
+            }
+        });
+
         $scope.$watch('contentView.composite', function () {
             if ($scope.contentView.composite) {
                 /* eslint-disable camelcase */
                 $scope.contentView.solve_dependencies = false;
+                $scope.contentView.import_only = false;
             } else {
                 $scope.contentView.auto_publish = false;
                 /* eslint-enable camelcase */

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html

@@ -56,7 +56,7 @@
         </textarea>
       </div>
 
-      <div bst-form-group>
+      <div bst-form-group ng-hide="contentView.import_only">
         <div class="checkbox">
           <label for="composite">
             <input id="composite"
@@ -70,7 +70,21 @@
         <p class="help-block" translate>A composite view contains other content views.</p>
       </div>
 
-      <div bst-form-group ng-hide="contentView.composite">
+      <div bst-form-group ng-hide="!importOnlyEnabled() || contentView.composite">
+        <div class="checkbox">
+          <label for="import_only">
+            <input id="import_only"
+                   name="import_only"
+                   ng-model="contentView.import_only"
+                   type="checkbox"
+                   tabindex="4"/>
+            <span translate>Import-only</span>
+          </label>
+        </div>
+        <p class="help-block" translate>Designate whether this Content View is for importing from an upstream server. Import-only Content Views can not be published directly.</p>
+      </div>
+
+      <div bst-form-group ng-hide="contentView.composite || contentView.import_only">
         <div class="checkbox">
           <label for="solve_dependencies">
             <input id="solve_dependencies"

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

@@ -29,6 +29,7 @@
         <tr bst-table-head>
           <th bst-table-column><span translate>Name</span></th>
           <th bst-table-column><span translate>Composite View?</span></th>
+          <th bst-table-column ng-show="importOnlyEnabled()"><span translate>Import-only?</span></th>
           <th bst-table-column><span translate>Last Published</span></th>
           <th bst-table-column><span translate>Environments</span></th>
           <th bst-table-column><span translate>Repositories</span></th>
@@ -46,6 +47,10 @@
             <span ng-show="contentView.composite" translate>Yes</span>
             <span ng-hide="contentView.composite" translate>No</span>
           </td>
+          <td bst-table-cell ng-show="importOnlyEnabled()">
+            <span ng-show="contentView.import_only" translate>Yes</span>
+            <span ng-hide="contentView.import_only" translate>No</span>
+          </td>
           <td bst-table-cell>
             <span ng-show="contentView.last_published"><long-date-time date="contentView.last_published" /></span>
           <span ng-hide="contentView.last_published" translate>

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

@@ -11,7 +11,6 @@
      *   current state of the application.
      */
     function RepositoryTypesService(repositoryTypes) {
-
         this.repositoryTypes = function () {
             return repositoryTypes;
         };
@@ -28,6 +27,14 @@
             });
             return angular.isDefined(found);
         };
+
+        this.pulp3Supported = function(desiredType) {
+            var found = _.find(repositoryTypes, function(type) {
+                return type.id === desiredType;
+            });
+
+            return found.pulp3_support;
+        };
     }
 
     angular

data/lib/katello/engine.rb

@@ -178,6 +178,7 @@ module Katello
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::Foreman::Plugin.fact_importer_registry.register(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
       ::FactParser.register_fact_parser(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactParser)
+      ::RegistrationController.include Katello::Concerns::RegistrationControllerExtensions
 
       #Helper Extensions
       ::SmartProxiesController.class_eval do

data/lib/katello/permission_creator.rb

@@ -292,7 +292,8 @@ module Katello
                                                         :repo_puppet_modules,
                                                         :repo_compare_errata,
                                                         :repo_compare_packages,
-                                                        :repo_compare_puppet_modules]
+                                                        :repo_compare_puppet_modules],
+                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :readable
@@ -301,14 +302,16 @@ module Katello
                            'katello/api/v2/products' => [:create],
                            'katello/api/v2/package_groups' => [:create]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :editable
       @plugin.permission :edit_products,
                          {
                            'katello/api/v2/products' => [:update],
                            'katello/api/v2/repositories' => [:create, :update, :remove_content, :import_uploads, :upload_content, :republish, :verify_checksum],
                            'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy, :verify_checksum_products],
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
-                           'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
+                           'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover],
+                           'katello/api/v2/repository_sets' => [:enable, :disable]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -341,11 +344,10 @@ module Katello
                          :finder_scope => :exportable
     end
 
-    def subscription_permissions # rubocop:disable Metrics/MethodLength
+    def subscription_permissions
       @plugin.permission :view_subscriptions,
                          {
-                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
-                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
+                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :attach_subscriptions,
@@ -360,8 +362,7 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :import_manifest,
                          {
-                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
-                           'katello/api/v2/repository_sets' => [:enable, :disable]
+                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest]
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :delete_manifest,
@@ -376,11 +377,10 @@ module Katello
                          :resource_type => 'Katello::Subscription'
     end
 
-    def sync_plan_permissions # rubocop:disable Metrics/MethodLength
+    def sync_plan_permissions
       @plugin.permission :view_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search],
-                           'katello/api/v2/products' => [:index]
+                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search]
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :readable

data/lib/katello/plugin.rb

@@ -3,7 +3,7 @@ require 'katello/repository_types.rb'
 require 'katello/host_status_manager.rb'
 # rubocop:disable Metrics/BlockLength
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.24'
+  requires_foreman '>= 2.3'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -283,6 +283,11 @@ Foreman::Plugin.register :katello do
   # Extend Global Registration endpoint
   extend_allowed_registration_vars :activation_key
 
+  # Extend Global Registration UI
+  extend_page 'registration/_form' do |cx|
+    cx.add_pagelet :global_registration, name: N_('Katello'), partial: 'foreman/hosts/registration', priority: 100, id: 'katello'
+  end
+
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
                    :name => _('Storage'),

data/lib/katello/tasks/pulp3_migration_abort.rake

@@ -0,0 +1,17 @@
+namespace :katello do
+  desc "Cancels all running Pulp 2 to 3 migration tasks."
+  task :pulp3_migration_abort => ["environment", "disable_dynflow"] do
+    migration_tasks = ForemanTasks::Task::DynflowTask.where(:label => "Actions::Pulp3::ContentMigration").where.not(:state => ["stopped", "paused"])
+    cancelled_tasks_count = 0
+    migration_tasks.each do |task|
+      task.execution_plan.steps.each do |_number, step|
+        if step.cancellable? && step.is_a?(Dynflow::ExecutionPlan::Steps::RunStep)
+          ::ForemanTasks.dynflow.world.event(task.execution_plan.id, step.id, Dynflow::Action::Cancellable::Cancel)
+          cancelled_tasks_count += 1
+        end
+      end
+    end
+
+    puts _("\e[33mCancelled #{cancelled_tasks_count} tasks.\e[0m")
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.18.0.rc1".freeze
+  VERSION = "3.18.0.rc2".freeze
 end

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Grid, Col, Row, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
 import { Button, Spinner } from 'patternfly-react';
 import ForemanModal from 'foremanReact/components/ForemanModal';
+import Slot from 'foremanReact/components/common/Slot';
 import { translate as __ } from 'foremanReact/common/I18n';
 import TooltipButton from '../../../components/TooltipButton';
 import { LoadingState } from '../../../components/LoadingState';
@@ -250,17 +251,17 @@ class ManageManifestModal extends Component {
                                 />
                               }
                               {canDeleteManifest &&
-                              <React.Fragment>
-                                <TooltipButton
-                                  disabled={!isManifestImported || actionInProgress}
-                                  bsStyle="danger"
-                                  onClick={this.showDeleteManifestModal}
-                                  title={__('Delete')}
-                                  tooltipId="delete-manifest-button-tooltip"
-                                  tooltipText={this.disabledTooltipText()}
-                                  tooltipPlacement="top"
-                                />
-                              </React.Fragment>
+                                <React.Fragment>
+                                  <TooltipButton
+                                    disabled={!isManifestImported || actionInProgress}
+                                    bsStyle="danger"
+                                    onClick={this.showDeleteManifestModal}
+                                    title={__('Delete')}
+                                    tooltipId="delete-manifest-button-tooltip"
+                                    tooltipText={this.disabledTooltipText()}
+                                    tooltipPlacement="top"
+                                  />
+                                </React.Fragment>
                               }
                             </div>
                             <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
@@ -280,6 +281,7 @@ class ManageManifestModal extends Component {
                     </FormGroup>
                   </React.Fragment>
                 }
+                <Slot id="katello-manage-manifest-form" multi />
               </Form>
             </Tab>
           }