katello 2.4.0.rc2 → 2.4.0.rc3

data/app/controllers/katello/application_controller.rb

@@ -489,11 +489,7 @@ module Katello
 
       start ||= 0
 
-      if search.nil? || search == ''
-        all_rows = true
-      elsif search_options[:simple_query] && !SETTINGS[:katello][:simple_search_tokens].any? { |s| search.downcase.match(s) }
-        search = search_options[:simple_query]
-      end
+      all_rows = true if (search.nil? || search == '')
       #search = Util::Search::filter_input search
 
       # set the query default field, if one was provided.
@@ -547,13 +543,8 @@ module Katello
           from 0
         end
         total_count = total.total
-
-      rescue Tire::Search::SearchRequestFailed => e
-        Rails.logger.error(e.class)
-
-        total_count = 0
-        panel_options[:total_results] = 0
       end
+
       render_panel_results(@items, total_count, panel_options) unless skip_render
       return @items
     end

data/app/controllers/katello/concerns/api/api_controller.rb

@@ -16,14 +16,6 @@ module Katello
         User.current
       end
 
-      def load_search_service(service = nil)
-        if service.nil?
-          @search_service ||= Glue::ElasticSearch::Items.new
-        else
-          @search_service ||= service
-        end
-      end
-
       protected
 
       def request_from_katello_cli?

data/app/controllers/katello/concerns/api/v2/bulk_systems_extensions.rb

@@ -18,10 +18,8 @@ module Katello
         end
 
         if bulk_params[:included][:search]
-          ids = find_system_ids_by_search(bulk_params[:included][:search], organization)
-          search_systems = System.send(perm_method).where(:id => ids)
-          search_systems = search_systems.where('uuid not in (?)', bulk_params[:excluded][:ids]) unless bulk_params[:excluded][:ids].blank?
-          search_systems = restrict_to.call(search_systems) if restrict_to
+          search_systems = System.where(:id => Organization.find(params[:organization_id]).systems.map(&:id)) if params[:organization_id]
+          search_systems = search_systems.search_for(bulk_params[:included][:search])
           @systems += search_systems
         end
 
@@ -33,16 +31,6 @@ module Katello
         @systems
       end
 
-      def find_system_ids_by_search(search, organization)
-        options = {
-          :filters       => System.readable_search_filters(organization),
-          :load_records? => false,
-          :full_result => true,
-          :fields => [:id]
-        }
-        item_search(System, {:search => search}, options)[:results].collect { |i| i.id }
-      end
-
       def find_organization
         Organization.find_by_id(params[:organization_id])
       end

data/app/lib/actions/candlepin/import_pool_handler.rb

@@ -73,7 +73,6 @@ module Actions
             @logger.debug "skip re-indexing of non-existent content host #{uuid}"
           else
             @logger.debug "re-indexing content host #{system.name}"
-            system.update_index
           end
         end
       end

data/app/lib/actions/katello/content_view/remove.rb

@@ -17,7 +17,6 @@ module Actions
           cv_envs = options.fetch(:content_view_environments, [])
           versions = options.fetch(:content_view_versions, [])
           organization_destroy = options.fetch(:organization_destroy, false)
-          skip_elastic = options.fetch(:skip_elastic, false)
           skip_repo_destroy = options.fetch(:skip_repo_destroy, false)
           action_subject(content_view)
           validate_options(content_view, cv_envs, versions, options) unless organization_destroy
@@ -45,7 +44,6 @@ module Actions
                                                                     :task => self.task)
               plan_action(ContentViewEnvironment::Destroy,
                           cve,
-                          :skip_elastic => skip_elastic,
                           :skip_repo_destroy => skip_repo_destroy,
                           :organization_destroy => organization_destroy)
             end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -59,7 +59,7 @@ module Actions
             copy_output = copy_yum_content(new_repo, dep_solve, content[:package_ids], content[:errata_ids])
 
             plan_action(Katello::Repository::MetadataGenerate, new_repo, nil)
-            plan_action(ElasticSearch::Repository::IndexContent, id: new_repo.id)
+            plan_action(Katello::Repository::IndexContent, id: new_repo.id)
           end
           copy_output
         end
@@ -180,7 +180,7 @@ module Actions
           unless puppet_module_uuids.blank?
             remove_puppet_names(new_repo, puppet_module_names(puppet_module_uuids))
             copy_outputs = puppet_module_uuids.map { |uuid| copy_puppet_module(new_repo, uuid).output }
-            plan_action(ElasticSearch::ContentViewPuppetEnvironment::IndexContent, id: new_repo.id)
+            plan_action(Pulp::ContentViewPuppetEnvironment::IndexContent, id: new_repo.id)
           end
           copy_outputs
         end

data/app/lib/actions/katello/product/create.rb

@@ -20,7 +20,7 @@ module Actions
           action_subject product, :cp_id => cp_id
 
           plan_self
-          plan_action ElasticSearch::Provider::ReindexSubscriptions, product.provider
+          plan_action Katello::Provider::ReindexSubscriptions, product.provider
         end
 
         def finalize

data/app/lib/actions/{elastic_search → katello}/provider/reindex_subscriptions.rb

@@ -1,7 +1,9 @@
 module Actions
-  module ElasticSearch
+  module Katello
     module Provider
-      class ReindexSubscriptions < ElasticSearch::Abstract
+      class ReindexSubscriptions < Actions::EntryAction
+        middleware.use Actions::Middleware::KeepCurrentUser
+
         input_format do
           param :id
         end

data/app/lib/actions/katello/repository/clone_docker_content.rb

@@ -11,7 +11,7 @@ module Actions
                         source_pulp_id: source_repo.pulp_id,
                         target_pulp_id: target_repo.pulp_id)
             plan_action(Katello::Repository::MetadataGenerate, target_repo)
-            plan_action(ElasticSearch::Repository::IndexContent, id: target_repo.id)
+            plan_action(Katello::Repository::IndexContent, id: target_repo.id)
           end
         end
       end

data/app/lib/actions/katello/repository/clone_yum_content.rb

@@ -46,7 +46,7 @@ module Actions
             end
 
             plan_action(Katello::Repository::MetadataGenerate, target_repo, filters.empty? ? source_repo : nil) if generate_metadata
-            plan_action(ElasticSearch::Repository::IndexContent, id: target_repo.id) if index_content
+            plan_action(Katello::Repository::IndexContent, id: target_repo.id) if index_content
           end
         end
 

data/app/lib/actions/{elastic_search → katello}/repository/filtered_index_content.rb

@@ -1,7 +1,9 @@
 module Actions
-  module ElasticSearch
+  module Katello
     module Repository
-      class FilteredIndexContent < ElasticSearch::Abstract
+      class FilteredIndexContent < Actions::EntryAction
+        middleware.use Actions::Middleware::KeepCurrentUser
+
         input_format do
           param :id, Integer
           param :filter

data/app/lib/actions/katello/repository/finish_upload.rb

@@ -8,7 +8,7 @@ module Actions
           end
 
           recent_range = 5.minutes.ago.iso8601
-          plan_action(ElasticSearch::Repository::FilteredIndexContent,
+          plan_action(Katello::Repository::FilteredIndexContent,
                       id: repository.id,
                       filter: {:association => {:created => {"$gt" => recent_range}}},
                       dependency: dependency)

data/app/lib/actions/{elastic_search → katello}/repository/index_content.rb

@@ -1,7 +1,9 @@
 module Actions
-  module ElasticSearch
+  module Katello
     module Repository
-      class IndexContent < ElasticSearch::Abstract
+      class IndexContent < Actions::EntryAction
+        middleware.use Actions::Middleware::KeepCurrentUser
+
         input_format do
           param :id, Integer
           param :dependency, Hash

data/app/lib/actions/katello/repository/sync.rb

@@ -23,7 +23,7 @@ module Actions
 
           sequence do
             sync_task = plan_action(Pulp::Repository::Sync, pulp_id: repo.pulp_id, task_id: pulp_sync_task_id)
-            plan_action(ElasticSearch::Repository::IndexContent, dependency: sync_task.output[:pulp_tasks], id: repo.id)
+            plan_action(Katello::Repository::IndexContent, dependency: sync_task.output[:pulp_tasks], id: repo.id)
             plan_action(Katello::Foreman::ContentUpdate, repo.environment, repo.content_view, repo)
             plan_action(Katello::Repository::CorrectChecksum, repo)
             concurrence do

data/app/lib/actions/katello/subscription/subscribe.rb

@@ -0,0 +1,26 @@
+module Actions
+  module Katello
+    module Subscription
+      class Subscribe < Actions::Base
+        def plan(system_id, cp_id, quantity)
+          plan_self(:user_id => ::User.current.id,
+                    :quantity => quantity,
+                    :cp_id => cp_id,
+                    :system_id => system_id)
+        end
+
+        def run
+          ::User.current = User.find(input[:user_id])
+          ::Katello::System.find(input[:system_id]).subscribe(input[:cp_id], input[:quantity])
+        end
+
+        def finalize
+          ::User.current = User.find(input[:user_id])
+          ::Katello::Pool.find_by_cp_id(input[:cp_id]).import_data
+        ensure
+          ::User.current = nil
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/system/auto_attach_subscriptions.rb

@@ -5,10 +5,12 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(system)
-          system.disable_auto_reindex!
           action_subject system
           plan_action(::Actions::Candlepin::Consumer::AutoAttachSubscriptions, system) if ::SETTINGS[:katello][:use_cp]
-          plan_action(ElasticSearch::Reindex, system) if ::SETTINGS[:katello][:use_elasticsearch]
+        end
+
+        def finalize
+          ::Katello::Pool.import_all
         end
       end
     end

data/app/lib/actions/katello/system/create.rb

@@ -5,8 +5,6 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(system, activation_keys = [])
-          system.disable_auto_reindex!
-
           unless activation_keys.empty?
             activation_key_plan = plan_action(Katello::System::ActivationKeys, system, activation_keys)
             return if activation_key_plan.error
@@ -31,6 +29,8 @@ module Actions
           system.save!
           action_subject system
 
+          system.update_foreman_facts
+
           connect_to_smart_proxy(system)
 
           cp_create = plan_action(Candlepin::Consumer::Create, consumer_create_input)
@@ -40,7 +40,6 @@ module Actions
           plan_action(Pulp::Consumer::Create,
                       uuid: cp_create.output[:response][:uuid],
                       name: system.name)
-          plan_action ElasticSearch::Reindex, system
         end
 
         def humanized_name
@@ -49,7 +48,6 @@ module Actions
 
         def finalize
           system = ::Katello::System.find(input[:system][:id])
-          system.disable_auto_reindex!
           system.uuid = input[:uuid]
           system.save!
         end

data/app/lib/actions/katello/system/destroy.rb

@@ -5,6 +5,7 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(system, options = {})
+          pool_ids = system.pools.map { |x| x["id"] }
           skip_candlepin = options.fetch(:skip_candlepin, false)
           skip_pulp = system.hypervisor?
           action_subject(system)
@@ -14,12 +15,16 @@ module Actions
             plan_action(Pulp::Consumer::Destroy, uuid: system.uuid) unless skip_pulp
           end
 
-          plan_self(:system_id => system.id)
+          plan_self(:system_id => system.id, :pool_ids => pool_ids)
         end
 
         def finalize
           system = ::Katello::System.find(input[:system_id])
           system.destroy!
+          input[:pool_ids].each do |pool_id|
+            pool = ::Katello::Pool.where(:cp_id => pool_id).first
+            pool.import_data if pool
+          end
         end
 
         def humanized_name

data/app/lib/actions/katello/system/update.rb

@@ -5,9 +5,9 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(system, sys_params)
-          system.disable_auto_reindex!
           action_subject system
           system.update_attributes!(sys_params)
+          system.update_foreman_facts
           sequence do
             concurrence do
               plan_action(::Actions::Pulp::Consumer::Update, system) if !system.hypervisor? && ::SETTINGS[:katello][:use_pulp]
@@ -17,7 +17,6 @@ module Actions
             if sys_params[:autoheal] && ::SETTINGS[:katello][:use_cp]
               plan_action(::Actions::Candlepin::Consumer::AutoAttachSubscriptions, system)
             end
-            plan_action(ElasticSearch::Reindex, system) if ::SETTINGS[:katello][:use_elasticsearch]
           end
         end
       end

data/app/lib/actions/pulp/abstract_async_task.rb

@@ -66,6 +66,12 @@ module Actions
       end
 
       def done?
+        output[:pulp_tasks].each do |pulp_task|
+          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
+            fail pulp_exception
+          end
+        end
+
         external_task.all? { |task| task[:finish_time] || FINISHED_STATES.include?(task[:state]) }
       end
 
@@ -102,11 +108,6 @@ module Actions
 
         #Combine new tasks and remove call reports
         output[:pulp_tasks] = external_task_data.reject { |task| task['task_id'].nil? } + new_tasks
-        output[:pulp_tasks].each do |pulp_task|
-          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
-            fail pulp_exception
-          end
-        end
       end
 
       def get_new_tasks(current_list, spawned_task_ids)

data/app/lib/katello/resources/candlepin.rb

@@ -527,8 +527,11 @@ module Katello
             JSON.parse(pool_json).with_indifferent_access
           end
 
-          def get_for_owner(owner_key)
-            pools_json = self.get("/candlepin/owners/#{owner_key}/pools?attribute=unmapped_guests_only:!true", self.default_headers).body
+          def get_for_owner(owner_key, include_temporary_guests = false)
+            url_path = "/candlepin/owners/#{owner_key}/pools"
+            url_params = "?attribute=unmapped_guests_only:!true"
+            url = include_temporary_guests ? url_path : url_path + url_params
+            pools_json = self.get(url, self.default_headers).body
             JSON.parse(pools_json)
           end
 

data/app/lib/katello/util/support.rb

@@ -88,8 +88,7 @@ module Katello
       # We need this so that we can return
       # empty search results on an invalid query
       # Basically this is a empty array with a total
-      # method. We could ve user Tire::Result:Collection
-      # But that class is way more involved
+      # method.
       def self.array_with_total(a = [])
         def a.total
           size

data/app/models/katello/concerns/organization_extensions.rb

@@ -37,25 +37,8 @@ module Katello
         scoped_search :on => :label, :complete_value => :true
 
         after_create :associate_default_capsule
-
-        validates :name, :uniqueness => true, :presence => true
-        validates_with Validators::KatelloNameFormatValidator, :attributes => :name
-        validates :label, :presence => true
         validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
-        validate :unique_name_and_label
-
-        # Ensure that the name and label namespaces do not overlap
-        def unique_name_and_label
-          if new_record? && Organization.where("name = ? OR label = ?", name, label).any?
-            errors.add(:organization, _("Names and labels must be unique across all organizations"))
-          elsif label_changed? && Organization.where("id != ? AND label = ?", id, label).any?
-            errors.add(:label, _("Names and labels must be unique across all organizations"))
-          elsif name_changed? && Organization.where("id != ? AND name = ?", id, name).any?
-            errors.add(:name, _("Names and labels must be unique across all organizations"))
-          else
-            true
-          end
-        end
+        validates :label, :uniqueness => true
 
         def default_content_view
           ContentView.default.where(:organization_id => self.id).first

data/app/models/katello/content_view.rb

@@ -227,8 +227,6 @@ module Katello
     end
 
     # Returns actual puppet modules associated with all components
-    #
-    # @returns array of ElasticSearch::Item objects
     def component_modules_to_publish
       composite? ? components.flat_map { |version| version.puppet_modules } : nil
     end

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -2,8 +2,6 @@ module Katello
   class ContentViewErratumFilterRule < Katello::Model
     self.include_root_in_json = false
 
-    include Glue::ElasticSearch::ContentViewErratumFilterRule if SETTINGS[:katello][:use_elasticsearch]
-
     belongs_to :filter,
                :class_name => "Katello::ContentViewErratumFilter",
                :inverse_of => :erratum_rules,

data/app/models/katello/content_view_history.rb

@@ -2,8 +2,6 @@ module Katello
   class ContentViewHistory < Katello::Model
     include Katello::Authorization::ContentViewHistory
 
-    include Glue::ElasticSearch::ContentViewHistory if SETTINGS[:katello][:use_elasticsearch]
-
     belongs_to :environment, :class_name => "Katello::KTEnvironment", :inverse_of => :content_view_histories,
                              :foreign_key => :katello_environment_id
     belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion", :foreign_key => :katello_content_view_version_id, :inverse_of => :history
@@ -21,6 +19,8 @@ module Katello
     scope :active, -> { where(:status => IN_PROGRESS) }
     alias_method :version, :content_view_version
 
+    scoped_search :on => :name, :in => :environment, :rename => :environment, :complete_value => true
+
     def content_view
       self.content_view_version.try(:content_view)
     end

data/app/models/katello/content_view_package_filter_rule.rb

@@ -2,8 +2,6 @@ module Katello
   class ContentViewPackageFilterRule < Katello::Model
     self.include_root_in_json = false
 
-    include Glue::ElasticSearch::ContentViewPackageFilterRule if SETTINGS[:katello][:use_elasticsearch]
-
     belongs_to :filter,
                :class_name => "Katello::ContentViewPackageFilter",
                :inverse_of => :package_rules,