katello 3.6.0.1.rc2 → 3.7.0.rc1

data/lib/katello/plugin.rb

@@ -1,13 +1,15 @@
 require 'katello/permission_creator'
+require 'katello/repository_types.rb'
 
+# rubocop:disable Metrics/BlockLength
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.16'
+  requires_foreman '>= 1.17'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
     menu :top_menu,
          :red_hat_subscriptions,
-         :caption => N_('Red Hat Subscriptions'),
+         :caption => N_('Subscriptions'),
          :url => '/subscriptions',
          :url_hash => {:controller => 'katello/api/v2/subscriptions',
                        :action => 'index'},
@@ -17,8 +19,9 @@ Foreman::Plugin.register :katello do
     menu :top_menu,
          :redhat_provider,
          :caption => N_('Red Hat Repositories'),
-         :url_hash => {:controller => 'katello/providers',
-                       :action => 'redhat_provider'},
+         :url => '/redhat_repositories',
+         :url_hash => {:controller => 'katello/api/v2/repository_sets',
+                       :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
 
@@ -32,10 +35,10 @@ Foreman::Plugin.register :katello do
          :turbolinks => false
 
     menu :top_menu,
-         :gpg_keys,
-         :caption => N_('GPG Keys'),
-         :url => '/gpg_keys',
-         :url_hash => {:controller => 'katello/api/v2/gpg_keys',
+         :content_credentials,
+         :caption => N_('Content Credentials'),
+         :url => '/content_credentials',
+         :url_hash => {:controller => 'katello/api/v2/content_credentials',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
@@ -88,68 +91,82 @@ Foreman::Plugin.register :katello do
 
     divider :top_menu, :caption => N_('Content Types'), :parent => :content_menu
 
-    menu :top_menu,
-         :debs,
-         :caption => N_('Deb Packages'),
-         :url => '/debs',
-         :url_hash => {:controller => 'katello/api/v2/debs',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
-
-    menu :top_menu,
-         :docker_tags,
-         :caption => N_('Docker Tags'),
-         :url => '/docker_tags',
-         :url_hash => {:controller => 'katello/api/v2/docker_tags',
-                       :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,
-         :files,
-         :caption => N_('Files'),
-         :url => '/files',
-         :url_hash => {:controller => 'katello/api/v2/file_units',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
-
-    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
-
-    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,
-         :puppet_modules,
-         :caption => N_('Puppet Modules'),
-         :url => '/puppet_modules',
-         :url_hash => {:controller => 'katello/api/v2/puppet_modules',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
+    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
+
+    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
+
+    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,
+           :caption => N_('Files'),
+           :url => '/files',
+           :url_hash => {:controller => 'katello/api/v2/file_units',
+                         :action => 'index'},
+           :engine => Katello::Engine,
+           :turbolinks => false
+    end
+
+    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
+
+    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
+    end
+
+    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::PUPPET_TYPE)
+      menu :top_menu,
+           :puppet_modules,
+           :caption => N_('Puppet Modules'),
+           :url => '/puppet_modules',
+           :url_hash => {:controller => 'katello/api/v2/puppet_modules',
+                         :action => 'index'},
+           :engine => Katello::Engine,
+           :turbolinks => false
+    end
   end
 
   menu :top_menu,
@@ -176,14 +193,14 @@ Foreman::Plugin.register :katello do
 
   menu :labs_menu,
        :experimental_ui,
-       :url => '/xui',
+       :url => '/xui/subscriptions',
        :url_hash => {:controller => 'katello/react',
                      :action => 'index'},
-       :caption => N_('Content Experimental UI'),
+       :caption => N_('Red Hat Subscriptions'),
        :parent => :lab_features_menu,
        :turbolinks => false
 
-  allowed_template_helpers :subscription_manager_configuration_url
+  allowed_template_helpers :subscription_manager_configuration_url, :repository_url
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
   end
@@ -291,4 +308,38 @@ Foreman::Plugin.register :katello do
     :view_locations, :view_domains, :view_architectures,
     :view_operatingsystems
   ]
+
+  def find_katello_assets(args = {})
+    type = args.fetch(:type, nil)
+    vendor = args.fetch(:vendor, false)
+
+    if vendor
+      asset_dir = "#{Katello::Engine.root}/vendor/assets/#{type}/"
+    else
+      asset_dir = "#{Katello::Engine.root}/app/assets/#{type}/"
+    end
+
+    asset_paths = Dir[File.join(asset_dir, '**', '*')].reject { |file| File.directory?(file) }
+    asset_paths.each { |file| file.slice!(asset_dir) }
+
+    asset_paths
+  end
+
+  javascripts = find_katello_assets(:type => 'javascripts')
+  images = find_katello_assets(:type => 'images')
+  vendor_images = find_katello_assets(:type => 'images', :vendor => true)
+
+  precompile = [
+    'katello/katello.css',
+    'katello/containers/container.css',
+    'bastion_katello/bastion_katello.css',
+    'bastion_katello/bastion_katello.js',
+    /bastion_katello\S+.(?:svg|eot|woff|ttf)$/
+  ]
+
+  precompile.concat(javascripts)
+  precompile.concat(images)
+  precompile.concat(vendor_images)
+
+  precompile_assets(precompile)
 end

data/lib/katello/scheduled_jobs.rb

@@ -1,12 +1,18 @@
-# First, we check if there's a job already enqueued for Pulp notifications
+# First, we check if there's a job already enqueued for any notifications
 ::Foreman::Application.dynflow.config.on_init do |world|
   pending_jobs = world.persistence.find_execution_plans(filters: { :state => 'scheduled' })
-  scheduled_job = pending_jobs.select do |job|
+  scheduled_pulp_job = pending_jobs.select do |job|
     delayed_plan = world.persistence.load_delayed_plan job.id
     next if delayed_plan.blank?
-    delayed_plan.to_hash[:serialized_args].first["job_class"] == 'CreatePulpDiskSpaceNotifications'
+    delayed_plan.to_hash[:serialized_args].first.try(:[], 'job_class') == 'CreatePulpDiskSpaceNotifications'
+  end
+  scheduled_subs_expiration_job = pending_jobs.select do |job|
+    delayed_plan = world.persistence.load_delayed_plan job.id
+    next if delayed_plan.blank?
+    delayed_plan.to_hash[:serialized_args].first.try(:[], 'job_class') == 'SendExpireSoonNotifications'
   end
 
   # Only create notifications if there isn't a scheduled job
-  CreatePulpDiskSpaceNotifications.perform_later if scheduled_job.blank?
+  CreatePulpDiskSpaceNotifications.perform_later if scheduled_pulp_job.blank?
+  SendExpireSoonNotifications.perform_later if scheduled_subs_expiration_job.blank?
 end

data/lib/katello/tasks/job_templates.rake

@@ -0,0 +1,16 @@
+namespace :katello do
+  desc "Synchronize Ansible job templates with lates community templates"
+  task :sync_ansible_job_templates => :environment do
+    template_repository = "https://github.com/theforeman/community-templates"
+    Dir.mktmpdir  do |dir|
+      system("git clone -q -b develop #{template_repository} #{dir}/ct")
+      Dir.chdir "#{Katello::Engine.root}/app/views/foreman"
+      system("rsync -am \
+        --include='*katello_ansible_default*' \
+        --exclude='*' \
+        #{dir}/ct/job_templates/* ./job_templates")
+      Dir.chdir Katello::Engine.root
+      system("git status -- app/views/foreman_ansible/job_templates")
+    end
+  end
+end

data/lib/katello/tasks/reset.rake

@@ -29,9 +29,6 @@ namespace :katello do
   task :reset_default_smart_proxy do
     User.current = User.anonymous_admin
     hostname = Socket.gethostname.chomp
-    Setting['ssl_ca_file'] = "/etc/pki/katello/certs/katello-default-ca.crt"
-    Setting['ssl_certificate'] = "/etc/pki/katello/certs/#{hostname}-foreman-client.crt"
-    Setting['ssl_priv_key'] = "/etc/pki/katello/private/#{hostname}-foreman-client.key"
     SmartProxy.where(name: hostname, url: "https://#{hostname}:9090").first_or_create!
   end
 

data/lib/katello/tasks/upgrades/3.6/import_backend_consumer_attributes.rake

@@ -0,0 +1,32 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.6' do
+      desc "Import product content from Candlepin to improve API performance and enhance searching"
+      task :import_backend_consumer_attributes => %w(environment check_ping) do
+        def log_message(org, count, total)
+          if count % 25 == 1 || count == total
+            puts "Importing consumer: #{org.name}: #{count}/#{total}"
+          end
+        end
+
+        User.current = User.anonymous_admin
+        Organization.all.each do |org|
+          consumers = ::Katello::Resources::Candlepin::Consumer.get(:owner => org.label,
+                                                                     :include_only => %w(uuid installedProducts.productId
+                                                                                         installedProducts.productName installedProducts.version
+                                                                                         installedProducts.arch))
+          consumer_count = 1
+          consumers.each do |consumer|
+            log_message(org, consumer_count, consumers.count)
+            facet = Katello::Host::SubscriptionFacet.find_by(:uuid => consumer['uuid'])
+            if facet
+              facet.update_installed_products(consumer['installedProducts'])
+              facet.update_compliance_reasons(Katello::Resources::Candlepin::Consumer.compliance(facet.uuid)['reasons'])
+            end
+            consumer_count += 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.7/make_all_ks_repos_bootable.rake

@@ -0,0 +1,11 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.7' do
+      task :make_all_ks_repos_bootable => ["environment"] do
+        User.current = User.anonymous_api_admin
+        puts _("Ensuring all Kickstart Repos are bootable")
+        Katello::Repository.import_distributions
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.6.0.1.rc2".freeze
+  VERSION = "3.7.0.rc1".freeze
 end

data/locale/action_names.rb

@@ -1,58 +1,62 @@
 # Autogenerated!
-_("Upload into")
-_("Destroy")
-_("Delete Lifecycle Environment")
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
 _("Create")
-_("Incremental Update")
-_("Delete")
+_("Delete Activation Key")
 _("Update")
-_("Remove package group")
-_("Install package group")
-_("Synchronize")
-_("Abstract async task")
-_("Update package")
-_("Remove Content")
-_("Remove package")
-_("Reindex subscriptions")
-_("Install package")
-_("Update without content")
-_("Destroy Content Host")
-_("Synchronize capsule content")
-_("Hypervisors update")
-_("Update Sync Plan")
-_("Manage bound repositories")
-_("Update Sync Plan Products")
 _("Configure capsule")
-_("Auto-attach subscriptions")
-_("Hypervisors")
-_("Remove Version")
-_("Index package groups")
-_("Import facts")
-_("Remove from Environment")
-_("Index errata")
-_("Update architecture")
-_("Install erratum")
-_("Add Sync Plan Products")
-_("Remove Versions and Associations")
-_("Delete Activation Key")
-_("Index content")
-_("Delete architecture")
-_("Install Applicable Errata")
-_("Create architecture")
+_("Create repos")
+_("Synchronize smart proxy")
+_("Delete")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Promote")
+_("Promotion to Environment")
 _("Publish")
-_("Filtered index content")
-_("Enable")
-_("Delete Product")
-_("Action with sub plans")
-_("Promotion")
-_("Auto attach subscriptions")
-_("Attach subscriptions")
+_("Remove Versions and Associations")
+_("Remove from Environment")
+_("Remove Version")
 _("Export")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Delete Lifecycle Environment")
+_("Attach subscriptions")
+_("Auto attach subscriptions")
+_("Destroy Content Host")
+_("Install Applicable Errata")
+_("Install erratum")
+_("Hypervisors")
+_("Hypervisors update")
+_("Install package")
+_("Remove package")
+_("Update package")
+_("Install package group")
+_("Remove package group")
 _("Remove subscriptions")
-_("Register Host")
 _("Update for host")
-_("Errata mail")
+_("Update Content Overrides")
+_("Update release version for host")
 _("Package Profile Update")
-_("Unregister Host")
-_("Generate and Synchronize Capsule Metadata")
+_("Auto-attach subscriptions")
+_("Destroy")
+_("Product Create")
+_("Delete Product")
+_("Reindex subscriptions")
+_("Delete Package Group")
+_("Fetch pxe files")
+_("Filtered index content")
+_("Upload into")
+_("Index content")
+_("Index errata")
+_("Index package groups")
+_("Remove Content")
+_("Synchronize")
+_("Upload errata into")
+_("Create Package Group")
 _("Disable")
+_("Enable")
+_("Add Sync Plan Products")
+_("Update Sync Plan Products")
+_("Update Sync Plan")