Merge branch 'fix-kas-grpc-credentials' into 'master'

Allow cleartext communication with KAS in production

See merge request gitlab-org/gitlab!66135

lib/gitlab/kas/client.rb

@@ -49,14 +49,14 @@ module Gitlab
       end
 
       def kas_endpoint_url
-        Gitlab::Kas.internal_url.delete_prefix('grpc://')
+        Gitlab::Kas.internal_url.sub(%r{^grpc://|^grpcs://}, '')
       end
 
       def credentials
-        if Rails.env.test? || Rails.env.development?
-          :this_channel_is_insecure
-        else
+        if URI(Gitlab::Kas.internal_url).scheme == 'grpcs'
           GRPC::Core::ChannelCredentials.new
+        else
+          :this_channel_is_insecure
         end
       end
 

spec/lib/gitlab/kas/client_spec.rb

@@ -30,10 +30,11 @@ RSpec.describe Gitlab::Kas::Client do
 
   describe 'gRPC calls' do
     let(:token) { instance_double(JSONWebToken::HMACToken, encoded: 'test-token') }
+    let(:kas_url) { 'grpc://example.kas.internal' }
 
     before do
       allow(Gitlab::Kas).to receive(:enabled?).and_return(true)
-      allow(Gitlab::Kas).to receive(:internal_url).and_return('grpc://example.kas.internal')
+      allow(Gitlab::Kas).to receive(:internal_url).and_return(kas_url)
 
       expect(JSONWebToken::HMACToken).to receive(:new)
         .with(Gitlab::Kas.secret)
@@ -80,5 +81,21 @@ RSpec.describe Gitlab::Kas::Client do
 
       it { expect(subject).to eq(agent_configurations) }
     end
+
+    describe 'with grpcs' do
+      let(:stub) { instance_double(Gitlab::Agent::ConfigurationProject::Rpc::ConfigurationProject::Stub) }
+      let(:kas_url) { 'grpcs://example.kas.internal' }
+
+      it 'uses a ChannelCredentials object' do
+        expect(Gitlab::Agent::ConfigurationProject::Rpc::ConfigurationProject::Stub).to receive(:new)
+          .with('example.kas.internal', instance_of(GRPC::Core::ChannelCredentials), timeout: described_class::TIMEOUT)
+          .and_return(stub)
+
+        allow(stub).to receive(:list_agent_config_files)
+          .and_return(double(config_files: []))
+
+        described_class.new.list_agent_config_files(project: project)
+      end
+    end
   end
 end