From e89f5bf9871f067dffe30f7aa55569a21bfd2603 Mon Sep 17 00:00:00 2001
From: Jessie Young <jessieyoung@gitlab.com>
Date: Wed, 18 Dec 2024 16:19:46 -0800
Subject: [PATCH 1/3] Add Project Amazon Q availability settings

---
 .../permissions/components/settings_panel.vue | 38 +++++++++++---
 .../projects/shared/permissions/constants.js  |  1 +
 .../assets/javascripts/ai/settings/index.js   |  2 +
 .../admin/ai/amazon_q_settings_controller.rb  |  5 --
 ee/app/helpers/ee/projects_helper.rb          |  1 +
 .../service_account_member_remove_service.rb  | 10 ++--
 ee/app/services/ee/projects/update_service.rb | 15 ++++++
 ee/spec/helpers/projects_helper_spec.rb       | 13 +++++
 ...service_account_member_add_service_spec.rb | 49 +++++++++++++++++++
 ...vice_account_member_remove_service_spec.rb |  6 +--
 .../services/projects/update_service_spec.rb  | 43 ++++++++++++++++
 locale/gitlab.pot                             |  6 +++
 .../components/settings_panel_spec.js         | 22 +++++++++
 13 files changed, 190 insertions(+), 21 deletions(-)
 create mode 100644 ee/spec/services/ai/amazon_q/service_account_member_add_service_spec.rb

diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index c14422ae516853..85939fce36435c 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -21,6 +21,7 @@ import {
   modelExperimentsHelpPath,
   modelRegistryHelpPath,
   duoHelpPath,
+  amazonQHelpPath,
   pipelineExecutionPoliciesHelpPath,
 } from '../constants';
 import { toggleHiddenClassBySelector } from '../external';
@@ -78,8 +79,6 @@ export default {
     releasesHelpText: s__(
       'ProjectSettings|Combine git tags with release notes, release evidence, and assets to create a release.',
     ),
-    duoLabel: s__('ProjectSettings|GitLab Duo'),
-    duoHelpText: s__('ProjectSettings|Use AI-powered features in this project.'),
     securityAndComplianceLabel: s__('ProjectSettings|Security and compliance'),
     snippetsLabel: s__('ProjectSettings|Snippets'),
     wikiLabel: s__('ProjectSettings|Wiki'),
@@ -106,7 +105,6 @@ export default {
   VISIBILITY_LEVEL_PUBLIC_INTEGER,
   modelExperimentsHelpPath,
   modelRegistryHelpPath,
-  duoHelpPath,
   pipelineExecutionPoliciesHelpPath,
   components: {
     CiCatalogSettings,
@@ -197,6 +195,11 @@ export default {
       required: false,
       default: false,
     },
+    amazonQAvailable: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     duoFeaturesLocked: {
       type: Boolean,
       required: false,
@@ -451,6 +454,25 @@ export default {
     wasProjectInitiallyPrivate() {
       return this.currentSettings.visibilityLevel === VISIBILITY_LEVEL_PRIVATE_INTEGER;
     },
+    duoEnabledSetting() {
+      // TODO(Q): What if both Amazon Q and Duo are available??
+      if (this.amazonQAvailable) {
+        return {
+          label: s__('ProjectSettings|Amazon Q'),
+          helpText: s__('ProjectSettings|This project can use Amazon Q.'),
+          helpPath: amazonQHelpPath,
+        };
+      }
+      if (this.licensedAiFeaturesAvailable) {
+        return {
+          label: s__('ProjectSettings|GitLab Duo'),
+          helpText: s__('ProjectSettings|Use AI-powered features in this project.'),
+          helpPath: duoHelpPath,
+        };
+      }
+
+      return null;
+    },
   },
   watch: {
     visibilityLevel(value, oldValue) {
@@ -1088,11 +1110,11 @@ export default {
         />
       </project-setting-row>
       <project-setting-row
-        v-if="licensedAiFeaturesAvailable"
+        v-if="duoEnabledSetting"
         data-testid="duo-settings"
-        :label="$options.i18n.duoLabel"
-        :help-text="$options.i18n.duoHelpText"
-        :help-path="$options.duoHelpPath"
+        :label="duoEnabledSetting.label"
+        :help-text="duoEnabledSetting.helpText"
+        :help-path="duoEnabledSetting.helpPath"
         :locked="duoFeaturesLocked"
       >
         <template #label-icon>
@@ -1109,7 +1131,7 @@ export default {
           v-model="duoFeaturesEnabled"
           class="gl-mb-4 gl-mt-2"
           :disabled="duoFeaturesLocked"
-          :label="$options.i18n.duoLabel"
+          :label="duoEnabledSetting.label"
           label-position="hidden"
           name="project[project_setting_attributes][duo_features_enabled]"
           data-testid="duo_features_enabled_toggle"
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/constants.js b/app/assets/javascripts/pages/projects/shared/permissions/constants.js
index ee665be970b6ad..86a1bf82a874e5 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/constants.js
+++ b/app/assets/javascripts/pages/projects/shared/permissions/constants.js
@@ -52,6 +52,7 @@ export const modelExperimentsHelpPath = helpPagePath(
 export const modelRegistryHelpPath = helpPagePath('user/project/ml/model_registry/index.md');
 
 export const duoHelpPath = helpPagePath('user/ai_features');
+export const amazonQHelpPath = helpPagePath('user/duo_amazon_q/index.md');
 
 export const pipelineExecutionPoliciesHelpPath = helpPagePath(
   'user/application_security/policies/pipeline_execution_policies',
diff --git a/ee/app/assets/javascripts/ai/settings/index.js b/ee/app/assets/javascripts/ai/settings/index.js
index cc6c96cbffffda..82d71f4231d57c 100644
--- a/ee/app/assets/javascripts/ai/settings/index.js
+++ b/ee/app/assets/javascripts/ai/settings/index.js
@@ -21,6 +21,7 @@ export const initAiSettings = (id, component) => {
     earlyAccessPath,
     selfHostedModelsEnabled,
     aiTermsAndConditionsPath,
+    amazonQAvailable,
     onGeneralSettingsPage,
     configurationSettingsPath,
     areExperimentSettingsAllowed,
@@ -47,6 +48,7 @@ export const initAiSettings = (id, component) => {
       selfHostedModelsEnabled: parseBoolean(selfHostedModelsEnabled),
       aiTermsAndConditionsPath,
       earlyAccessPath,
+      amazonQAvailable: parseBoolean(amazonQAvailable),
       onGeneralSettingsPage: parseBoolean(onGeneralSettingsPage),
       configurationSettingsPath,
       areExperimentSettingsAllowed: parseBoolean(areExperimentSettingsAllowed),
diff --git a/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb b/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
index a1dd8b9b15ba99..b8f2abaff3bcf7 100644
--- a/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
+++ b/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
@@ -6,7 +6,6 @@ class AmazonQSettingsController < Admin::ApplicationController
       feature_category :ai_abstraction_layer
 
       before_action :check_can_admin_amazon_q
-      before_action :expire_current_settings
 
       def index
         setup_view_model
@@ -80,10 +79,6 @@ def check_can_admin_amazon_q
         render_404 unless ::Ai::AmazonQ.feature_available?
       end
 
-      def expire_current_settings
-        Gitlab::CurrentSettings.expire_current_application_settings
-      end
-
       def permitted_params
         params.permit(:role_arn, :availability)
       end
diff --git a/ee/app/helpers/ee/projects_helper.rb b/ee/app/helpers/ee/projects_helper.rb
index c7ed61c0b67cfb..deda5f778bdf9f 100644
--- a/ee/app/helpers/ee/projects_helper.rb
+++ b/ee/app/helpers/ee/projects_helper.rb
@@ -32,6 +32,7 @@ def project_permissions_panel_data(project)
         canManageSecretManager: ::Feature.enabled?(:secrets_manager, project, type: :wip),
         requirementsAvailable: project.feature_available?(:requirements),
         licensedAiFeaturesAvailable: project.licensed_ai_features_available?,
+        amazonQAvailable: Ai::AmazonQ.connected?,
         duoFeaturesLocked: project.project_setting.duo_features_enabled_locked?,
         requestCveAvailable: ::Gitlab.com?,
         cveIdRequestHelpPath: help_page_path('user/application_security/cve_id_request.md'),
diff --git a/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb b/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
index 3ebcabbc309feb..6e2cbff5795635 100644
--- a/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
+++ b/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
@@ -9,7 +9,7 @@ def initialize(user, membership_container)
       end
 
       def execute
-        member = find_or_initialize_member_by_user(q_user_id)
+        member = find_or_initialize_member_by_user
 
         return ServiceResponse.success(message: "Membership not found. Nothing to do.") unless member
 
@@ -27,14 +27,14 @@ def execute
 
       attr_reader :user, :membership_container
 
-      def find_or_initialize_member_by_user(user_id)
-        user = User.find(q_user_id)
-        existing_member = membership_container.member(user)
+      def find_or_initialize_member_by_user
+        service_account_user = User.find_by_id(q_user_id)
+        existing_member = membership_container.member(service_account_user)
 
         return existing_member unless membership_container.is_a?(Group) && !existing_member
 
         # build a membership so we can run destroy service on subresources
-        membership_container.members.build(user_id: user_id)
+        membership_container.members.build(user: service_account_user)
       end
 
       def q_user_id
diff --git a/ee/app/services/ee/projects/update_service.rb b/ee/app/services/ee/projects/update_service.rb
index 259480a20d8268..a1e13281ad9a3f 100644
--- a/ee/app/services/ee/projects/update_service.rb
+++ b/ee/app/services/ee/projects/update_service.rb
@@ -54,6 +54,7 @@ def execute
           sync_wiki_on_enable if !wiki_was_enabled && project.wiki_enabled?
           project.import_state.force_import_job! if params[:mirror].present? && project.mirror?
           project.remove_import_data if project.previous_changes.include?('mirror') && !project.mirror?
+          update_amazon_q_service_account!
 
           if suggested_reviewers_already_enabled
             trigger_project_deregistration
@@ -216,6 +217,20 @@ def refresh_merge_trains(project)
 
         MergeTrains::Train.all_for_project(project).each(&:refresh_async)
       end
+
+      def update_amazon_q_service_account!
+        duo_features_enabled = params.dig(:project_setting_attributes, :duo_features_enabled)
+
+        return unless duo_features_enabled.present? && ::Ai::AmazonQ.connected?
+
+        service = if duo_features_enabled == 'true'
+                    ::Ai::AmazonQ::ServiceAccountMemberAddService.new(project)
+                  else
+                    ::Ai::AmazonQ::ServiceAccountMemberRemoveService.new(current_user, project)
+                  end
+
+        service.execute
+      end
     end
   end
 end
diff --git a/ee/spec/helpers/projects_helper_spec.rb b/ee/spec/helpers/projects_helper_spec.rb
index 052cfff5bd374e..71db553240c26a 100644
--- a/ee/spec/helpers/projects_helper_spec.rb
+++ b/ee/spec/helpers/projects_helper_spec.rb
@@ -649,6 +649,19 @@
 
     it { is_expected.to include(expected_data) }
 
+    context "if AmazonQ is connected" do
+      where(connected: [true, false])
+      with_them do
+        before do
+          allow(::Ai::AmazonQ).to receive(:connected?).and_return(connected)
+        end
+
+        it 'sets amazonQAvailable to the correct value' do
+          expect(subject[:amazonQAvailable]).to eq(connected)
+        end
+      end
+    end
+
     context "if in Gitlab.com" do
       where(is_gitlab_com: [true, false])
       with_them do
diff --git a/ee/spec/services/ai/amazon_q/service_account_member_add_service_spec.rb b/ee/spec/services/ai/amazon_q/service_account_member_add_service_spec.rb
new file mode 100644
index 00000000000000..9531d85d858b5c
--- /dev/null
+++ b/ee/spec/services/ai/amazon_q/service_account_member_add_service_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ai::AmazonQ::ServiceAccountMemberAddService, feature_category: :duo_workflow do
+  let_it_be(:service_account) { create(:user) }
+  let(:project) { create(:project) }
+  let(:service) { described_class.new(project) }
+
+  describe '#execute' do
+    before do
+      Ai::Setting.instance.update!(amazon_q_service_account_user_id: service_account.id)
+    end
+
+    context 'when the service account is not a member of the project' do
+      it 'adds the service account as a developer' do
+        expect { service.execute }.to change { project.members.count }.by(1)
+
+        member = project.members.last
+        expect(member.user_id).to eq(service_account.id)
+        expect(member.access_level).to eq(Gitlab::Access::DEVELOPER)
+      end
+
+      it 'returns a success response' do
+        result = service.execute
+
+        expect(result).to be_success
+        expect(result.payload).to be_a(ProjectMember)
+      end
+    end
+
+    context 'when the service account is already a member of the project' do
+      before do
+        project.add_developer(service_account)
+      end
+
+      it 'does not add a new membership' do
+        expect { service.execute }.not_to change { project.members.count }
+      end
+
+      it 'returns a success response with a message' do
+        result = service.execute
+
+        expect(result).to be_success
+        expect(result.message).to eq("Membership already exists. Nothing to do.")
+      end
+    end
+  end
+end
diff --git a/ee/spec/services/ai/amazon_q/service_account_member_remove_service_spec.rb b/ee/spec/services/ai/amazon_q/service_account_member_remove_service_spec.rb
index f6a4b4e321f34e..f548f1b88e067d 100644
--- a/ee/spec/services/ai/amazon_q/service_account_member_remove_service_spec.rb
+++ b/ee/spec/services/ai/amazon_q/service_account_member_remove_service_spec.rb
@@ -70,12 +70,12 @@
 
       it_behaves_like 'when the service account is a member of the project' do
         let(:expected_member) do
-          member = group.members.build(user_id: service_account.id)
+          member = group.members.build(user: service_account)
 
           # stub `.build` so that we always return the same value which can strengthen our assertion
           # inside the `expected_member` so that the other tests run without this stub, to provide
           # some "integration" coverage
-          allow(group.members).to receive(:build).with(user_id: service_account.id).and_return(member)
+          allow(group.members).to receive(:build).with(user: service_account).and_return(member)
 
           member
         end
@@ -89,7 +89,7 @@
         it 'calls destroy service' do
           expect_next_instance_of(Members::DestroyService, current_user) do |destroy_service|
             expect(destroy_service).to receive(:execute).with(
-              group.members.find_by(user_id: service_account.id),
+              group.members.find_by(user: service_account),
               skip_authorization: true,
               skip_subresources: false,
               unassign_issuables: false
diff --git a/ee/spec/services/projects/update_service_spec.rb b/ee/spec/services/projects/update_service_spec.rb
index 9875e7d0a04244..079c7a7f63af1c 100644
--- a/ee/spec/services/projects/update_service_spec.rb
+++ b/ee/spec/services/projects/update_service_spec.rb
@@ -830,6 +830,49 @@ def update_default_branch(branch = 'feature')
     end
   end
 
+  describe 'when updating duo_features_enabled' do
+    using RSpec::Parameterized::TableSyntax
+
+    let(:add_instance) { Ai::AmazonQ::ServiceAccountMemberAddService.new(project) }
+    let(:remove_instance) { Ai::AmazonQ::ServiceAccountMemberRemoveService.new(user, project) }
+
+    before do
+      allow(Ai::AmazonQ::ServiceAccountMemberAddService).to receive(:new).with(project).and_return(add_instance)
+      allow(Ai::AmazonQ::ServiceAccountMemberRemoveService).to receive(:new).with(user, project).and_return(remove_instance)
+      allow(add_instance).to receive(:execute).and_call_original
+      allow(remove_instance).to receive(:execute).and_call_original
+    end
+
+    where(:attrs, :amazon_q_connected, :expected_service) do
+      { duo_features_enabled: 'true' }  | true | Ai::AmazonQ::ServiceAccountMemberAddService
+      { duo_features_enabled: 'false' } | true | Ai::AmazonQ::ServiceAccountMemberRemoveService
+      { duo_features_enabled: 'true' }  | false | nil
+      { duo_features_enabled: 'false' } | false | nil
+      {} | true | nil
+      {} | false | nil
+    end
+
+    with_them do
+      def expect_on_service(service, instance)
+        if service == expected_service
+          expect(service).to have_received(:new)
+          expect(instance).to have_received(:execute)
+        else
+          expect(service).not_to have_received(:new)
+        end
+      end
+
+      it 'triggers the expected service' do
+        allow(::Ai::AmazonQ).to receive(:connected?).and_return(amazon_q_connected)
+
+        update_project(project, user, { project_setting_attributes: attrs })
+
+        expect_on_service(Ai::AmazonQ::ServiceAccountMemberAddService, add_instance)
+        expect_on_service(Ai::AmazonQ::ServiceAccountMemberRemoveService, remove_instance)
+      end
+    end
+  end
+
   def update_project(project, user, opts)
     Projects::UpdateService.new(project, user, opts).execute
   end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4c85f46a3618c2..a3c7e8792f0985 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -44049,6 +44049,9 @@ msgstr ""
 msgid "ProjectSettings|Always show thumbs-up and thumbs-down emoji buttons on issues, merge requests, and snippets."
 msgstr ""
 
+msgid "ProjectSettings|Amazon Q"
+msgstr ""
+
 msgid "ProjectSettings|Analytics"
 msgstr ""
 
@@ -44475,6 +44478,9 @@ msgstr ""
 msgid "ProjectSettings|This project"
 msgstr ""
 
+msgid "ProjectSettings|This project can use Amazon Q."
+msgstr ""
+
 msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin."
 msgstr ""
 
diff --git a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
index e21900b5236b8e..5c35b545aacf48 100644
--- a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
+++ b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
@@ -881,7 +881,14 @@ describe('Settings Panel', () => {
   describe('Duo', () => {
     it('shows duo toggle', () => {
       wrapper = mountComponent({});
+
       expect(findDuoSettings().exists()).toBe(true);
+      expect(findDuoSettings().props()).toEqual({
+        helpPath: '/help/user/ai_features',
+        helpText: 'Use AI-powered features in this project.',
+        label: 'GitLab Duo',
+        locked: false,
+      });
     });
 
     describe('when areDuoSettingsLocked is false', () => {
@@ -942,6 +949,21 @@ describe('Settings Panel', () => {
       });
     });
   });
+
+  describe('Amazon Q', () => {
+    it('shows Amazon Q text for duo field when Amazon Q is enabled', () => {
+      wrapper = mountComponent({ amazonQAvailable: true });
+
+      expect(findDuoSettings().exists()).toBe(true);
+      expect(findDuoSettings().props()).toEqual({
+        helpPath: '/help/user/duo_amazon_q/index.md',
+        helpText: 'This project can use Amazon Q.',
+        label: 'Amazon Q',
+        locked: false,
+      });
+    });
+  });
+
   describe('Pipeline execution policies', () => {
     it('does not show the pipeline execution policy settings by default', () => {
       wrapper = mountComponent();
-- 
GitLab


From 03af95b1ed053cf0c060feaf7b62d9e563678b70 Mon Sep 17 00:00:00 2001
From: Jessie Young <jessieyoung@gitlab.com>
Date: Thu, 19 Dec 2024 15:40:05 -0800
Subject: [PATCH 2/3] Reference user instead of id

---
 .../ai/amazon_q/amazon_q_trigger_service.rb         |  2 +-
 ee/app/services/ai/amazon_q/create_service.rb       |  3 +--
 .../amazon_q/service_account_member_add_service.rb  | 13 +++++++------
 .../service_account_member_remove_service.rb        |  5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ee/app/services/ai/amazon_q/amazon_q_trigger_service.rb b/ee/app/services/ai/amazon_q/amazon_q_trigger_service.rb
index 58021b33fa6931..bf1138614c7879 100644
--- a/ee/app/services/ai/amazon_q/amazon_q_trigger_service.rb
+++ b/ee/app/services/ai/amazon_q/amazon_q_trigger_service.rb
@@ -183,7 +183,7 @@ def failure_message
       end
 
       def amazon_q_service_account
-        User.find_by_id(ai_settings.amazon_q_service_account_user_id)
+        Ai::Setting.instance.amazon_q_service_account_user
       end
       strong_memoize_attr :amazon_q_service_account
 
diff --git a/ee/app/services/ai/amazon_q/create_service.rb b/ee/app/services/ai/amazon_q/create_service.rb
index cc5b15ecc5bef3..2a0ff1421cd22f 100644
--- a/ee/app/services/ai/amazon_q/create_service.rb
+++ b/ee/app/services/ai/amazon_q/create_service.rb
@@ -68,8 +68,7 @@ def ensure_service_account_block_status(service_account: nil)
       end
 
       def existing_q_service_account
-        user_id = ai_settings.amazon_q_service_account_user_id
-        user_id && User.find_by_id(user_id)
+        Ai::Setting.instance.amazon_q_service_account_user
       end
 
       def find_or_create_oauth_app
diff --git a/ee/app/services/ai/amazon_q/service_account_member_add_service.rb b/ee/app/services/ai/amazon_q/service_account_member_add_service.rb
index 7210ddcfa00790..b1be3380fcaffa 100644
--- a/ee/app/services/ai/amazon_q/service_account_member_add_service.rb
+++ b/ee/app/services/ai/amazon_q/service_account_member_add_service.rb
@@ -8,21 +8,22 @@ def initialize(project)
       end
 
       def execute
-        q_user_id = Ai::Setting.instance.amazon_q_service_account_user_id
-
-        existing_member = project.member(q_user_id)
+        existing_member = project.member(service_account_user)
         return ServiceResponse.success(message: "Membership already exists. Nothing to do.") if existing_member
 
-        existing_user = User.find_by_id(q_user_id)
-        return ServiceResponse.error(message: "Service account user not found") unless existing_user
+        return ServiceResponse.error(message: "Service account user not found") unless service_account_user
 
-        result = project.add_developer(existing_user)
+        result = project.add_developer(service_account_user)
         ServiceResponse.success(payload: result)
       end
 
       private
 
       attr_reader :project
+
+      def service_account_user
+        Ai::Setting.instance.amazon_q_service_account_user
+      end
     end
   end
 end
diff --git a/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb b/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
index 6e2cbff5795635..0f40116930dc79 100644
--- a/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
+++ b/ee/app/services/ai/amazon_q/service_account_member_remove_service.rb
@@ -28,7 +28,6 @@ def execute
       attr_reader :user, :membership_container
 
       def find_or_initialize_member_by_user
-        service_account_user = User.find_by_id(q_user_id)
         existing_member = membership_container.member(service_account_user)
 
         return existing_member unless membership_container.is_a?(Group) && !existing_member
@@ -37,8 +36,8 @@ def find_or_initialize_member_by_user
         membership_container.members.build(user: service_account_user)
       end
 
-      def q_user_id
-        Ai::Setting.instance.amazon_q_service_account_user_id
+      def service_account_user
+        Ai::Setting.instance.amazon_q_service_account_user
       end
     end
   end
-- 
GitLab


From 610b211edeea47b33b5c7faf5b529ecad55dc9f2 Mon Sep 17 00:00:00 2001
From: Jessie Young <jessieyoung@gitlab.com>
Date: Thu, 19 Dec 2024 20:10:28 -0800
Subject: [PATCH 3/3] Clear cache

---
 ee/app/controllers/admin/ai/amazon_q_settings_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb b/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
index b8f2abaff3bcf7..8e6d706a9b8b34 100644
--- a/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
+++ b/ee/app/controllers/admin/ai/amazon_q_settings_controller.rb
@@ -6,6 +6,7 @@ class AmazonQSettingsController < Admin::ApplicationController
       feature_category :ai_abstraction_layer
 
       before_action :check_can_admin_amazon_q
+      before_action :expire_current_settings
 
       def index
         setup_view_model
@@ -79,6 +80,11 @@ def check_can_admin_amazon_q
         render_404 unless ::Ai::AmazonQ.feature_available?
       end
 
+      def expire_current_settings
+        # clear cached settings  so that duo_availability shows up correctly
+        Gitlab::CurrentSettings.expire_current_application_settings
+      end
+
       def permitted_params
         params.permit(:role_arn, :availability)
       end
-- 
GitLab