katello 3.9.1 → 3.10.0.rc1

data/app/services/katello/pulp/repository/deb.rb

@@ -0,0 +1,47 @@
+module Katello
+  module Pulp
+    class Repository
+      class Deb < ::Katello::Pulp::Repository
+        def generate_master_importer
+          config = {
+            feed: root.url,
+            remove_missing: root.mirror_on_sync?,
+            releases: root.deb_releases,
+            components: root.deb_components,
+            architectures: root.deb_architectures,
+            gpg_keys: root&.gpg_key&.content,
+            require_signature: root.gpg_key.present?
+          }
+          importer_class.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          config = {
+            feed: external_url,
+            remove_missing: true,
+            releases: root.deb_releases,
+            components: root.deb_components,
+            architectures: root.deb_architectures,
+            gpg_keys: root&.gpg_key&.content,
+            require_signature: root.gpg_key.present?
+          }
+          importer_class.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def generate_distributors
+          [Runcible::Models::DebDistributor.new(repo.relative_path, root.unprotected, true,
+                                                id: repo.pulp_id,
+                                                auto_publish: true)]
+        end
+
+        def partial_repo_path
+          "/pulp/deb/#{repo.relative_path}/"
+        end
+
+        def importer_class
+          Runcible::Models::DebImporter
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Katello
+  module Pulp
+    class Repository
+      class Docker < ::Katello::Pulp::Repository
+        def generate_master_importer
+          config = {
+            feed: root.url,
+            upstream_name: root.docker_upstream_name,
+            tags: root.docker_tags_whitelist,
+            enable_v1: false
+          }
+          importer_class.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          pulp_uri = URI.parse(SmartProxy.pulp_master.pulp_url)
+          config = {
+            feed: "https://#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}",
+            upstream_name: repo.container_repository_name,
+            enable_v1: false
+          }
+          importer_class.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def generate_distributors
+          [Runcible::Models::DockerDistributor.new(:protected => !root.unprotected,
+                                                  :id => repo.pulp_id,
+                                                  :auto_publish => true,
+                                                  :repo_registry_id => repo.container_repository_name)]
+        end
+
+        def external_url(_force_https = false)
+          pulp_uri = URI.parse(SmartProxy.pulp_master.pulp_url)
+          "#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}/#{repo.container_repository_name}"
+        end
+
+        def importer_class
+          Runcible::Models::DockerImporter
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Katello
+  module Pulp
+    class Repository
+      class File < ::Katello::Pulp::Repository
+        def generate_master_importer
+          config = { feed: root.url }
+          importer_class.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          config = {
+            feed: external_url
+          }
+          importer_class.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def generate_distributors
+          [Runcible::Models::IsoDistributor.new(repo.relative_path, repo.unprotected, true, auto_publish: true)]
+        end
+
+        def partial_repo_path
+          "/pulp/isos/#{repo.relative_path}/"
+        end
+
+        def importer_class
+          Runcible::Models::IsoImporter
+        end
+      end
+    end
+  end
+end

data/app/services/katello/pulp/repository/ostree.rb

@@ -0,0 +1,40 @@
+module Katello
+  module Pulp
+    class Repository
+      class Ostree < ::Katello::Pulp::Repository
+        PULP_MIRROR_SYNC_DEPTH = -1
+
+        def generate_master_importer
+          config = {
+            feed: root.url,
+            depth: root.compute_ostree_upstream_sync_depth
+          }
+          Runcible::Models::OstreeImporter.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          config = {
+            feed: root.url,
+            depth: PULP_MIRROR_SYNC_DEPTH
+          }
+          Runcible::Models::OstreeImporter.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def generate_distributors
+          [Runcible::Models::OstreeDistributor.new(:id => repo.pulp_id,
+                                                  :auto_publish => true,
+                                                  :relative_path => repo.relative_path,
+                                                  :depth => root.compute_ostree_upstream_sync_depth)]
+        end
+
+        def partial_repo_path
+          "/pulp/puppet/#{pulp_id}/"
+        end
+
+        def importer_class
+          Runcible::Models::OstreeImporter
+        end
+      end
+    end
+  end
+end

data/app/services/katello/pulp/repository/puppet.rb

@@ -0,0 +1,43 @@
+module Katello
+  module Pulp
+    class Repository
+      class Puppet < ::Katello::Pulp::Repository
+        def generate_master_importer
+          config = {
+            feed: root.url,
+            remove_missing: root.mirror_on_sync?
+          }
+          importer_class.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          config = {
+            :feed => self.external_url,
+            :remove_missing => true
+          }
+          importer_class.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def generate_distributors
+          puppet_install_dist = Runcible::Models::PuppetInstallDistributor.new(puppet_install_distributor_path, :id => repo.pulp_id, :auto_publish => true)
+          puppet_dist = Runcible::Models::PuppetDistributor.new(nil, (root.unprotected || false), true,
+                                                                :id => "#{repo.pulp_id}_puppet", :auto_publish => true)
+          [puppet_dist, puppet_install_dist]
+        end
+
+        def puppet_install_distributor_path
+          puppet_env = ::Environment.construct_name(repo.organization, repo.environment, repo.content_view)
+          ::File.join(smart_proxy.puppet_path, puppet_env, 'modules')
+        end
+
+        def partial_repo_path
+          "/pulp/puppet/#{repo.pulp_id}/"
+        end
+
+        def importer_class
+          Runcible::Models::PuppetImporter
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module Katello
+  module Pulp
+    class Repository
+      class Yum < ::Katello::Pulp::Repository
+        def generate_master_importer
+          config = {
+            download_policy: root.download_policy,
+            remove_missing: root.mirror_on_sync?,
+            feed: root.url,
+            type_skip_list: root.ignorable_content
+          }
+          importer_class.new(config.merge(master_importer_connection_options))
+        end
+
+        def generate_mirror_importer
+          config = {
+            download_policy: smart_proxy_download_policy,
+            remove_missing: true,
+            feed: external_url(true)
+          }
+          importer_class.new(config.merge(mirror_importer_connection_options))
+        end
+
+        def partial_repo_path
+          "/pulp/repos/#{repo.relative_path}/".sub('//', '/')
+        end
+
+        def importer_class
+          Runcible::Models::YumImporter
+        end
+
+        def generate_distributors
+          yum_dist_id = repo.pulp_id
+          options = {
+            protected: true,
+            id: yum_dist_id,
+            auto_publish: true,
+            checksum_type: repo.saved_checksum_type || root.checksum_type
+          }
+          distributors = [Runcible::Models::YumDistributor.new(repo.relative_path, root.unprotected, true, options)]
+
+          if smart_proxy.pulp_master?
+            distributors << Runcible::Models::YumCloneDistributor.new(:id => "#{repo.pulp_id}_clone",
+                                                                   :destination_distributor_id => yum_dist_id)
+            distributors << Runcible::Models::ExportDistributor.new(false, false, repo.relative_path)
+          end
+          distributors
+        end
+
+        def smart_proxy_download_policy
+          policy = smart_proxy.download_policy || Setting[:default_proxy_download_policy]
+          if policy == ::SmartProxy::DOWNLOAD_INHERIT
+            self.root.download_policy
+          else
+            policy
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/katello/repository_type.rb

@@ -12,7 +12,7 @@ module Katello
       end
     end
 
-    def_field :allow_creation_by_user
+    def_field :allow_creation_by_user, :service_class
     attr_reader :id
 
     def initialize(id)

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

@@ -6,6 +6,7 @@ attributes :kickstart_repository_id, :kickstart_repository_name
 attributes :errata_counts
 attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
+attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
 child :content_view => :content_view do
   attributes :id, :name

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

@@ -1,4 +1,3 @@
-
 object @resource
 
 extends 'katello/api/v2/common/identifier'

data/app/views/katello/api/v2/errata/_counts.json.rabl

@@ -1,4 +1,3 @@
-
 totals = @object.relation.group(:errata_type).count.with_indifferent_access
 
 node :security do |_presenter|

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

@@ -16,9 +16,15 @@ end
 attributes :title => :name
 attributes :errata_type => :type
 
-node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }
-node(:hosts_applicable_count) { |m| m.hosts_applicable(params[:organization_id]).count }
+unless @disable_counts
+  node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }
+  node(:hosts_applicable_count) { |m| m.hosts_applicable(params[:organization_id]).count }
+end
 
 node :packages do |e|
-  e.packages.pluck(:nvrea)
+  e.packages.non_module_stream_packages.pluck(:nvrea)
+end
+
+node :module_streams do |e|
+  e.module_streams
 end

data/app/views/katello/api/v2/host_collections/delta_activation_keys.rabl

@@ -1,4 +1,3 @@
-
 collection @collection
 
 attributes :id

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

@@ -0,0 +1,8 @@
+object @resource
+
+attributes :status, :installed_profiles
+attributes :upgradable? => :upgradable
+
+glue(@object.available_module_stream) do
+  attributes :name, :stream, :module_spec
+end

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

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/host_module_streams/base'
+end

data/app/views/katello/api/v2/packages/backend.json.rabl

@@ -1,4 +1,3 @@
-
 attributes :description
 attributes :license, :buildhost, :vendor, :relativepath
 attributes :children, :checksumtype, :size, :url, :build_time, :summary, :group, :requires, :provides, :files

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

@@ -27,16 +27,16 @@ glue(@resource.root) do
   attributes :ignorable_content
   attributes :description
 
-  child :ssl_ca_cert do
-    attributes :id, :name
+  node :ssl_ca_cert do
+    attributes :id => @resource.root&.ssl_ca_cert&.id, :name => @resource.root&.ssl_ca_cert&.name
   end
 
-  child :ssl_client_cert do
-    attributes :id, :name
+  node :ssl_client_cert do
+    attributes :id => @resource.root&.ssl_client_cert&.id, :name => @resource.root&.ssl_client_cert&.name
   end
 
-  child :ssl_client_key do
-    attributes :id, :name
+  node :ssl_client_key do
+    attributes :id => @resource.root&.ssl_client_key&.id, :name => @resource.root&.ssl_client_key&.name
   end
 
   child :gpg_key do

data/app/views/katello/layouts/react.html.erb

@@ -1,9 +1,9 @@
 <% content_for(:stylesheets) do %>
-    <%= stylesheet_link_tag *webpack_asset_paths('katello', :extension => 'css'), "data-turbolinks-track" => true %>
+    <%= webpacked_plugins_css_for :katello %>
 <% end %>
 
 <% content_for(:javascripts) do %>
-    <%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js') %>
+    <%= webpacked_plugins_js_for :katello %>
 <% end %>
 
 <% content_for(:content) do %>

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -1,4 +1,3 @@
-<%= javascript "katello/hosts/host_and_hostgroup_edit" %>
 <%
 kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
 host = using_hostgroups_page? ? @hostgroup : @host

data/config/routes/api/rhsm.rb

@@ -42,6 +42,7 @@ Katello::Engine.routes.draw do
       match '/deleted_consumers' => 'candlepin_proxies#get', :via => :get, :as => :proxy_deleted_consumers_path
       match '/entitlements/:id' => 'candlepin_proxies#get', :via => :get, :as => :proxy_entitlements_path
       match '/subscriptions' => 'candlepin_proxies#post', :via => :post, :as => :proxy_subscriptions_post_path
+      match '/consumers/:id/profiles/' => 'candlepin_dynflow_proxy#upload_profiles', :via => :put
       match '/consumers/:id/profile/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
       match '/consumers/:id/packages/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
       match '/consumers/:id/tracer/' => 'candlepin_proxies#upload_tracer_profile', :via => :put

data/config/routes/overrides.rb

@@ -92,6 +92,10 @@ Foreman::Application.routes.draw do
             end
           end
 
+          resources :module_streams, :only => [:index], :controller => :host_module_streams do
+            get :auto_complete_search, :on => :collection
+          end
+
           resources :subscriptions, :only => [:index], :controller => :host_subscriptions do
             collection do
               put :auto_attach

data/db/migrate/20181008201422_add_modules_to_errata_packages.rb

@@ -0,0 +1,29 @@
+class AddModulesToErrataPackages < ActiveRecord::Migration[5.2]
+  def up
+    create_table :katello_module_stream_erratum_packages do |t|
+      t.references :module_stream, null: false, index: { name: :katello_msep_stream_idx }
+      t.references :erratum_package, null: false, index: { name: :katello_msep_erratum_package_idx }
+      t.timestamps
+    end
+    add_index :katello_module_stream_erratum_packages, [:module_stream_id, :erratum_package_id],
+              unique: true, name: :katello_module_stream_erratum_package_uniq
+
+    add_foreign_key :katello_module_stream_erratum_packages,
+                    :katello_module_streams,
+                    column: :module_stream_id,
+                    name: :katello_msep_mod_stream_id_fk
+
+    add_foreign_key :katello_module_stream_erratum_packages,
+                    :katello_erratum_packages,
+                    column: :erratum_package_id,
+                    name: :katello_msep_erratum_package_id_fk
+    change_column :katello_module_stream_erratum_packages, :created_at, :datetime, :null => true
+    change_column :katello_module_stream_erratum_packages, :updated_at, :datetime, :null => true
+  end
+
+  def down
+    remove_foreign_key :katello_module_stream_erratum_packages, name: :katello_msep_mod_stream_id_fk
+    remove_foreign_key :katello_module_stream_erratum_packages, name: :katello_msep_erratum_package_id_fk
+    drop_table :katello_module_stream_erratum_packages
+  end
+end