Merge branch 'es_refactor' into 'master'

ES: Refactoring Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/516 See merge request !365

Merge branch 'es_refactor' into 'master'
ES: Refactoring Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/516 See merge request !365
f3b2b3d0 · Valery Sizov · 89f97222 · f26488a7 · f3b2b3d0 · f3b2b3d0
--- a/lib/elastic/application_search.rb
+++ b/lib/elastic/application_search.rb
--- a/lib/elastic/issues_search.rb
+++ b/lib/elastic/issues_search.rb
--- a/lib/elastic/merge_requests_search.rb
+++ b/lib/elastic/merge_requests_search.rb
--- a/lib/elastic/milestones_search.rb
+++ b/lib/elastic/milestones_search.rb
--- a/lib/elastic/notes_search.rb
+++ b/lib/elastic/notes_search.rb
--- a/lib/elastic/projects_search.rb
+++ b/lib/elastic/projects_search.rb
--- a/lib/elastic/repositories_search.rb
+++ b/lib/elastic/repositories_search.rb
--- a/lib/elastic/snippets_search.rb
+++ b/lib/elastic/snippets_search.rb
--- a/lib/elastic/wiki_repositories_search.rb
+++ b/lib/elastic/wiki_repositories_search.rb
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -94,7 +94,7 @@ def update_merge_requests
  end
  def index_commits_blobs
-    indexer = Elastic::Indexer.new
+    indexer = Gitlab::Elastic::Indexer.new
    indexer.run(
      @project.id,
      project.repository.path_to_repo,

--- a/lib/elastic/indexer.rb
+++ b/lib/elastic/indexer.rb
-module Elastic
-  class Indexer
-    Error = Class.new(StandardError)
-    def initialize
-      connection_info = {
-        host: Gitlab.config.elasticsearch.host,
-        port: Gitlab.config.elasticsearch.port
-      }.to_json
-      # We accept any form of settings, including string and array
-      # This is why JSON is needed
-      @vars = {
-        'ELASTIC_CONNECTION_INFO' => connection_info,
-        'RAILS_ENV'               => Rails.env
-      }
-    end
-    def run(project_id, repo_path, from_sha = nil, to_sha = nil)
-      to_sha = nil if to_sha == Gitlab::Git::BLANK_SHA
-      vars = @vars.merge({ 'FROM_SHA' => from_sha, 'TO_SHA' => to_sha })
-      path_to_indexer = File.join(Rails.root, 'bin/elastic_repo_indexer')
-      command = [path_to_indexer, project_id.to_s, repo_path]
-      output, status = Gitlab::Popen.popen(command, nil, vars)
-      raise Error, output unless status.zero?
-      true
-    end
-  end
-end
--- a/lib/gitlab/elastic/indexer.rb
+++ b/lib/gitlab/elastic/indexer.rb
+module Gitlab
+  module Elastic
+    class Indexer
+      Error = Class.new(StandardError)
+      def initialize
+        connection_info = {
+          host: Gitlab.config.elasticsearch.host,
+          port: Gitlab.config.elasticsearch.port
+        }.to_json
+        # We accept any form of settings, including string and array
+        # This is why JSON is needed
+        @vars = {
+          'ELASTIC_CONNECTION_INFO' => connection_info,
+          'RAILS_ENV'               => Rails.env
+        }
+      end
+      def run(project_id, repo_path, from_sha = nil, to_sha = nil)
+        to_sha = nil if to_sha == Gitlab::Git::BLANK_SHA
+        vars = @vars.merge({ 'FROM_SHA' => from_sha, 'TO_SHA' => to_sha })
+        path_to_indexer = File.join(Rails.root, 'bin/elastic_repo_indexer')
+        command = [path_to_indexer, project_id.to_s, repo_path]
+        output, status = Gitlab::Popen.popen(command, nil, vars)
+        raise Error, output unless status.zero?
+        true
+      end
+    end
+  end
+end
--- a/lib/tasks/gitlab/elastic.rake
+++ b/lib/tasks/gitlab/elastic.rake
@@ -21,7 +21,7 @@ namespace :gitlab do
      projects = apply_project_filters(projects)
-      indexer = Elastic::Indexer.new
+      indexer = Gitlab::Elastic::Indexer.new
      projects.find_each do |project|
        repository = project.repository

--- a/spec/lib/elastic/indexer_spec.rb
+++ b/spec/lib/elastic/indexer_spec.rb
@@ -16,6 +16,6 @@
      )
    ).and_return([[''], 0])
-    Elastic::Indexer.new.run(1, 'full_repo_path', '000000', '1d1f2d')
+    Gitlab::Elastic::Indexer.new.run(1, 'full_repo_path', '000000', '1d1f2d')
  end
 end
--- a/spec/lib/elastic/issue_spec.rb
+++ b/spec/lib/elastic/issue_spec.rb
--- a/spec/lib/elastic/merge_request_spec.rb
+++ b/spec/lib/elastic/merge_request_spec.rb
--- a/spec/lib/elastic/milestone_spec.rb
+++ b/spec/lib/elastic/milestone_spec.rb
--- a/spec/lib/elastic/note_spec.rb
+++ b/spec/lib/elastic/note_spec.rb
--- a/spec/lib/elastic/project_spec.rb
+++ b/spec/lib/elastic/project_spec.rb
--- a/spec/lib/elastic/repositories_spec.rb
+++ b/spec/lib/elastic/repositories_spec.rb