From cc32024b99146db7376b55cec91a5adffbaab541 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Nov 2024 21:53:34 -0800 Subject: [PATCH] Allow CLOUD_CONNECTOR_SELF_SIGN_TOKENS to function in production We need to use self-signed tokens for now, so allow for it. --- ee/lib/cloud_connector/available_services.rb | 5 +---- ee/spec/lib/cloud_connector/available_services_spec.rb | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ee/lib/cloud_connector/available_services.rb b/ee/lib/cloud_connector/available_services.rb index a3e6bcccae56e9..00cf6a25415937 100644 --- a/ee/lib/cloud_connector/available_services.rb +++ b/ee/lib/cloud_connector/available_services.rb @@ -31,10 +31,7 @@ def use_self_signed_token?(service_name) return true if service_name == :self_hosted_models # All remaining code paths require requesting self-signed tokens. - return false unless Gitlab::Utils.to_boolean(ENV['CLOUD_CONNECTOR_SELF_SIGN_TOKENS']) - - # Permit self-signed tokens in development for testing purposes. - Rails.env.development? + Gitlab::Utils.to_boolean(ENV['CLOUD_CONNECTOR_SELF_SIGN_TOKENS']) end # rubocop:enable Gitlab/AvoidGitlabInstanceChecks end diff --git a/ee/spec/lib/cloud_connector/available_services_spec.rb b/ee/spec/lib/cloud_connector/available_services_spec.rb index aee0202a66e7dd..013dc24bf06351 100644 --- a/ee/spec/lib/cloud_connector/available_services_spec.rb +++ b/ee/spec/lib/cloud_connector/available_services_spec.rb @@ -19,13 +19,7 @@ stub_env('CLOUD_CONNECTOR_SELF_SIGN_TOKENS', '1') end - it 'returns SelfSigned::SelfManaged outside of development' do - is_expected.to be_a_kind_of(CloudConnector::SelfManaged::AccessDataReader) - end - - it 'returns SelfSigned::AccessDataReader in development' do - stub_rails_env('development') - + it 'returns SelfSigned::AccessDataReader' do is_expected.to be_a_kind_of(CloudConnector::SelfSigned::AccessDataReader) end end -- GitLab