katello 4.6.2.1 → 4.7.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/katello-features.run.js

@@ -27,6 +27,7 @@
             'content-credentials.new',
             'content-credential.info',
             'content-credential.products',
+            'content-credential.acs',
             'content-credential.repositories'
         ];
 

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

@@ -84,6 +84,13 @@
             return result;
         };
 
+        $scope.hideActionsButtons = function(repository) {
+            if (repository.library_instance_id) {
+                return true;
+            }
+            return false;
+        };
+
         $scope.disableSyncLink = function (adavancedSync) {
             return $scope.hideSyncButton($scope.repository, adavancedSync);
         };

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

@@ -6,7 +6,7 @@
   </header>
 
   <div data-block="item-actions" bst-feature-flag="custom_products">
-    <span select-action-dropdown>
+    <span ng-hide="hideActionsButtons(repository)" select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
           <a ng-click="syncRepository(repository)" disable-link="disableSyncLink()" translate>

data/lib/katello/permission_creator.rb

@@ -83,6 +83,7 @@ module Katello
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
+                   'katello/api/v2/repositories' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
                    'katello/errata' => [:short_details, :auto_complete],
                    'katello/packages' => [:details, :auto_complete],

data/lib/katello/plugin.rb

@@ -44,6 +44,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :alternate_content_sources,
+         :url => '/alternate_content_sources',
+         :url_hash => {:controller => 'katello/api/v2/alternate_content_sources',
+                       :action => 'index'},
+         :caption => N_('Alternate Content Sources'),
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     menu :top_menu,
          :sync_plans,
          :caption => N_('Sync Plans'),
@@ -155,7 +164,7 @@ Foreman::Plugin.register :katello do
     menu :top_menu,
          :ansible_collections,
          :caption => N_('Ansible Collections'),
-         :url => '/ansible_collections',
+         :url => '/content/ansible_collections',
          :url_hash => {:controller => 'katello/api/v2/ansible_collections',
                        :action => 'index'},
          :engine => Katello::Engine,
@@ -195,15 +204,6 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
-  menu :labs_menu,
-       :alternate_content_sources,
-       :url => '/labs/alternate_content_sources',
-       :url_hash => {:controller => 'katello/api/v2/alternate_content_sources_controller',
-                     :action => 'index'},
-       :caption => N_('Alternate Content Sources'),
-       :parent => :lab_features_menu,
-       :turbolinks => false
-
   extend_template_helpers Katello::KatelloUrlsHelper
   extend_template_helpers Katello::Concerns::BaseTemplateScopeExtensions
 
@@ -230,7 +230,7 @@ Foreman::Plugin.register :katello do
   parameter_filter ::Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
   parameter_filter Organization, :label, :service_level
-  parameter_filter SmartProxy, :download_policy, :lifecycle_environment_ids => []
+  parameter_filter SmartProxy, :download_policy, :http_proxy_id, :lifecycle_environment_ids => []
 
   logger :glue, :enabled => true
   logger :pulp_rest, :enabled => true
@@ -265,6 +265,29 @@ Foreman::Plugin.register :katello do
       :onlyif => proc { |proxy| proxy.pulp_primary? }
   end
 
+  extend_page 'hosts/_list' do |context|
+    context.with_profile :content, _('Content'), default: false do
+      common_th_class = 'hidden-tablet hidden-xs'
+      common_td_class = "#{common_th_class} ellipsis"
+      use_pagelet :hosts_table_column_header, :name
+      use_pagelet :hosts_table_column_content, :name
+      add_pagelet :hosts_table_column_header, key: :subscription_status, label: _('Subscription status'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :subscription_status, class: common_td_class, callback: ->(host) { host_status_icon(host.subscription_global_status) }
+      add_pagelet :hosts_table_column_header, key: :installable_updates, label: _('Installable updates'), class: common_th_class, width: '15%'
+      add_pagelet :hosts_table_column_content, key: :installable_updates, class: common_td_class, callback: ->(host) { errata_counts(host) }
+      use_pagelet :hosts_table_column_header, :os_title
+      use_pagelet :hosts_table_column_content, :os_title
+      add_pagelet :hosts_table_column_header, key: :lifecycle_environment, label: _('Lifecycle environment'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :lifecycle_environment, class: common_td_class, callback: ->(host) { host.content_facet_attributes&.lifecycle_environment&.name }
+      add_pagelet :hosts_table_column_header, key: :content_view, label: _('Content view'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :content_view, class: common_td_class, callback: ->(host) { host.content_facet_attributes&.content_view&.name }
+      add_pagelet :hosts_table_column_header, key: :registered_at, label: _('Registered'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :registered_at, class: common_td_class, callback: ->(host) { host_registered_time(host) }
+      add_pagelet :hosts_table_column_header, key: :last_checkin, label: _('Last checkin'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :last_checkin, class: common_td_class, callback: ->(host) { host_checkin_time(host) }
+    end
+  end
+
   ::Katello::HostStatusManager::STATUSES.each do |status_class|
     register_custom_status(status_class)
   end

data/lib/katello/repository_types/deb.rb

@@ -16,7 +16,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   distribution_class PulpDebClient::DebAptDistribution
   publication_class PulpDebClient::DebAptPublication
   publications_api_class PulpDebClient::PublicationsAptApi
-  repo_sync_url_class PulpDebClient::RepositorySyncURL
+  repo_sync_url_class PulpDebClient::AptRepositorySyncURL
 
   default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,

data/lib/katello/repository_types/docker.rb

@@ -17,7 +17,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   repositories_api_class PulpContainerClient::RepositoriesContainerApi
   distributions_api_class PulpContainerClient::DistributionsContainerApi
   distribution_class PulpContainerClient::ContainerContainerDistribution
-  repo_sync_url_class PulpContainerClient::RepositorySyncURL
+  repo_sync_url_class PulpContainerClient::ContainerRepositorySyncURL
 
   index_additional_data do |repo|
     Katello::DockerMetaTag.import_meta_tags([repo])

data/lib/katello/repository_types/python.rb

@@ -19,13 +19,13 @@ Katello::RepositoryTypeManager.register('python') do
   publications_api_class PulpPythonClient::PublicationsPypiApi
   repo_sync_url_class PulpPythonClient::RepositorySyncURL
 
-  generic_remote_option :includes, title: N_("Includes"), type: Array, input_type: "textarea", delimiter: "\\n",
+  generic_remote_option :includes, title: N_("Includes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
                         description: N_("Python packages to include from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0. Leave empty to include every package.")
 
-  generic_remote_option :excludes, title: N_("Excludes"), type: Array, input_type: "textarea", delimiter: "\\n",
+  generic_remote_option :excludes, title: N_("Excludes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
                         description: N_("Python packages to exclude from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0.")
 
-  generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",",
+  generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",", default: [],
                         description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
 
   url_description N_("URL of a PyPI content source such as https://pypi.org.")

data/lib/katello/tasks/check_candlepin_content.rake

@@ -0,0 +1,16 @@
+namespace :katello do
+  desc "Check candlepin for missing repository content"
+  task :check_candlepin_content => ["environment", "check_ping"] do
+    logger = Logger.new(STDOUT)
+    User.current = User.anonymous_api_admin
+    repos = ::Katello::Repository.yum_type.in_default_view
+    bad_repos = repos.reject { |repo| ::Katello::Util::CandlepinRepositoryChecker.repository_exist_in_backend?(repo) }
+    logger.info("Checked #{repos.count} repositories.")
+    unless bad_repos.blank?
+      logger.info("There were #{bad_repos.count} repositories that do not exist in the backend system [Candlepin]")
+    end
+    bad_repos.each do |repo|
+      logger.info("Organization - \"#{repo.organization.name}\", Product - \"#{repo.product.name}\", Repository: \"#{repo.name}\"")
+    end
+  end
+end

data/lib/katello/tasks/reset.rake

@@ -5,7 +5,7 @@ namespace :katello do
     service_start = "sudo /usr/bin/systemctl start %s"
 
     task :pulp do
-      SERVICES = %w(rh-redis5-redis pulpcore-api pulpcore-content).freeze
+      SERVICES = %w(pulpcore-api pulpcore-content).freeze
 
       puts "\e[33mStarting Pulp3 Reset\e[0m\n\n"
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.6.2.1".freeze
+  VERSION = "4.7.0.rc1".freeze
 end

data/lib/monkeys/try_pulp_container_path.rb

@@ -0,0 +1,35 @@
+require 'pulp_container_client'
+PulpContainerClient::ContainerRepositorySyncURL.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    unless attributes.is_a?(Hash)
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpContainerClient::ContainerRepositorySyncURL` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) do |(k, v), h|
+      unless self.class.attribute_map.key?(k.to_sym)
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpContainerClient::ContainerRepositorySyncURL`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    end
+
+    if attributes.key?(:remote)
+      self.remote = attributes[:remote]
+    end
+
+    if attributes.key?(:mirror)
+      self.mirror = attributes[:mirror]
+    else
+      self.mirror = false
+    end
+
+    if attributes.key?(:signed_only)
+      self.signed_only = attributes[:signed_only]
+      # Monkey-patch here. Rest of the initializer is copied from the gem code.
+      #else
+      #  self.signed_only = false
+    end
+  end
+end

data/locale/action_names.rb

@@ -1,25 +1,25 @@
 # Autogenerated!
-_("Action with sub plans")
 _("Import facts")
 _("Import Puppet classes")
-_("Abstract async task")
+_("Action with sub plans")
 _("Create")
 _("Delete Activation Key")
 _("Update")
+_("Abstract async task")
+_("Update CDN Configuration")
+_("Delete")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
 _("Agent action")
 _("Create Alternate Content Source")
 _("Destroy Alternate Content Source")
 _("Refresh Alternate Content Source")
 _("Update Alternate Content Source")
-_("Errata mail")
-_("Incremental Update of  Content View Version(s) ")
 _("Generate host applicability")
 _("Bulk generate applicability for hosts")
 _("Generate repository applicability")
 _("Synchronize smart proxy")
 _("Sync capsule")
-_("Update CDN Configuration")
-_("Delete")
 _("Promote")
 _("Promotion to Environment")
 _("Publish")
@@ -81,4 +81,4 @@ _("Export Library")
 _("Export Repository")
 _("Import")
 _("Syncable export")
-_("Remote action:")
+_("Remote action:")