katello 3.8.1 → 3.9.0.rc1

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -42,4 +42,8 @@
 .modal-body .uib-time input {
   width: 100%;
   padding-right: 6px;
-}
+}
+
+.drop-down-check-box {
+  margin-left: 10px
+};

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -10,7 +10,7 @@ module BastionKatello
       consumer_cert_rpm = 'katello-ca-consumer-latest.noarch.rpm'
       consumer_cert_rpm = SETTINGS[:katello][:consumer_cert_rpm] if SETTINGS.key?(:katello)
 
-      db_migrated = ActiveRecord::Base.connection.table_exists?(Setting.table_name)
+      db_migrated = !Foreman.in_setup_db_rake? && ActiveRecord::Base.connection.table_exists?(Setting.table_name)
 
       Bastion.register_plugin(
         :name => 'bastion_katello',
@@ -40,7 +40,7 @@ module BastionKatello
           'consumerCertRPM' => consumer_cert_rpm,
           'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
           'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-          'remoteExecutionByDefault' => ::Katello.with_remote_execution? && !Foreman.in_rake?('db:migrate') &&
+          'remoteExecutionByDefault' => ::Katello.with_remote_execution? &&
                                         db_migrated && Setting['remote_execution_by_default']
         }
       )

data/lib/katello/engine.rb

@@ -22,7 +22,6 @@ module Katello
         :rest_client_timeout => 30,
         :gpg_strict_validation => false,
         :redhat_repository_url => 'https://cdn.redhat.com',
-        :post_sync_url => 'http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello',
         :consumer_cert_rpm => 'katello-ca-consumer-latest.noarch.rpm',
         :consumer_cert_sh => 'katello-rhsm-consumer',
         :pulp => {
@@ -32,7 +31,8 @@ module Katello
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil
+          :sync_KBlimit => nil,
+          :notifier_ca_path => "/etc/pki/tls/certs/ca-bundle.crt"
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',
@@ -132,13 +132,9 @@ module Katello
         fail Foreman::Exception, N_("Organizations disabled, try allowing them in foreman/config/settings.yaml")
       end
 
-      # Rendering concerns needs to be injected to controllers, Foreman::Renderer was already included
-      # otherwise subscription_manager_configuration_url is not available in template preview
-      (TemplatesController.descendants + [TemplatesController]).each do |klass|
-        klass.send(:include, Katello::KatelloUrlsHelper)
-      end
       # Lib Extensions
-      ::Foreman::Renderer.send :include, Katello::Concerns::RendererExtensions
+      ::Foreman::Renderer::Scope::Variables::Base.send :include, Katello::Concerns::RendererExtensions
+      ::Foreman::Renderer::Scope::Base.send :include, Katello::Concerns::BaseTemplateScopeExtensions
 
       # Model extensions
       ::Environment.send :include, Katello::Concerns::EnvironmentExtensions
@@ -153,6 +149,7 @@ module Katello
       ::Container.send :include, Katello::Concerns::ContainerExtensions
       ::DockerContainerWizardState.send :include, Katello::Concerns::DockerContainerWizardStateExtensions
       ::DockerContainerWizardStates::Image.send :include, Katello::Concerns::DockerContainerWizardStateImageExtensions
+      ForemanTasks::RecurringLogic.send :include, Katello::Concerns::RecurringLogicExtensions
 
       #Controller extensions
       ::HostsController.send :include, Katello::Concerns::HostsControllerExtensions
@@ -200,10 +197,6 @@ module Katello
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
       ::PuppetClassImporter.send :include, Katello::Services::PuppetClassImporterExtensions
 
-      #facet extensions
-      ::Host::Managed.send :include, ::Katello::Concerns::ContentFacetHostExtensions
-      ::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
-
       #Api controller extensions
       ::Api::V2::HostsController.send :include, Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostgroupsController.send :include, Katello::Concerns::Api::V2::HostgroupsControllerExtensions
@@ -224,6 +217,8 @@ module Katello
         helper Katello::Concerns::HostsAndHostgroupsHelperExtensions
       end
 
+      ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
+
       load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
     end

data/lib/katello/permission_creator.rb

@@ -77,6 +77,7 @@ module Katello
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
                    'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
+                   'katello/api/v2/module_streams' => [: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],
@@ -91,6 +92,7 @@ module Katello
                                                 :packages_items,
                                                 :errata_items,
                                                 :puppet_modules_items,
+                                                :module_streams,
                                                 :view_packages,
                                                 :view_puppet_modules,
                                                 :repo_packages,
@@ -249,7 +251,7 @@ module Katello
                            'katello/api/v2/products' => [:index, :show, :auto_complete_search],
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :auto_complete_search, :cancel],
                            'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
-                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifest_lists' => [:index, :show, :auto_complete_search, :compare],
@@ -258,6 +260,7 @@ module Katello
                            'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
                            'katello/errata' => [:short_details, :auto_complete],
                            'katello/packages' => [:details, :auto_complete],
                            'katello/puppet_modules' => [:show],
@@ -272,6 +275,7 @@ module Katello
                                                         :packages_items,
                                                         :errata_items,
                                                         :puppet_modules_items,
+                                                        :module_streams,
                                                         :repo_packages,
                                                         :repo_errata,
                                                         :repo_puppet_modules,

data/lib/katello/permissions/host_permissions.rb

@@ -45,6 +45,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/applicable_errata',
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',
+  'katello/api/v2/hosts_bulk_actions/module_streams',
   'katello/api/v2/host_packages/index',
   'katello/api/v2/host_tracer/index',
   'katello/remote_execution/new',

data/lib/katello/plugin.rb

@@ -11,7 +11,7 @@ Foreman::Plugin.register :katello do
          :red_hat_subscriptions,
          :caption => N_('Subscriptions'),
          :url => '/subscriptions',
-         :url_hash => {:controller => 'katello/react',
+         :url_hash => {:controller => 'katello/api/v2/subscriptions',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
@@ -113,17 +113,6 @@ Foreman::Plugin.register :katello do
            :turbolinks => false
     end
 
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::YUM_TYPE)
-      menu :top_menu,
-           :errata,
-           :caption => N_('Errata'),
-           :url => '/errata',
-           :url_hash => {:controller => 'katello/api/v2/errata',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
-
     if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::FILE_TYPE)
       menu :top_menu,
            :files,
@@ -155,6 +144,24 @@ Foreman::Plugin.register :katello do
                          :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
 
     if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::PUPPET_TYPE)
@@ -192,6 +199,8 @@ Foreman::Plugin.register :katello do
        :turbolinks => false
 
   allowed_template_helpers :subscription_manager_configuration_url, :repository_url
+  extend_template_helpers Katello::KatelloUrlsHelper
+
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
   end
@@ -201,8 +210,8 @@ Foreman::Plugin.register :katello do
   parameter_filter ::Host::Managed, :host_collection_ids => [],
     :content_facet_attributes => [:content_view_id, :lifecycle_environment_id, :content_source_id,
                                   :host, :kickstart_repository_id],
-    :subscription_facet_attributes => [:release_version, :autoheal, :service_level, :host,
-                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, :hypervisor_guest_uuids => []]
+    :subscription_facet_attributes => [:release_version, :autoheal, :purpose_usage, :purpose_role, :service_level, :host,
+                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, :hypervisor_guest_uuids => [], :purpose_addons => []]
   parameter_filter Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
   parameter_filter Organization, :label, :service_level
@@ -236,8 +245,16 @@ Foreman::Plugin.register :katello do
 
   register_custom_status(Katello::ErrataStatus)
   register_custom_status(Katello::SubscriptionStatus)
+  register_custom_status(Katello::PurposeSlaStatus)
+  register_custom_status(Katello::PurposeRoleStatus)
+  register_custom_status(Katello::PurposeUsageStatus)
+  register_custom_status(Katello::PurposeAddonsStatus)
+  register_custom_status(Katello::PurposeStatus)
   register_custom_status(Katello::TraceStatus)
 
+  extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/download_policy'
+  extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
+
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
                    :name => _('Storage'),
@@ -249,11 +266,13 @@ Foreman::Plugin.register :katello do
     api_view :list => 'katello/api/v2/content_facet/base_with_root', :single => 'katello/api/v2/content_facet/show'
     api_docs :content_facet_attributes, ::Katello::Api::V2::HostContentsController
     template_compatibility_properties :content_source_id, :content_source
+    extend_model ::Katello::Concerns::ContentFacetHostExtensions
   end
 
   register_facet Katello::Host::SubscriptionFacet, :subscription_facet do
     api_view :list => 'katello/api/v2/subscription_facet/base_with_root', :single => 'katello/api/v2/subscription_facet/show'
     api_docs :subscription_facet_attributes, ::Katello::Api::V2::HostSubscriptionsController
+    extend_model ::Katello::Concerns::SubscriptionFacetHostExtensions
   end
 
   if Katello.with_remote_execution?
@@ -265,6 +284,9 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
+    RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
+                                    :description => N_("Perform a module stream action via Katello interface"),
+                                    :provided_inputs => ['action', 'module_spec', 'options'])
     allowed_template_helpers :errata
   end
 
@@ -288,6 +310,8 @@ Foreman::Plugin.register :katello do
 
   register_info_provider Katello::Host::InfoProvider
 
+  medium_providers.register(Katello::ManagedContentMediumProvider)
+
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
 

data/lib/katello/tasks/clean_backend_objects.rake

@@ -81,9 +81,13 @@ namespace :katello do
       end
     end
 
+    def commit?
+      ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
+    end
+
     # rubocop:disable HandleExceptions
     def execute(error_msg)
-      if ENV['COMMIT'] == 'true'
+      if commit?
         yield
       end
     rescue RestClient::ResourceNotFound
@@ -92,11 +96,11 @@ namespace :katello do
       print e.inspect
     end
 
-    unless ENV['COMMIT'] == 'true'
+    unless commit?
       print "The following changes will not actually be performed.  Rerun with COMMIT=true to apply the changes\n"
     end
 
-    SETTINGS[:katello][:candlepin][:bulk_load_size] = 15_000
+    SETTINGS[:katello][:candlepin][:bulk_load_size] = 1_500
     User.current = User.anonymous_admin
     cleaner = BackendCleaner.new
     cleaner.populate!

data/lib/katello/tasks/reimport.rake

@@ -22,6 +22,7 @@ namespace :katello do
               Katello::PuppetModule,
               Katello::Rpm,
               Katello::Srpm,
+              Katello::ModuleStream,
               Katello::Deb,
               Katello::FileUnit,
               Katello::Subscription,

data/lib/katello/tasks/repository.rake

@@ -3,6 +3,10 @@ namespace :katello do
     ForemanTasks.dynflow.config.remote = true
   end
 
+  def commit?
+    ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
+  end
+
   desc "Check for repositories that have not been published since their last sync, and republish if they have."
   task :publish_unpublished_repositories => ["environment", "disable_dynflow", "check_ping"] do
     needing_publish = []
@@ -29,7 +33,7 @@ namespace :katello do
     repos = lookup_repositories
 
     if repos.any?
-      task = ForemanTasks.async_task(Actions::Katello::Repository::BulkMetadataGenerate, repos.all.order(:name))
+      task = ForemanTasks.async_task(Actions::Katello::Repository::BulkMetadataGenerate, repos.all.order_by_root(:name))
       puts "Regenerating #{repos.count} repositories.  You can monitor these on task id #{task.id}\n"
     else
       puts "No repositories found for regeneration."
@@ -42,7 +46,7 @@ namespace :katello do
     repos = lookup_repositories
 
     if repos.any?
-      task = ForemanTasks.async_task(::Actions::BulkAction, Actions::Katello::Repository::RefreshRepository, repos.all.order(:name))
+      task = ForemanTasks.async_task(::Actions::BulkAction, Actions::Katello::Repository::RefreshRepository, repos.all.order_by_root(:name))
       puts "Refreshing #{repos.count} repositories.  You can monitor these on task id #{task.id}\n"
     else
       puts "No repositories found for regeneration."
@@ -51,7 +55,7 @@ namespace :katello do
 
   desc "Correct missing pulp repositories. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories.  COMMIT=true to perform operation."
   task :correct_repositories => ["environment", "check_ping"] do
-    puts "All operations will be skipped.  Re-run with COMMIT=true to perform corrections." if ENV['COMMIT'] != 'true'
+    puts "All operations will be skipped.  Re-run with COMMIT=true to perform corrections." unless commit?
 
     User.current = User.anonymous_api_admin
     repos = lookup_repositories
@@ -66,7 +70,7 @@ namespace :katello do
 
   desc "Correct missing pulp repositories for puppet environments. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories.  COMMIT=true to perform operation."
   task :correct_puppet_environments => ["environment", "check_ping"] do
-    puts "All operations will be skipped.  Re-run with COMMIT=true to perform corrections." if ENV['COMMIT'] != 'true'
+    puts "All operations will be skipped.  Re-run with COMMIT=true to perform corrections." unless commit?
 
     User.current = User.anonymous_api_admin
     puppet_envs = lookup_puppet_environments
@@ -139,19 +143,18 @@ namespace :katello do
   end
 
   def handle_missing_repo(repo)
-    commit = ENV['COMMIT'] == 'true'
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo) 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, :planned_destroy => true) if commit
+      ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo, :planned_destroy => true) if commit?
     end
   end
 
   def handle_missing_puppet_env(puppet_env)
     puts "Content View Puppet Environment #{puppet_env.id} Missing, Creating."
-    ForemanTasks.sync_task(::Actions::Katello::ContentViewPuppetEnvironment::Create, puppet_env) if ENV['COMMIT'] == 'true'
+    ForemanTasks.sync_task(::Actions::Katello::ContentViewPuppetEnvironment::Create, puppet_env) if commit?
   end
 end

data/lib/katello/tasks/upgrades/3.9/migrate_sync_plans.rake

@@ -0,0 +1,29 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.9' do
+      desc "Migrate Pulp Sync Plans to new recurring logics"
+      task :migrate_sync_plans => ["environment"] do
+        User.current = User.anonymous_admin
+        puts "Starting recurring logic for migrated sync plans and deleting Pulp schedules"
+
+        Katello::SyncPlan.find_each do |sync_plan|
+          if sync_plan.foreman_tasks_recurring_logic.state.nil?
+            sync_plan.start_recurring_logic
+            sync_plan.foreman_tasks_recurring_logic.enabled = false unless sync_plan.enabled
+          end
+
+          sync_plan.products.each do |product|
+            product.repos(product.library).each do |repo_k|
+              repo = ::Katello::Repository.find(repo_k.id)
+              begin
+                Katello.pulp_server.extensions.repository.remove_schedules(repo.pulp_id, repo.importer_type)
+              rescue RestClient::ResourceNotFound
+                puts "Could not update repository #{repo.id}, missing in pulp."
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.8.1".freeze
+  VERSION = "3.9.0.rc1".freeze
 end

data/package.json

@@ -9,8 +9,8 @@
     "test:current": "jest webpack --watch",
     "format": "prettier --single-quote --trailing-comma es5 --write 'webpack/**/*.js'",
     "build": "npm run format && npm run lint",
-    "lint": "eslint webpack/ || exit 0",
-    "lint:fix": "eslint --fix webpack/ || exit 0",
+    "lint": "eslint webpack/",
+    "lint:fix": "eslint --fix webpack/",
     "lint:test": "npm run lint && npm test"
   },
   "repository": {
@@ -25,16 +25,18 @@
     "@storybook/storybook-deployer": "^2.0.0",
     "babel-core": "^6.26.3",
     "babel-jest": "^23.4.0",
+    "babel-eslint": "^8.2.6",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
-    "enzyme": "^3.2.0",
-    "enzyme-adapter-react-16": "^1.1.0",
+    "enzyme": "^3.4.0",
+    "enzyme-adapter-react-16": "^1.4.0",
     "enzyme-to-json": "^3.1.2",
-    "eslint": "^4.8.0",
+    "eslint": "^4.19.1",
     "eslint-config-airbnb": "^16.0.0",
+    "eslint-plugin-babel": "^5.1.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jest": "^21.18.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
@@ -57,11 +59,13 @@
     "patternfly": "^3.41.1",
     "patternfly-react": "^2.5.1",
     "prop-types": "^15.6.0",
-    "react": "^16.3.1",
+    "query-string": "^6.1.0",
+    "react": "^16.4.0",
     "react-bootstrap": "^0.32.1",
     "react-bootstrap-tooltip-button": "^1.0.6",
-    "react-dom": "^16.3.1",
+    "react-dom": "^16.4.0",
     "react-ellipsis-with-tooltip": "^1.0.7",
+    "react-helmet": "^5.2.0",
     "react-redux": "^5.0.6",
     "react-router": "^4.2.0",
     "react-router-bootstrap": "0.24.4",