Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 23 insertions, 0 deletions

diff --git a/spec/metrics_server/metrics_server_spec.rb b/spec/metrics_server/metrics_server_spec.rb
index 4c188a6ba29..c7716184d48 100644
--- a/spec/metrics_server/metrics_server_spec.rb
+++ b/spec/metrics_server/metrics_server_spec.rb
@@ -171,6 +171,29 @@ RSpec.describe MetricsServer do # rubocop:disable RSpec/FilePath
               described_class.spawn(target, metrics_dir: metrics_dir)
             end
           end
+
+          context 'when TLS settings are present' do
+            before do
+              %w(web_exporter sidekiq_exporter).each do |key|
+                settings[key]['tls_enabled'] = true
+                settings[key]['tls_cert_path'] = '/path/to/cert.pem'
+                settings[key]['tls_key_path'] = '/path/to/key.pem'
+              end
+            end
+
+            it 'sets the correct environment variables' do
+              expect(Process).to receive(:spawn).with(
+                expected_env.merge(
+                  'GME_CERT_FILE' => '/path/to/cert.pem',
+                  'GME_CERT_KEY' => '/path/to/key.pem'
+                ),
+                '/path/to/gme/gitlab-metrics-exporter',
+                hash_including(pgroup: true)
+              ).and_return(99)
+
+              described_class.spawn(target, metrics_dir: metrics_dir, path: '/path/to/gme/')
+            end
+          end
         end
       end
     end