foreman_pipeline 0.0.5 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTExYjU0YWQ1ZTkxNjM2MTdhNDJkMWVmMTA4ZmQ3MjgxNTljMmUzMg==
+    ZmQ0YWZmODEyOGVmNmJiNGU3ZTg0OWM3OTdjNjQyMjU5ZDgwMzM2NQ==
   data.tar.gz: !binary |-
-    NGRmYjhjOWE5MGNlODJmYmQ5ZWQ0MzY3NDkyYjJhZGQ4ZDE4NzZmMg==
+    ZDM5ZDRiNWRmYzU3NTBmMjk3NzRjMGY1ZjVlNjRiMjY5NzNmZWM2Mw==
 SHA512:
   metadata.gz: !binary |-
-    OWJjZjczMDQ3NmNmOWUzZmE0YjQ5MWQ0OTNjMjQxMGYyZjlhZTAxZGIzMWJk
-    MTNlZGNlZDZhMzYyY2U5OTczMzdiNjQxZWYwZGQ0NDY2NTA3NzJmMDk3OGQy
-    ZmZhMWRlOTMwNTkwMzYzMmVkNDFiZDI0ZTM4Yjc4Y2FkN2RmNjU=
+    ODFmOWMyODM4ZGEwNjRkNDQyYTYxNTFiYWQwYjI0MjBhZTQzYjk3ZDM1ODhk
+    YzJlMGU3NDU4MTRiMzhiNDhlZmU5Y2Q2MDhlYjNlZWE3N2YxZjQyMjFmZDBh
+    NzRlZjZjZDYwNmYwMWZkMTgwZjk5N2NlMGQ3ZDM4MjNiN2U3MTI=
   data.tar.gz: !binary |-
-    OTg0NjQyYTNlMjkxY2M4MWVjYmFiNTMyZmMxMTZmMjhjNzJhYjU1NzRiOWM0
-    OGY1ZTZiMjFiMmFmZGFiNWU4YTAyZjAyMGY4ZTcwMzg4NGNkOGJjNjdiNDU0
-    NWIxY2Y4ZDI2NmFhNzFlZTA2M2FkZDQ5ZjlmYjNiMGQzM2I5OWM=
+    YzlmYzYwYmM5OWEzMjM3ZWFiMjRlZTk4N2Y0MjQ4YWRjZDI0ZjcyOWEyNzkx
+    MjA2Mjk1OWNiNTk5Y2UyMmZmYzMxNjVhMTEwZjQyMjViNzNlODE3MmUzZWM1
+    OGI0ZmQyMGRhYzZkNWU1YjBjZGEzMzVhMjExYjM5NDg2NThlNmE=

data/app/controllers/foreman_pipeline/api/jenkins_instances_controller.rb

@@ -3,10 +3,10 @@ module ForemanPipeline
     respond_to :json
 
     include Api::Rendering
+    include Concerns::ApiControllerExtensions
 
     before_filter :find_jenkins_instance, :only => [:show, :update, :destroy, :check_jenkins, :set_jenkins_user]
     before_filter :find_organization, :only => [:index, :create]
-    before_filter :load_search_service, :only => [:index]
 
     def_param_group :jenkins_instance do
       param :name, String, :desc => N_("Jenkins instance's name")
@@ -24,16 +24,13 @@ module ForemanPipeline
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("Name of the jenkins instance")
     def index
-      ids = JenkinsInstance.readable.where(:organization_id => @organization.id).pluck(:id)
-      filters = [:terms => {:id => ids}]
-      filters << {:term => {:name => params[:name]}} if params[:name]
-
-      options = {
-        :filters => filters,
-        :load_records? => true
-      }
+      respond_for_index(:collection => scoped_search(index_relation.uniq, params[:sort_by], params[:sort_order]))
+    end
 
-      respond_for_index(:collection => item_search(JenkinsInstance, params, options))
+    def index_relation
+      query = JenkinsInstance.where(:organization_id => @organization.id)
+      query = query.where(:name => params[:name]) if params[:name]
+      query
     end
 
     api :POST, "/organizations/:organization_id/jenkins_instances/:id", N_("Create jenkins instance")

data/app/controllers/foreman_pipeline/api/jenkins_users_controller.rb

@@ -3,6 +3,7 @@ module ForemanPipeline
     respond_to :json
 
     include Api::Rendering
+    include Concerns::ApiControllerExtensions
 
     before_filter :find_organization, :only => [:create, :index]
     before_filter :find_jenkins_user, :only => [:show, :destroy, :update]
@@ -21,17 +22,13 @@ module ForemanPipeline
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("Name of the jenkins instance")
     def index
-       ids = JenkinsUser.readable
-            .where(:organization_id => @organization.id)
-            .pluck(:id)
-      filters = [:terms => {:id => ids}]
-      filters << {:term => {:name => params[:name]}} if params[:name]
-
-      options = {
-         :filters => filters,
-         :load_records? => true
-      }
-      respond_for_index(:collection => item_search(JenkinsUser, params, options))
+      respond_for_index(:collection => scoped_search(index_relation.uniq, params[:sort_by], params[:sort_order]))
+    end
+
+    def index_relation
+      query = JenkinsUser.where(:organization_id => @organization.id)
+      query = query.where(:name => params[:name]) if params[:name]
+      query
     end
 
     api :GET, "/organizations/:organization_id/jenkins_users/:id", N_("Get jenkins user by identifier")

data/app/controllers/foreman_pipeline/api/jobs_controller.rb

@@ -3,6 +3,7 @@ module ForemanPipeline
     respond_to :json
 
     include Api::Rendering
+    include Concerns::ApiControllerExtensions
 
     before_filter :find_organization, :only => [:create, :index, :add_projects, :available_paths]
 
@@ -12,8 +13,6 @@ module ForemanPipeline
                                        :add_projects, :remove_projects, :set_to_environments,
                                        :available_paths]
 
-    before_filter :load_search_service, :only => [:index]
-
     def_param_group :job do
       param :name, String, :desc => N_("Name of the job"), :required => true
       param :manual_trigger, :bool, :desc => N_("Allow starting job manually"), :required => false
@@ -31,15 +30,17 @@ module ForemanPipeline
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("Name of the job")
     def index
-      ids = Job.readable.where(:organization_id => @organization.id).pluck(:id)
-      filters = [:terms => {:id => ids}]
-      filters << {:term => {:name => params[:name]}} if params[:name]
+      respond_for_index(:collection => scoped_search(index_relation.uniq, params[:sort_by], params[:sort_order]))
+    end
 
-      options = {
-         :filters => filters,
-         :load_records? => true
-      }
-      respond_for_index(:collection => item_search(Job, params, options))
+    def index_relation
+      query = Job.readable.where(:organization_id => @organization.id)
+      query = query.where(:name => params[:name]) if params[:name]
+      query = query.where(:manual_trigger => params[:manual_trigger]) if params[:manual_trigger]
+      query = query.where(:sync_trigger => params[:sync_trigger]) if params[:sync_trigger]
+      query = query.where(:levelup_trigger => params[:levelup_trigger]) if params[:levelup_trigger]
+      query = query.where(:promote => params[:promote]) if params[:promote]
+      query
     end
 
     api :GET, "/organizations/:organization_id/jobs/:id", N_("Get job by identifier")

data/app/controllers/foreman_pipeline/concerns/api_controller_extensions.rb

@@ -0,0 +1,13 @@
+module ForemanPipeline
+  module Concerns
+    module ApiControllerExtensions
+      extend ActiveSupport::Concern
+
+      def resource_class
+        @resource_class ||= resource_name.classify.constantize
+      rescue NameError
+        @resource_class ||= "ForemanPipeline::#{resource_name.classify}".constantize
+      end
+    end
+  end
+end

data/app/models/foreman_pipeline/jenkins_instance.rb

@@ -6,7 +6,6 @@ module ForemanPipeline
 
     attr_accessor :client, :server_version
     include Katello::Glue
-    include Glue::ElasticSearch::JenkinsInstance
     include ForemanPipeline::Authorization::JenkinsInstance
 
     attr_accessible :name, :url, :organization_id, :pubkey, :jenkins_home, :cert_path, :jenkins_user_id
@@ -23,6 +22,8 @@ module ForemanPipeline
     validates :organization, :presence => true
     validates :jenkins_home, :format => { :with => FILEPATH_REGEX }
 
+    scoped_search :on => :name , :complete_value => true
+
     # TODO: loose coupling
     def create_client(username = nil, password = nil)
       fail "Cannot create Jenkins client: no url in Jenkins Instance" if url.nil?

data/app/models/foreman_pipeline/jenkins_project.rb

@@ -3,7 +3,6 @@ module ForemanPipeline
     self.include_root_in_json = false
 
     include Katello::Glue
-    include Glue::ElasticSearch::JenkinsProject
     include ForemanPipeline::Authorization::JenkinsProject
 
     belongs_to :organization

data/app/models/foreman_pipeline/jenkins_project_param.rb

@@ -3,7 +3,6 @@ module ForemanPipeline
     self.include_root_in_json = false
 
     include Katello::Glue
-
     include ForemanPipeline::Authorization::JenkinsProjectParam
 
     self.inheritance_column = :_inheritance_type_disabled

data/app/models/foreman_pipeline/jenkins_user.rb

@@ -3,7 +3,6 @@ module ForemanPipeline
     self.include_root_in_json = false
 
     include Katello::Glue
-    include Glue::ElasticSearch::JenkinsUser
     include ForemanPipeline::Authorization::JenkinsUser
 
     belongs_to :organization
@@ -13,5 +12,7 @@ module ForemanPipeline
     validates :token, :presence => true
 
     attr_accessible :name, :token, :organization_id
+
+    scoped_search :on => :name, :complete_value => true
   end
 end

data/app/models/foreman_pipeline/job.rb

@@ -3,7 +3,6 @@ module ForemanPipeline
     self.include_root_in_json = false
 
     include Katello::Glue
-    include Glue::ElasticSearch::Job
     include ForemanPipeline::Authorization::Job
     include ActiveModel::Validations
 
@@ -31,6 +30,12 @@ module ForemanPipeline
     attr_accessible :name, :content_view_id, :hostgroup_id, :organization_id, :compute_resource_id, :jenkins_instance_id,
       :environment_id, :manual_trigger, :levelup_trigger, :sync_trigger
 
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :manual_trigger, :complete_value => true
+    scoped_search :on => :levelup_trigger, :complete_value => true
+    scoped_search :on => :sync_trigger, :complete_value => true
+
     def is_valid?
       !self.attributes.values.include?(nil) && !self.jenkins_instance.jenkins_user.nil?
     end

data/lib/foreman_pipeline/version.rb

@@ -1,3 +1,3 @@
 module ForemanPipeline
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Ondřej Pražák
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_deployments
@@ -176,6 +176,7 @@ files:
 - app/controllers/foreman_pipeline/api/jenkins_users_controller.rb
 - app/controllers/foreman_pipeline/api/jobs_controller.rb
 - app/controllers/foreman_pipeline/application_controller.rb
+- app/controllers/foreman_pipeline/concerns/api_controller_extensions.rb
 - app/helpers/foreman_pipeline/application_helper.rb
 - app/lib/actions/foreman_pipeline/jenkins/abstract_jenkins_action.rb
 - app/lib/actions/foreman_pipeline/jenkins/build.rb
@@ -218,11 +219,6 @@ files:
 - app/models/foreman_pipeline/concerns/hostgroup_extension.rb
 - app/models/foreman_pipeline/concerns/kt_environment_extension.rb
 - app/models/foreman_pipeline/concerns/repository_extension.rb
-- app/models/foreman_pipeline/glue/elastic_search/base_model.rb
-- app/models/foreman_pipeline/glue/elastic_search/jenkins_instance.rb
-- app/models/foreman_pipeline/glue/elastic_search/jenkins_project.rb
-- app/models/foreman_pipeline/glue/elastic_search/jenkins_user.rb
-- app/models/foreman_pipeline/glue/elastic_search/job.rb
 - app/models/foreman_pipeline/jenkins_instance.rb
 - app/models/foreman_pipeline/jenkins_project.rb
 - app/models/foreman_pipeline/jenkins_project_param.rb

data/app/models/foreman_pipeline/glue/elastic_search/base_model.rb

@@ -1,21 +0,0 @@
-module ForemanPipeline
-  module Glue::ElasticSearch::BaseModel
-
-    def self.included(base)
-      base.send :include, Katello::Ext::IndexedModel
-
-      base.class_eval do
-        index_options :extended_json => :extended_index_attrs,
-                      :display_attrs => [:name]
-        mapping do
-          indexes :name, :type => 'string', :analyzer => :kt_name_analyzer
-          indexes :name_sort, :type => 'string', :index => :not_analyzed
-        end
-      end
-    end
-
-    def extended_index_attrs
-      {:name_sort => name.downcase}
-    end
-  end  
-end

data/app/models/foreman_pipeline/glue/elastic_search/jenkins_instance.rb

@@ -1,11 +0,0 @@
-module ForemanPipeline
-  module Glue::ElasticSearch::JenkinsInstance
-
-    def self.included(base)
-      base.class_eval do
-        include Glue::ElasticSearch::BaseModel        
-      end
-    end
-    
-  end  
-end

data/app/models/foreman_pipeline/glue/elastic_search/jenkins_project.rb

@@ -1,11 +0,0 @@
-module ForemanPipeline
-  module Glue::ElasticSearch::JenkinsProject
-
-    def self.included(base)
-      base.class_eval do
-        include Glue::ElasticSearch::BaseModel        
-      end
-    end
-    
-  end  
-end

data/app/models/foreman_pipeline/glue/elastic_search/jenkins_user.rb

@@ -1,11 +0,0 @@
-module ForemanPipeline
-  module Glue::ElasticSearch::JenkinsUser
-
-    def self.included(base)
-      base.class_eval do
-        include Glue::ElasticSearch::BaseModel
-      end
-    end
-
-  end
-end

data/app/models/foreman_pipeline/glue/elastic_search/job.rb

@@ -1,11 +0,0 @@
-module ForemanPipeline
-  module Glue::ElasticSearch::Job
-
-    def self.included(base)
-      base.class_eval do
-        include Glue::ElasticSearch::BaseModel        
-      end
-    end
-
-  end  
-end