Commit c2f07d9f authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'pedropombeiro/pvs-correlation-header-name' into 'master'

Use X-Gitlab-Correlation-Id header name for PVS

See merge request gitlab-org/gitlab!59634
parents e4be7cb6 6441d896
...@@ -70,7 +70,7 @@ module Gitlab ...@@ -70,7 +70,7 @@ module Gitlab
def validate_service_request def validate_service_request
headers = { headers = {
'X-Request-ID' => Labkit::Correlation::CorrelationId.current_id, 'X-Gitlab-Correlation-id' => Labkit::Correlation::CorrelationId.current_id,
'X-Gitlab-Token' => validation_service_token 'X-Gitlab-Token' => validation_service_token
}.compact }.compact
......
...@@ -88,7 +88,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Validate::External do ...@@ -88,7 +88,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Validate::External do
expect(::Gitlab::HTTP).to receive(:post) do |_url, params| expect(::Gitlab::HTTP).to receive(:post) do |_url, params|
expect(params[:body]).to match_schema('/external_validation') expect(params[:body]).to match_schema('/external_validation')
expect(params[:timeout]).to eq(described_class::DEFAULT_VALIDATION_REQUEST_TIMEOUT) expect(params[:timeout]).to eq(described_class::DEFAULT_VALIDATION_REQUEST_TIMEOUT)
expect(params[:headers]).to eq({ 'X-Request-ID' => 'correlation-id' }) expect(params[:headers]).to eq({ 'X-Gitlab-Correlation-id' => 'correlation-id' })
end end
perform! perform!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment