katello 4.1.4 → 4.2.0.rc1

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

@@ -111,8 +111,6 @@
             if (repo.$resolved && product.$resolved) {
                 if (repo.promoted) {
                     readOnlyReason = 'published';
-                } else if (repo['product_type'] === "redhat") {
-                    readOnlyReason = 'redhat';
                 } else if ($scope.denied('deletable', repo)) {
                     readOnlyReason = 'permissions';
                 }

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

@@ -27,28 +27,4 @@
         <li translate>One or more RPMs are not showing up in the local repository even though they exist in the upstream repository.</li>
       </ul>
     </div>
-  </div>
-
-  <div class="radio">
-    <label>
-      <input type="radio" ng-model="syncType" value="validateContents" />
-      <span translate>
-        Validate Content Sync
-      </span>
-    </label>
-    <div class="help-block">
-      <span translate>
-        Performs a complete sync, verifying the checksum of all packages afterwards. Any missing or corrupt package will be re-downloaded. This option will take the longest amount of time. Choose this option if:
-      </span>
-      <ul class="list-aligned">
-        <li translate>Specific packages are throwing a 404 from the package-manager.</li>
-        <li translate>Packages are corrupt, often leading to an error "Package does not match intended download" or "Hash Sum mismatch".</li>
-      </ul>
-      <span ng-show="repository.download_policy === 'on_demand' && repository.content_type === 'yum'">
-        <i class="fa fa-warning"></i>
-        <span translate>
-          When validating content, repositories using the "On Demand" download policy will download all packages within the repository.
-        </span>
-      </span>
-    </div>
-  </div>
+  </div>

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

@@ -32,7 +32,7 @@
           </a>
         </li>
 
-        <li role="menuitem" ng-hide="hideSyncButton(repository, true)" ng-class="{disabled: disableSyncLink()}">
+        <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
           <a ng-click="verifyChecksum(repository)" disable-link="disableSyncLink()" translate>
             Verify Content Checksum
           </a>

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

@@ -109,19 +109,29 @@
             readonly="denied('edit_products', product)"
             edit-trigger="uploadedFile">
         </dd>
-      </span>
-
-      <dt ng-show="repository.content_type == 'ansible_collection'" translate>Auth URL</dt>
-      <dd bst-edit-text="repository.ansible_collection_auth_url"
-          on-save="save(repository)"
-          readonly="product.redhat || denied('edit_products', product)">
-      </dd>
 
-      <dt ng-show="repository.content_type == 'ansible_collection'" translate>Auth Token</dt>
-      <dd bst-edit-text="repository.ansible_collection_auth_token"
-          on-save="save(repository)"
-          readonly="product.redhat || denied('edit_products', product)">
-      </dd>
+        <dt translate>Ansible Collection Authorization</dt>
+        <dd bst-edit-custom="repository.ansible_collection_auth_exists"
+            readonly="denied('edit_products', product)"
+            on-save="save(repository, true)"
+            formatter="ansibleAuthFilter"
+            formatter-options="repository"
+            deletable="repository.ansible_collection_auth_exists"
+            on-delete="clearAnsibleCollectionAuth()">
+          <div translate>Auth URL</div>
+          <input id="ansible_collection_auth_url"
+                 name="ansible_collection_auth_url"
+                 type="url"
+                 autocomplete="off"
+                 ng-model="repository.ansible_collection_auth_url"/>
+          <div translate>Auth Token</div>
+          <input id="ansible_collection_auth_token"
+                 name="ansible_collection_auth_token"
+                 type="password"
+                 autocomplete="off"
+                 ng-model="repository.ansible_collection_auth_token"/>
+        </dd>
+      </span>
 
       <dt translate>Verify SSL</dt>
       <dd bst-edit-checkbox="repository.verify_ssl_on_sync"
@@ -172,6 +182,14 @@
         </dd>
       </span>
 
+      <span ng-show="repository.content_type === 'yum' && repository.mirror_on_sync === false">
+        <dt translate>Retain package versions</dt>
+        <dd bst-edit-number="repository.retain_package_versions_count"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
+
       <span>
         <dt translate>HTTP Proxy</dt>
         <dd bst-edit-custom="repository.http_proxy_policy"
@@ -222,7 +240,7 @@
       <dt translate>Publish via HTTPS</dt>
       <dd translate>Yes</dd>
 
-      <span ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker'">
+      <span ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <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

@@ -242,6 +242,14 @@
         </p>
       </div>
 
+      <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirror_on_sync === false)">
+        <input id="retain_package_versions_count" name="retain_package_versions_count" ng-model="repository.retain_package_versions_count" type="number"/>
+
+        <p class="help-block">
+          <span translate>The maximum number of versions of each package to keep.</span><br />
+        </p>
+      </div>
+
       <div bst-form-group label="{{ 'HTTP Proxy Policy' | translate }}">
         <select required
                 id="http_proxy_policy"
@@ -266,8 +274,8 @@
       </span>
     </div>
 
-    <div ng-show="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'file'">
-      <h4 ng-show="repository.content_type !== undefined" translate> Published Repository Information </h4>
+    <div ng-show="repository.content_type !== undefined">
+      <h4 translate> Published Repository Information </h4>
 
       <div bst-form-group label="{{ 'Checksum' | translate }}" ng-show="repository.content_type === 'yum'">
         <select id="checksum_type"
@@ -280,7 +288,7 @@
         </p>
       </div>
 
-      <div class="checkbox">
+      <div class="checkbox" ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <label>
           <input id="unprotected" name="unprotected" ng-model="repository.unprotected" type="checkbox"/>
           <span translate>Publish via HTTP</span>

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

@@ -50,12 +50,6 @@
          tooltip-placement="left"
          tooltip-append-to-body="true">
       </i>
-      <i class="fa fa-question-sign" ng-switch-when="redhat"
-         uib-tooltip="{{ 'You cannot remove these repositories because they belong to a Red Hat product.' | translate }}"
-         tooltip-animation="false"
-         tooltip-placement="left"
-         tooltip-append-to-body="true">
-      </i>
     </span>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/aggregate-task.factory.js

@@ -23,9 +23,9 @@ angular.module('Bastion.tasks').factory('AggregateTask',
             var taskMap = {},
                 taskSearches = {},
                 taskRepresentation = {
-                    state: undefined,
-                    result: undefined,
-                    progressbar: {}
+                    state: 'stopped',
+                    result: 'success',
+                    progressbar: {type: 'success', value: 0}
                 };
 
             var unregisterSearch = function (taskId) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js

@@ -161,7 +161,7 @@ angular.module('Bastion.tasks').factory('Task',
           * @param {Function} callback function to reflect the
           *        results. If searchParams.type === 'task', the
           *        function is called with a single task, otherwise
-          *        it's passed with array of tasks sattisfying the
+          *        it's passed with array of tasks satisfying the
           *        conditions.
           *
           * @return {Number} the autogenerated id of the condition

data/lib/katello/engine.rb

@@ -183,8 +183,6 @@ module Katello
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::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)
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
       #Helper Extensions
@@ -248,7 +246,7 @@ module Katello
 
   # check whether foreman_remote_execution to integrate is available in the system
   def self.with_remote_execution?
-    (RemoteExecutionFeature rescue false) ? true : false
+    Foreman::Plugin.installed?("foreman_remote_execution")
   end
 
   def self.with_katello_agent?
@@ -260,6 +258,6 @@ module Katello
   end
 
   def self.with_ansible?
-    (ForemanAnsible rescue false) ? true : false
+    Foreman::Plugin.installed?("foreman_ansible")
   end
 end

data/lib/katello/permission_creator.rb

@@ -75,7 +75,7 @@ module Katello
                    'katello/api/v2/content_view_histories' => [:index, :auto_complete_search],
                    'katello/api/v2/content_view_repositories' => [:show_all],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
-                   'katello/api/v2/content_view_components' => [:index, :show],
+                   'katello/api/v2/content_view_components' => [:index, :show, :show_all],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
@@ -113,7 +113,7 @@ module Katello
                          :resource_type => 'Katello::ContentView'
       @plugin.permission :edit_content_views,
                          {
-                           'katello/api/v2/content_views' => [:update],
+                           'katello/api/v2/content_views' => [:update, :remove_filters],
                            'katello/api/v2/content_view_versions' => [:update],
                            'katello/api/v2/content_view_filters' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
@@ -151,27 +151,27 @@ module Katello
                            'katello/api/v2/content_credentials' => [:index, :show, :content, :auto_complete_search],
                            'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search]
                          },
-                         :resource_type => 'Katello::GpgKey',
+                         :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :readable
       @plugin.permission :create_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:create],
                            'katello/api/v2/gpg_keys' => [:create]
                          },
-                         :resource_type => 'Katello::GpgKey'
+                         :resource_type => 'Katello::ContentCredential'
       @plugin.permission :edit_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:update, :set_content],
                            'katello/api/v2/gpg_keys' => [:update, :set_content]
                          },
-                         :resource_type => 'Katello::GpgKey',
+                         :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :editable
       @plugin.permission :destroy_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:destroy],
                            'katello/api/v2/gpg_keys' => [:destroy]
                          },
-                         :resource_type => 'Katello::GpgKey',
+                         :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :deletable
     end
 
@@ -317,12 +317,6 @@ module Katello
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :syncable
-      @plugin.permission :export_products,
-                         {
-                           'katello/api/v2/repositories' => [:export]
-                         },
-                         :resource_type => 'Katello::Product',
-                         :finder_scope => :exportable
     end
 
     def subscription_permissions

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 '>= 2.4'
+  requires_foreman '>= 2.6'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -91,89 +91,85 @@ Foreman::Plugin.register :katello do
 
     divider :top_menu, :caption => N_('Content Types'), :parent => :content_menu
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::DEB_TYPE)
-      menu :top_menu,
-           :debs,
-           :caption => N_('Deb Packages'),
-           :url => '/debs',
-           :url_hash => {:controller => 'katello/api/v2/debs',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :debs,
+         :caption => N_('Deb Packages'),
+         :url => '/debs',
+         :url_hash => {:controller => 'katello/api/v2/debs',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::DEB_TYPE) }
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::DOCKER_TYPE)
-      menu :top_menu,
-           :docker_tags,
-           :caption => N_('Container Image Tags'),
-           :url => '/docker_tags',
-           :url_hash => {:controller => 'katello/api/v2/docker_tags',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :docker_tags,
+         :caption => N_('Container Image Tags'),
+         :url => '/docker_tags',
+         :url_hash => {:controller => 'katello/api/v2/docker_tags',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::DOCKER_TYPE) }
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::FILE_TYPE)
-      menu :top_menu,
-           :files,
-           :caption => N_('Files'),
-           :url => '/files',
-           :url_hash => {:controller => 'katello/api/v2/file_units',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :files,
+         :caption => N_('Files'),
+         :url => '/files',
+         :url_hash => {:controller => 'katello/api/v2/file_units',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::FILE_TYPE) }
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::OSTREE_TYPE)
-      menu :top_menu,
-           :ostree_branches,
-           :caption => N_('OSTree Branches'),
-           :url => '/ostree_branches',
-           :url_hash => {:controller => 'katello/api/v2/ostree_branches',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :ostree_branches,
+         :caption => N_('OSTree Branches'),
+         :url => '/ostree_branches',
+         :url_hash => {:controller => 'katello/api/v2/ostree_branches',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::OSTREE_TYPE) }
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::YUM_TYPE)
-      menu :top_menu,
-           :packages,
-           :caption => N_('Packages'),
-           :url => '/packages',
-           :url_hash => {:controller => 'katello/api/v2/packages',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-
-      menu :top_menu,
-           :errata,
-           :caption => N_('Errata'),
-           :url => '/errata',
-           :url_hash => {:controller => 'katello/api/v2/errata',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-
-      menu :top_menu,
-           :module_streams,
-           :caption => N_('Module Streams'),
-           :url => '/module_streams',
-           :url_hash => {:controller => 'katello/api/v2/module_streams',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :packages,
+         :caption => N_('Packages'),
+         :url => '/packages',
+         :url_hash => {:controller => 'katello/api/v2/packages',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::YUM_TYPE) }
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::ANSIBLE_COLLECTION_TYPE)
-      menu :top_menu,
-           :ansible_collections,
-           :caption => N_('Ansible Collections'),
-           :url => '/ansible_collections',
-           :url_hash => {:controller => 'katello/api/v2/ansible_collections',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
+    menu :top_menu,
+         :errata,
+         :caption => N_('Errata'),
+         :url => '/errata',
+         :url_hash => {:controller => 'katello/api/v2/errata',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::YUM_TYPE) }
+
+    menu :top_menu,
+         :module_streams,
+         :caption => N_('Module Streams'),
+         :url => '/module_streams',
+         :url_hash => {:controller => 'katello/api/v2/module_streams',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::YUM_TYPE) }
+
+    menu :top_menu,
+         :ansible_collections,
+         :caption => N_('Ansible Collections'),
+         :url => '/ansible_collections',
+         :url_hash => {:controller => 'katello/api/v2/ansible_collections',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::ANSIBLE_COLLECTION_TYPE) }
   end
 
   menu :top_menu,
@@ -201,7 +197,7 @@ Foreman::Plugin.register :katello do
   menu :labs_menu,
        :content_publication,
        :url => '/labs/content_views',
-       :url_hash => {:controller => 'katello/react',
+       :url_hash => {:controller => 'katello/api/v2/content_views',
                      :action => 'index'},
        :caption => N_('Content Views'),
        :parent => :lab_features_menu,

data/lib/katello/repository_types/python.rb

@@ -0,0 +1,37 @@
+require 'pulp_python_client'
+
+Katello::RepositoryTypeManager.register('python') do
+  allow_creation_by_user true
+  pulp3_service_class Katello::Pulp3::Repository::Generic
+  pulp3_api_class Katello::Pulp3::Api::Generic
+  pulp3_plugin 'python'
+  partial_repo_path '' #TODO: add partial repo path
+
+  repositories_api_class PulpPythonClient::RepositoriesPythonApi
+  api_class PulpPythonClient::ApiClient
+  configuration_class PulpPythonClient::Configuration
+  remotes_api_class PulpPythonClient::RemotesPythonApi
+  distributions_api_class PulpPythonClient::DistributionsPypiApi
+  repository_versions_api_class PulpPythonClient::RepositoriesPythonVersionsApi
+  remote_class PulpPythonClient::PythonPythonRemote
+  repo_sync_url_class PulpPythonClient::RepositorySyncURL
+  client_module_class PulpPythonClient
+  distribution_class PulpPythonClient::PythonPythonDistribution
+  publication_class PulpPythonClient::PythonPythonPublication
+  publications_api_class PulpPythonClient::PublicationsPypiApi
+
+  generic_remote_option :includes, type: Array, description: "A list containing project specifiers for Python packages to include."
+  generic_remote_option :excludes, type: Array, description: "A list containing project specifiers for Python packages to exclude."
+  generic_remote_option :package_types, type: Array, description: "A list of package types to sync for Python content. Leave blank to get every package type."
+
+  model_name lambda { |pulp_unit| pulp_unit["name"] }
+  model_version lambda { |pulp_unit| pulp_unit["version"] }
+
+  generic_content_type 'python_package',
+                       model_class: Katello::GenericContentUnit,
+                       pulp3_api: PulpPythonClient::ContentPackagesApi,
+                       pulp3_model: PulpPythonClient::PythonPythonPackageContent,
+                       pulp3_service_class: Katello::Pulp3::GenericContentUnit,
+                       removable: true,
+                       uploadable: true
+end

data/lib/katello/tasks/reimport.rake

@@ -22,15 +22,6 @@ namespace :katello do
       Katello::Content
     ]
 
-    Katello::RepositoryTypeManager.repository_types.each_value do |repo_type|
-      indexable_types = repo_type.content_types_to_index
-      if SmartProxy.pulp_primary.pulp3_repository_type_support?(repo_type)
-        puts "\e[33mIgnoring types: #{indexable_types&.map { |type| type.model_class.name }}\e[0m\n"
-      else
-        models += indexable_types&.map(&:model_class)
-      end
-    end
-
     models.each do |model|
       print "Importing #{model.name}\n"
       model.import_all

data/lib/katello/tasks/repository.rake

@@ -114,21 +114,20 @@ namespace :katello do
   def repo_exists?(repo)
     if SmartProxy.pulp_primary!.pulp3_support?(repo)
       backend_service = repo.backend_service(SmartProxy.pulp_primary!)
-      return false unless backend_service&.repository_reference&.repository_href
       backend_service.api.repositories_api.read(backend_service.repository_reference.repository_href)
     else
       Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
     end
     true
-  rescue StandardError => e
-    return false if e.code == 404
+  rescue RestClient::ResourceNotFound, PulpRpmClient::ApiError
+    false
   end
 
   def handle_missing_repo(repo)
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true) if commit?
+      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo) if commit?
     else
       puts "Deleting #{repo.id}"
       ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo) if commit?

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.4".freeze
+  VERSION = "4.2.0.rc1".freeze
 end