Merge branch '443568-bulk-assignment-feature-flag' into 'master'

Ability to check for duo pro bulk assignment in SM instances

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



Merged-by: Jarka Košanová <jarka@gitlab.com>
Approved-by: Shreyas Agarwal <sagarwal@gitlab.com>
Approved-by: Jarka Košanová <jarka@gitlab.com>
Co-authored-by: Divya <dmahadevan@gitlab.com>

config/feature_flags/development/sm_duo_pro_bulk_user_assignment.yml

+---
+name: sm_duo_pro_bulk_user_assignment
+feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/12959
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156779
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/443570
+milestone: '17.2'
+group: group::provision
+type: development
+default_enabled: false

ee/app/helpers/gitlab_subscriptions/code_suggestions_helper.rb

@@ -15,7 +15,11 @@ def gitlab_duo_available?(namespace = nil)
     def duo_pro_bulk_user_assignment_available?(namespace = nil)
       return false unless gitlab_duo_available?(namespace)
 
-      Feature.enabled?(:gitlab_com_duo_pro_bulk_user_assignment, namespace) if gitlab_com_subscription?
+      if gitlab_com_subscription?
+        Feature.enabled?(:gitlab_com_duo_pro_bulk_user_assignment, namespace)
+      else
+        Feature.enabled?(:sm_duo_pro_bulk_user_assignment)
+      end
     end
 
     def add_duo_pro_seats_url(subscription_name)

ee/spec/helpers/gitlab_subscriptions/code_suggestions_helper_spec.rb

@@ -120,14 +120,30 @@
       end
     end
 
-    context 'when GitLab is not .com' do
+    context 'when GitLab is self managed' do
       before do
         stub_saas_features(gitlab_com_subscriptions: false)
       end
 
       context 'when duo pro is available' do
-        it 'returns false' do
-          expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
+        context 'when sm feature flag is enabled' do
+          before do
+            stub_feature_flags(sm_duo_pro_bulk_user_assignment: true)
+          end
+
+          it 'returns true' do
+            expect(helper.duo_pro_bulk_user_assignment_available?).to be_truthy
+          end
+        end
+
+        context 'when sm feature flag is disabled' do
+          before do
+            stub_feature_flags(sm_duo_pro_bulk_user_assignment: false)
+          end
+
+          it 'returns false' do
+            expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
+          end
         end
       end
 
@@ -136,6 +152,26 @@
           stub_feature_flags(self_managed_code_suggestions: false)
         end
 
+        context 'when sm feature flag is enabled' do
+          before do
+            stub_feature_flags(sm_duo_pro_bulk_user_assignment: true)
+          end
+
+          it 'returns false' do
+            expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
+          end
+        end
+
+        context 'when sm feature flag is disabled' do
+          before do
+            stub_feature_flags(sm_duo_pro_bulk_user_assignment: false)
+          end
+
+          it 'returns false' do
+            expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
+          end
+        end
+
         it 'returns false' do
           expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
         end