katello 3.13.4 → 3.14.0.rc1

data/app/services/katello/pulp3/repository/ansible_collection.rb

@@ -8,6 +8,10 @@ module Katello
           PulpAnsibleClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpAnsibleClient::Configuration))
         end
 
+        def client_class
+          PulpAnsibleClient
+        end
+
         def api_exception_class
           PulpAnsibleClient::ApiError
         end
@@ -32,7 +36,7 @@ module Katello
           if root.url.blank?
             super
           else
-            common_remote_options.merge(url: root.url, whitelist: root.ansible_collection_whitelist)
+            common_remote_options.merge(url: root.url.chomp("/"), requirements_file: root.ansible_collection_requirements.blank? ? nil : root.ansible_collection_requirements)
           end
         end
 

data/app/services/katello/pulp3/repository/docker.rb

@@ -12,6 +12,10 @@ module Katello
           PulpDockerClient::ApiError
         end
 
+        def client_class
+          PulpDockerClient
+        end
+
         def remote_class
           PulpDockerClient::DockerRemote
         end
@@ -28,18 +32,30 @@ module Katello
           PulpDockerClient::DistributionsDockerApi.new(api_client)
         end
 
+        def recursive_manage_class
+          PulpDockerClient::RecursiveManage
+        end
+
+        def recursive_add_api
+          PulpDockerClient::DockerRecursiveAddApi.new(api_client)
+        end
+
         def remote_options
-          if root.url.blank?
-            super
+          options = {url: root.url, upstream_name: root.docker_upstream_name}
+          if root.docker_tags_whitelist && root.docker_tags_whitelist.any?
+            options[:whitelist_tags] = root.docker_tags_whitelist.join(",")
           else
-            options = {url: root.url, upstream_name: root.docker_upstream_name}
-            if root.docker_tags_whitelist && root.docker_tags_whitelist.any?
-              options[:whitelist_tags] = root.docker_tags_whitelist.join(",")
-            else
-              options[:whitelist_tags] = nil
-            end
-            common_remote_options.merge(options)
+            options[:whitelist_tags] = nil
           end
+          common_remote_options.merge(options)
+        end
+
+        def mirror_remote_options
+          docker_options = {
+            url: "https://#{SmartProxy.pulp_master.pulp3_host!.downcase}",
+            upstream_name: repo.container_repository_name
+          }
+          common_mirror_remote_options.merge(docker_options)
         end
 
         def distribution_options(path)
@@ -49,6 +65,35 @@ module Katello
             name: "#{backend_object_name}"
           }
         end
+
+        def copy_units_recursively(unit_hrefs, clear_repo = false)
+          tasks = []
+          if clear_repo
+            tasks << create_version(:remove_content_units => ["*"])
+          end
+          tasks << recursive_add_api.create(recursive_manage_class.new(repository: repository_reference.repository_href,
+                                                                       content_units: unit_hrefs))
+          tasks
+        end
+
+        def copy_content_for_source(source_repository, options = {})
+          filters = ContentViewDockerFilter.where(:id => options[:filter_ids])
+          whitelist_ids = []
+          blacklist_ids = []
+          filters.each do |filter|
+            if filter.inclusion
+              whitelist_ids += filter.content_unit_pulp_ids(source_repository)
+            else
+              blacklist_ids += filter.content_unit_pulp_ids(source_repository)
+            end
+          end
+
+          if whitelist_ids.empty?
+            copy_units_recursively(source_repository.docker_tags.pluck(:pulp_id) - blacklist_ids, true)
+          else
+            copy_units_recursively(whitelist_ids - blacklist_ids, true)
+          end
+        end
       end
     end
   end

data/app/services/katello/pulp3/repository/file.rb

@@ -8,6 +8,10 @@ module Katello
           PulpFileClient::ApiError
         end
 
+        def client_class
+          PulpFileClient
+        end
+
         def remote_class
           PulpFileClient::FileRemote
         end
@@ -56,6 +60,10 @@ module Katello
             common_remote_options.merge(url: root.url + '/PULP_MANIFEST')
           end
         end
+
+        def partial_repo_path
+          "/pulp/isos/#{repo.relative_path}/PULP_MANIFEST"
+        end
       end
     end
   end

data/app/services/katello/pulp3/repository/yum.rb

@@ -0,0 +1,61 @@
+require 'pulp_rpm_client'
+
+module Katello
+  module Pulp3
+    class Repository
+      class Yum < ::Katello::Pulp3::Repository
+        def self.api_client(smart_proxy)
+          PulpRpmClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpRpmClient::Configuration))
+        end
+
+        def api_exception_class
+          PulpRpmClient::ApiError
+        end
+
+        def client_class
+          PulpRpmClient
+        end
+
+        def remote_class
+          PulpRpmClient::RpmRemote
+        end
+
+        def remotes_api
+          PulpRpmClient::RemotesRpmApi.new(api_client)
+        end
+
+        def publication_class
+          PulpRpmClient::RpmPublication
+        end
+
+        def publications_api
+          PulpRpmClient::PublicationsRpmApi.new(api_client)
+        end
+
+        def distribution_class
+          PulpRpmClient::RpmDistribution
+        end
+
+        def distributions_api
+          PulpRpmClient::DistributionsRpmApi.new(api_client)
+        end
+
+        def remote_options
+          if root.url.blank?
+            common_remote_options.merge(url: nil, policy: root.download_policy)
+          else
+            common_remote_options.merge(policy: root.download_policy)
+          end
+        end
+
+        def distribution_options(path)
+          {
+            base_path: path,
+            publication: repo.publication_href,
+            name: "#{backend_object_name}"
+          }
+        end
+      end
+    end
+  end
+end

data/app/services/katello/pulp3/smart_proxy_repository.rb

@@ -0,0 +1,38 @@
+module Katello
+  module Pulp3
+    class SmartProxyRepository
+      attr_accessor :smart_proxy
+
+      def initialize(smart_proxy)
+        @smart_proxy = smart_proxy
+      end
+
+      def ==(other)
+        other.class == self.class && other.smart_proxy == smart_proxy
+      end
+
+      def current_repositories(environment_id = nil, content_view_id = nil)
+        katello_repos = Katello::Repository.all
+        katello_repos = katello_repos.where(:environment_id => environment_id) if environment_id
+        katello_repos = katello_repos.in_content_views([content_view_id]) if content_view_id
+        katello_repos = katello_repos.select { |repo| smart_proxy.pulp3_support?(repo) }
+        repos_on_capsule = ::Katello::Pulp3::Repository.new(nil, smart_proxy).list(name_in: katello_repos.map(&:pulp_id))
+        repo_ids = repos_on_capsule.map(&:name)
+        katello_repos.select { |repo| repo_ids.include? repo.pulp_id }
+      end
+
+      def orphaned_repositories_for_mirror_proxies
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(smart_proxy)
+        katello_pulp_ids = smart_proxy_helper.repos_available_to_capsule.map(&:pulp_id)
+        repos_on_capsule = ::Katello::Pulp3::Repository.new(nil, smart_proxy).list({})
+        repos_on_capsule.reject { |capsule_repo| katello_pulp_ids.include? capsule_repo.name }
+      end
+
+      def delete_orphaned_repositories_for_mirror_proxies
+        orphaned_repositories_for_mirror_proxies.map do |repo|
+          ::Katello::Pulp3::Repository.new(nil, smart_proxy).repositories_api.delete(repo.pulp_href)
+        end
+      end
+    end
+  end
+end

data/app/services/katello/repository_type_manager.rb

@@ -21,6 +21,13 @@ module Katello
         end
       end
 
+      def enabled_content_types
+        list = repository_types.values.map do |type|
+          type.content_types.map(&:model_class).flatten.map { |ct| ct::CONTENT_TYPE }
+        end
+        list.flatten
+      end
+
       def creatable_by_user?(repository_type)
         return false unless (type = find(repository_type))
         type.allow_creation_by_user

data/app/services/katello/smart_proxy_helper.rb

@@ -0,0 +1,50 @@
+module Katello
+  class SmartProxyHelper
+    attr_accessor :smart_proxy
+    def initialize(smart_proxy)
+      @smart_proxy = smart_proxy
+    end
+
+    def ==(other)
+      other.class == self.class && other.smart_proxy == smart_proxy
+    end
+
+    def default_capsule?
+      @smart_proxy.pulp_master?
+    end
+
+    def repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
+      ret = []
+      if repository
+        environment = repository.environment
+        ret = [repository]
+      else
+        yum_repos = fetch_repos_available_to_capsule(environment, content_view) || []
+        puppet_envs = fetch_puppet_environments_available_to_capsule(environment, content_view) || []
+        ret = yum_repos + puppet_envs
+      end
+
+      if environment && !self.smart_proxy.lifecycle_environments.include?(environment)
+        fail _("Lifecycle environment '%{environment}' is not attached to this capsule.") % { :environment => environment.name }
+      end
+
+      ret
+    end
+
+    private
+
+    def fetch_repos_available_to_capsule(environments = nil, content_view = nil)
+      environments = @smart_proxy.lifecycle_environments if environments.nil?
+      yum_repos = Katello::Repository.in_environment(environments)
+      yum_repos = yum_repos.in_content_views([content_view]) if content_view
+      yum_repos.select(&:node_syncable?)
+    end
+
+    def fetch_puppet_environments_available_to_capsule(environments = nil, content_view = nil)
+      environments = @smart_proxy.lifecycle_environments if environments.nil?
+      puppet_environments = Katello::ContentViewPuppetEnvironment.in_environment(environments)
+      puppet_environments = puppet_environments.in_content_view(content_view) if content_view
+      puppet_environments
+    end
+  end
+end

data/app/views/foreman/smart_proxies/_content_tab.html.erb

@@ -28,7 +28,7 @@
     </tr>
     <tr ng-repeat-end ng-repeat="cv in env.content_views" ng-show="isEnvronmentExpanded(env)">
       <td>
-        <a href="/content_views/{{cv.id}}/versions" target="_self">
+        <a href="{{ productsOrVersionUrl(cv.default, cv.id) }}" target="_self">
           {{ cv.name }}
         </a>
       </td>

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

@@ -5,3 +5,8 @@ attributes :name
 attributes :namespace
 attributes :version
 attributes :checksum
+attributes :description
+
+node :tags do |collection|
+  collection.tags.map(&:name)
+end

data/app/views/katello/api/v2/ansible_collections/show.json.rabl

@@ -1,3 +1,10 @@
 object @resource
 
 extends "katello/api/v2/ansible_collections/base"
+
+child :library_repositories => :repositories do
+  attributes :id, :name
+  glue :product do
+    attributes :id => :product_id, :name => :product_name
+  end
+end

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -35,6 +35,7 @@ child @lifecycle_environments => :lifecycle_environments do
         :name => content_view.name,
         :composite => content_view.composite,
         :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
+        :default => content_view.default,
         :counts => {
           :content_hosts => content_view.hosts.authorized("view_hosts").count,
           :products => content_view.products.enabled.count

data/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl

@@ -14,5 +14,5 @@ attributes :end_date, :if => lambda { |rule| rule.respond_to?(:end_date) && !rul
 attributes :architecture, :if => lambda { |rule| rule.respond_to?(:architecture) && !rule.architecture.blank? }
 attributes :types, :if => lambda { |rule| rule.respond_to?(:types) && !rule.types.blank? }
 attributes :date_type, :if => lambda { |rule| rule.respond_to?(:date_type) }
-
+attributes :module_stream_id, :if => lambda { |rule| rule.respond_to?(:module_stream_id) && !rule.module_stream_id.blank? }
 extends 'katello/api/v2/common/timestamps'

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

@@ -33,6 +33,11 @@ node :rules do |filter|
       partial('katello/api/v2/content_view_filter_rules/show', :object => rule)
     end
 
+  elsif filter.respond_to?(:module_stream_rules)
+    filter.module_stream_rules.map do |rule|
+      partial('katello/api/v2/content_view_filter_rules/show', :object => rule)
+    end
+
   elsif filter.respond_to?(:docker_rules)
     filter.docker_rules.map do |rule|
       partial('katello/api/v2/content_view_filter_rules/show', :object => rule)

data/app/views/katello/api/v2/content_view_filters/show.json.rabl

@@ -21,7 +21,8 @@ child :content_view => :content_view do
         :package => repo.rpms.count,
         :package_group => repo.package_groups.count,
         :erratum => repo.errata.count,
-        :puppet_module => repo.puppet_modules.count
+        :puppet_module => repo.puppet_modules.count,
+        :module_stream => repo.module_streams.count
       }
     end
   end

data/app/views/katello/api/v2/hosts_bulk_actions/erratum.json.rabl

@@ -5,3 +5,5 @@ node :applicable_hosts do |erratum|
   select(["#{::Host.table_name}.id", "#{::Host.table_name}.name"]).
   collect { |host| {:name => host.name, :id => host.id} }
 end
+
+node(:affected_hosts_count) { |erratum| erratum.hosts_available(params[:organization_id]).where("#{::Host.table_name}.id" => @hosts).count }

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -13,7 +13,7 @@ glue(@resource.root) do
   attributes :container_repository_name
   attributes :download_policy
   attributes :url
-  attributes :ansible_collection_whitelist
+  attributes :ansible_collection_requirements
   attributes :gpg_key_id
   attributes :ssl_ca_cert_id
   attributes :ssl_client_cert_id

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

@@ -1,4 +1,4 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor
 
 child :user => :user do
   attributes :id, :login

data/app/views/katello/api/v2/subscriptions/index.json.rabl

@@ -2,6 +2,7 @@ object false
 
 extends 'katello/api/v2/common/org_reference'
 extends "katello/api/v2/common/metadata"
+extends 'katello/api/v2/subscriptions/permissions'
 
 child @collection[:results] => :results do
   attributes :quantity_attached

data/app/views/katello/api/v2/subscriptions/permissions.rabl

@@ -0,0 +1,11 @@
+collection @subscriptions
+
+if params.key?(:include_permissions)
+  user = User.current # current_user is not available here
+  node do
+    node(:can_manage_subscription_allocations) { user.can?("manage_subscription_allocations") }
+    node(:can_import_manifest) { user.can?("import_manifest") }
+    node(:can_delete_manifest) { user.can?("delete_manifest") }
+    node(:can_edit_organizations) { user.can?("edit_organizations") }
+  end
+end

data/config/katello.yaml.example

@@ -76,6 +76,15 @@
     :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt
     :allow_push: false  # default false if omitted
 
+# Pulp 2 can be preferred over Pulp 3 for the desired content type.
+# Default is false.
+#  :use_pulp_2_for_content_type:
+#    :ansible_collection:       <true/false>
+#    :deb:                      <true/false>
+#    :docker:                   <true/false>
+#    :file:                     <true/false>
+#    :yum:                      <true/false>
+
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes.rb

@@ -24,7 +24,8 @@ Katello::Engine.routes.draw do
   match '/module_streams' => 'react#index', :via => [:get]
   match '/module_streams/*page' => 'react#index', :via => [:get]
 
-  match '/module_streams' => 'react#index', :via => [:get]
+  match '/ansible_collections' => 'react#index', :via => [:get]
+  match '/ansible_collections/*page' => 'react#index', :via => [:get]
 
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]