Commit 351bbfb8 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch '348223-eurie-remove-spamcheck-client-production-check' into 'master'

Remove check for production environment to encrypt grpc channel

See merge request gitlab-org/gitlab!76881
parents 7b82ad19 a47b32c7
......@@ -99,7 +99,7 @@ module Gitlab
end
def client_creds(url)
if URI(url).scheme == 'tls' || Rails.env.production?
if URI(url).scheme == 'tls'
GRPC::Core::ChannelCredentials.new(::Gitlab::X509::Certificate.ca_certs_bundle)
else
:this_channel_is_insecure
......
......@@ -56,36 +56,6 @@ RSpec.describe Gitlab::Spamcheck::Client do
end
end
describe "Rails environment" do
let(:stub) { double(:spamcheck_stub, check_for_spam_issue: response) }
context "production" do
before do
allow(Rails.env).to receive(:production?).and_return(true)
end
it 'uses secure connection' do
expect(Spamcheck::SpamcheckService::Stub).to receive(:new).with(endpoint.sub(%r{^grpc://}, ''),
instance_of(GRPC::Core::ChannelCredentials),
anything).and_return(stub)
subject
end
end
context "not production" do
before do
allow(Rails.env).to receive(:production?).and_return(false)
end
it 'uses insecure connection' do
expect(Spamcheck::SpamcheckService::Stub).to receive(:new).with(endpoint.sub(%r{^grpc://}, ''),
:this_channel_is_insecure,
anything).and_return(stub)
subject
end
end
end
describe '#issue_spam?' do
before do
allow_next_instance_of(::Spamcheck::SpamcheckService::Stub) do |instance|
......
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