Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 36 insertions, 1 deletions

diff --git a/spec/lib/gitlab/elasticsearch/logs_spec.rb b/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb
index 6b9d1dbef99..8b6a19fa2c5 100644
--- a/spec/lib/gitlab/elasticsearch/logs_spec.rb
+++ b/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Elasticsearch::Logs do
+describe Gitlab::Elasticsearch::Logs::Lines do
   let(:client) { Elasticsearch::Transport::Client }
 
   let(:es_message_1) { { timestamp: "2019-12-13T14:35:34.034Z", pod: "production-6866bc8974-m4sk4", message: "10.8.2.1 - - [25/Oct/2019:08:03:22 UTC] \"GET / HTTP/1.1\" 200 13" } }
diff --git a/spec/lib/gitlab/elasticsearch/logs/pods_spec.rb b/spec/lib/gitlab/elasticsearch/logs/pods_spec.rb
new file mode 100644
index 00000000000..0a4ab0780c5
--- /dev/null
+++ b/spec/lib/gitlab/elasticsearch/logs/pods_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Elasticsearch::Logs::Pods do
+  let(:client) { Elasticsearch::Transport::Client }
+
+  let(:es_query) { JSON.parse(fixture_file('lib/elasticsearch/pods_query.json'), symbolize_names: true) }
+  let(:es_response) { JSON.parse(fixture_file('lib/elasticsearch/pods_response.json')) }
+  let(:namespace) { "autodevops-deploy-9-production" }
+
+  subject { described_class.new(client) }
+
+  describe '#pods' do
+    it 'returns the pods' do
+      expect(client).to receive(:search).with(body: es_query).and_return(es_response)
+
+      result = subject.pods(namespace)
+      expect(result).to eq([
+        {
+          name: "runner-gitlab-runner-7bbfb5dcb5-p6smb",
+          container_names: %w[runner-gitlab-runner]
+        },
+        {
+          name: "elastic-stack-elasticsearch-master-1",
+          container_names: %w[elasticsearch chown sysctl]
+        },
+        {
+          name: "ingress-nginx-ingress-controller-76449bcc8d-8qgl6",
+          container_names: %w[nginx-ingress-controller]
+        }
+     ])
+    end
+  end
+end