Merge branch 'oregand-master-patch-44c3' into 'master'

Add cut-off date for Duo Enterprise AI proxy features

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167031



Merged-by: Matthias Käppler <mkaeppler@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: David O'Regan <doregan@gitlab.com>

ee/config/cloud_connector/access_data.yml

@@ -50,6 +50,7 @@ services: # Cloud connector features (i.e. code_suggestions, duo_chat...)
           - generate_issue_description
   anthropic_proxy:
     backend: 'gitlab-ai-gateway'
+    cut_off_date: 2024-10-17 00:00:00 UTC
     bundled_with:
       duo_enterprise:
         unit_primitives:
@@ -65,6 +66,7 @@ services: # Cloud connector features (i.e. code_suggestions, duo_chat...)
           - summarize_review
   vertex_ai_proxy:
     backend: 'gitlab-ai-gateway'
+    cut_off_date: 2024-10-17 00:00:00 UTC
     bundled_with:
       duo_enterprise:
         unit_primitives:

ee/spec/lib/cloud_connector/self_signed/access_data_reader_spec.rb

@@ -22,6 +22,7 @@
     let_it_be(:sast_backend) { 'gitlab-security-gateway' }
 
     let_it_be(:self_hosted_models_cut_off_date) { Time.zone.parse("2024-10-17 00:00:00 UTC").utc }
+    let_it_be(:ai_proxy_cut_off_date) { Time.zone.parse("2024-10-17 00:00:00 UTC").utc }
     let_it_be(:duo_chat_cutoff_date) { Time.zone.parse("2024-10-17 00:00:00 UTC").utc }
     let_it_be(:self_hosted_models_bundled_with) { { "duo_enterprise" => [:code_suggestions, :duo_chat] } }
 
@@ -138,15 +139,14 @@
         {
           code_suggestions: [cs_cut_off_date, cs_bundled_with, backend],
           duo_chat: [duo_chat_cutoff_date, duo_chat_bundled_with, backend],
-          anthropic_proxy: [nil, anthropic_proxy_bundled_with, backend],
-          vertex_ai_proxy: [nil, vertex_ai_proxy_bundled_with, backend],
+          anthropic_proxy: [ai_proxy_cut_off_date, anthropic_proxy_bundled_with, backend],
+          vertex_ai_proxy: [ai_proxy_cut_off_date, vertex_ai_proxy_bundled_with, backend],
           resolve_vulnerability: [nil, resolve_vulnerability_bundled_with, backend],
           self_hosted_models: [self_hosted_models_cut_off_date, self_hosted_models_bundled_with, backend],
           generate_description: [nil, generate_description_bundled_with, backend],
           generate_commit_message: [nil, generate_commit_message_bundled_with, backend],
           glab_ask_git_command: [nil, glab_ask_git_command_bundled_with, backend],
-          explain_vulnerability: [nil, explain_vulnerability_bundled_with,
-            backend],
+          explain_vulnerability: [nil, explain_vulnerability_bundled_with, backend],
           summarize_comments: [nil, summarize_comments_bundled_with, backend],
           observability_all: [nil, observability_all_bundled_with, gob_backend],
           troubleshoot_job: [nil, troubleshoot_job_bundled_with, backend],