diff --git a/ee/config/cloud_connector/access_data.yml b/ee/config/cloud_connector/access_data.yml index 49fa28766b61cf9597f3c46228c4ec0a322af55a..e2d16a061bfd4699934923aae8e497fb38c729d5 100644 --- a/ee/config/cloud_connector/access_data.yml +++ b/ee/config/cloud_connector/access_data.yml @@ -22,6 +22,9 @@ services: # Cloud connector features (i.e. code_suggestions, duo_chat...) # unit_primitives. At the moment, unit_primitive name is used as a scope when ServiceToken is being issued unit_primitives: - code_suggestions + duo_enterprise: + unit_primitives: + - code_suggestions duo_chat: backend: 'gitlab-ai-gateway' bundled_with: @@ -29,6 +32,10 @@ services: # Cloud connector features (i.e. code_suggestions, duo_chat...) unit_primitives: - duo_chat - documentation_search + duo_enterprise: + unit_primitives: + - duo_chat + - documentation_search anthropic_proxy: backend: 'gitlab-ai-gateway' bundled_with: diff --git a/ee/spec/lib/cloud_connector/self_signed/access_data_reader_spec.rb b/ee/spec/lib/cloud_connector/self_signed/access_data_reader_spec.rb index d82a201f231b4b2abc25232150659e8ebb23ac8f..150a01cf414f862fcf4ca6214fc56381bee1bbea 100644 --- a/ee/spec/lib/cloud_connector/self_signed/access_data_reader_spec.rb +++ b/ee/spec/lib/cloud_connector/self_signed/access_data_reader_spec.rb @@ -6,10 +6,13 @@ describe '#read_available_services' do let_it_be(:cs_cut_off_date) { Time.zone.parse("2024-02-15 00:00:00 UTC").utc } let_it_be(:cs_unit_primitives) { [:code_suggestions] } - let_it_be(:cs_bundled_with) { { "duo_pro" => cs_unit_primitives } } + let_it_be(:cs_bundled_with) { { "duo_enterprise" => cs_unit_primitives, "duo_pro" => cs_unit_primitives } } let_it_be(:duo_chat_unit_primitives) { [:duo_chat, :documentation_search] } - let_it_be(:duo_chat_bundled_with) { { "duo_pro" => duo_chat_unit_primitives } } + let_it_be(:duo_chat_bundled_with) do + { "duo_enterprise" => duo_chat_unit_primitives, "duo_pro" => duo_chat_unit_primitives } + end + let_it_be(:backend) { 'gitlab-ai-gateway' } let_it_be(:self_hosted_models_cut_off_date) { Time.zone.parse("2024-10-17 00:00:00 UTC").utc }