Merge branch 'afontaine/filter-legacy-flag' into 'master'

No Longer Send Legacy Feature Flags [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62484

app/finders/feature_flags_finder.rb

@@ -24,7 +24,11 @@ class FeatureFlagsFinder
   private
 
   def feature_flags
-    project.operations_feature_flags
+    if exclude_legacy_flags?
+      project.operations_feature_flags.new_version_only
+    else
+      project.operations_feature_flags
+    end
   end
 
   def by_scope(items)
@@ -37,4 +41,9 @@ class FeatureFlagsFinder
       items
     end
   end
+
+  def exclude_legacy_flags?
+    Feature.enabled?(:remove_legacy_flags, project, default_enabled: :yaml) &&
+      Feature.disabled?(:remove_legacy_flags_override, project, default_enabled: :yaml)
+  end
 end

app/models/operations/feature_flag.rb

@@ -49,6 +49,8 @@ module Operations
     scope :enabled, -> { where(active: true) }
     scope :disabled, -> { where(active: false) }
 
+    scope :new_version_only, -> { where(version: :new_version_flag)}
+
     enum version: {
       legacy_flag: 1,
       new_version_flag: 2

config/feature_flags/development/remove_legacy_flags.yml

+---
+name: remove_legacy_flags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62484
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332243
+milestone: '14.0'
+type: development
+group: group::release
+default_enabled: false

config/feature_flags/development/remove_legacy_flags_override.yml

+---
+name: remove_legacy_flags_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62484
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332243
+milestone: '14.0'
+type: development
+group: group::release
+default_enabled: false

lib/api/unleash.rb

@@ -69,11 +69,22 @@ module API
       def feature_flags
         return [] unless unleash_app_name.present?
 
-        legacy_flags = Operations::FeatureFlagScope.for_unleash_client(project, unleash_app_name)
+        legacy_flags =
+          if exclude_legacy_flags?
+            []
+          else
+            Operations::FeatureFlagScope.for_unleash_client(project, unleash_app_name)
+          end
+
         new_version_flags = Operations::FeatureFlag.for_unleash_client(project, unleash_app_name)
 
         legacy_flags + new_version_flags
       end
+
+      def exclude_legacy_flags?
+        Feature.enabled?(:remove_legacy_flags, project, default_enabled: :yaml) &&
+          Feature.disabled?(:remove_legacy_flags_override, project, default_enabled: :yaml)
+      end
     end
   end
 end

spec/finders/feature_flags_finder_spec.rb

@@ -24,6 +24,10 @@ RSpec.describe FeatureFlagsFinder do
     let!(:feature_flag_2) { create(:operations_feature_flag, name: 'flag-b', project: project) }
     let(:args) { {} }
 
+    before do
+      stub_feature_flags(remove_legacy_flags: false)
+    end
+
     it 'returns feature flags ordered by name' do
       is_expected.to eq([feature_flag_1, feature_flag_2])
     end
@@ -79,6 +83,16 @@ RSpec.describe FeatureFlagsFinder do
       it 'returns new and legacy flags' do
         is_expected.to eq([feature_flag_1, feature_flag_2, feature_flag_3])
       end
+
+      context 'when legacy flags are disabled' do
+        before do
+          stub_feature_flags(remove_legacy_flags_override: false, remove_legacy_flags: true)
+        end
+
+        it 'returns only new flags' do
+          is_expected.to eq([feature_flag_3])
+        end
+      end
     end
   end
 end

spec/requests/api/unleash_spec.rb

@@ -590,6 +590,32 @@ RSpec.describe API::Unleash do
             }]
           }])
         end
+
+        it 'returns new flags when legacy flags are disabled' do
+          stub_feature_flags(remove_legacy_flags_override: false, remove_legacy_flags: true)
+
+          feature_flag_a = create(:operations_feature_flag, :new_version_flag, project: project,
+                                  name: 'feature_a', active: true)
+          strategy = create(:operations_strategy, feature_flag: feature_flag_a,
+                            name: 'userWithId', parameters: { userIds: 'user8' })
+          create(:operations_scope, strategy: strategy, environment_scope: 'staging')
+          feature_flag_b = create(:operations_feature_flag, :legacy_flag, project: project,
+                                  name: 'feature_b', active: true)
+          create(:operations_feature_flag_scope, feature_flag: feature_flag_b,
+                 active: true, strategies: [{ name: 'default', parameters: {} }], environment_scope: 'staging')
+
+          get api(features_url), headers: { 'UNLEASH-INSTANCEID' => client.token, 'UNLEASH-APPNAME' => 'staging' }
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['features'].sort_by {|f| f['name']}).to eq([{
+            'name' => 'feature_a',
+            'enabled' => true,
+            'strategies' => [{
+              'name' => 'userWithId',
+              'parameters' => { 'userIds' => 'user8' }
+            }]
+          }])
+        end
       end
     end
   end