From 93751f39f0eeafc2f0bc013a1033fb7c6be4228e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 7 Feb 2024 17:18:44 +0000
Subject: [PATCH] Stop passing type to Feature methods for FF with a definition
file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
app/models/concerns/limitable.rb | 6 ++++--
app/models/concerns/routable.rb | 2 +-
app/workers/concerns/worker_attributes.rb | 4 ++--
.../deduplicate_process_commit_worker.yml | 2 +-
ee/spec/lib/ee/feature_spec.rb | 1 -
ee/spec/requests/api/features_spec.rb | 2 --
lib/feature.rb | 4 ++--
lib/feature/definition.rb | 13 +++++++++----
lib/gitlab/lograge/custom_options.rb | 2 +-
lib/gitlab/redis/multi_store.rb | 15 +++++++++++++--
spec/lib/feature/definition_spec.rb | 10 +++++-----
spec/lib/feature/gitaly_spec.rb | 6 +++---
spec/lib/feature_spec.rb | 19 +++++++++----------
.../sidekiq_client_middleware_spec.rb | 1 -
.../sidekiq_server_middleware_spec.rb | 1 -
spec/lib/gitlab/gon_helper_spec.rb | 3 ---
spec/lib/gitlab/redis/cluster_util_spec.rb | 1 -
spec/lib/gitlab/redis/cross_slot_spec.rb | 1 -
spec/lib/gitlab/redis/multi_store_spec.rb | 1 -
.../duplicate_jobs/duplicate_job_spec.rb | 1 -
.../hll_redis_counter_spec.rb | 1 -
spec/models/concerns/limitable_spec.rb | 1 -
spec/requests/api/features_spec.rb | 3 +--
spec/requests/api/usage_data_spec.rb | 5 -----
spec/support/helpers/stub_feature_flags.rb | 4 ----
.../concerns/worker_attributes_spec.rb | 2 --
26 files changed, 51 insertions(+), 60 deletions(-)
rename config/feature_flags/{development => worker}/deduplicate_process_commit_worker.yml (93%)
diff --git a/app/models/concerns/limitable.rb b/app/models/concerns/limitable.rb
index 7ed7f65ca570..3de2cd7fbf0c 100644
--- a/app/models/concerns/limitable.rb
+++ b/app/models/concerns/limitable.rb
@@ -40,8 +40,10 @@ def fetch_plan_limit_data
def scoped_plan_limits
scope_relation = self.public_send(limit_scope) # rubocop:disable GitlabSecurity/PublicSend
return unless scope_relation
- return if limit_feature_flag && ::Feature.disabled?(limit_feature_flag, scope_relation)
- return if limit_feature_flag_for_override && ::Feature.enabled?(limit_feature_flag_for_override, scope_relation)
+ return if limit_feature_flag && ::Feature.disabled?(limit_feature_flag, scope_relation, type: :undefined)
+
+ return if limit_feature_flag_for_override &&
+ ::Feature.enabled?(limit_feature_flag_for_override, scope_relation, type: :undefined)
relation = limit_relation ? self.public_send(limit_relation) : self.class.where(limit_scope => scope_relation) # rubocop:disable GitlabSecurity/PublicSend
limits = scope_relation.actual_limits
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb
index 43874d0211c7..c78d0665b42c 100644
--- a/app/models/concerns/routable.rb
+++ b/app/models/concerns/routable.rb
@@ -155,7 +155,7 @@ def full_attribute(attribute)
route&.public_send(attribute) || send("build_full_#{attribute}")
end
- unless persisted? && Feature.enabled?(:cached_route_lookups, self, type: :ops)
+ unless persisted? && Feature.enabled?(:cached_route_lookups, self)
return attribute_from_route_or_self.call(attribute)
end
diff --git a/app/workers/concerns/worker_attributes.rb b/app/workers/concerns/worker_attributes.rb
index a1c5039dc22e..03f0c39d801d 100644
--- a/app/workers/concerns/worker_attributes.rb
+++ b/app/workers/concerns/worker_attributes.rb
@@ -111,7 +111,7 @@ def get_data_consistency
def get_data_consistency_feature_flag_enabled?
return true unless get_class_attribute(:data_consistency_feature_flag)
- Feature.enabled?(get_class_attribute(:data_consistency_feature_flag))
+ Feature.enabled?(get_class_attribute(:data_consistency_feature_flag), type: :worker)
end
# Set this attribute on a job when it will call to services outside of the
@@ -197,7 +197,7 @@ def get_deduplication_options
def deduplication_enabled?
return true unless get_deduplication_options[:feature_flag]
- Feature.enabled?(get_deduplication_options[:feature_flag])
+ Feature.enabled?(get_deduplication_options[:feature_flag], type: :worker)
end
def big_payload!
diff --git a/config/feature_flags/development/deduplicate_process_commit_worker.yml b/config/feature_flags/worker/deduplicate_process_commit_worker.yml
similarity index 93%
rename from config/feature_flags/development/deduplicate_process_commit_worker.yml
rename to config/feature_flags/worker/deduplicate_process_commit_worker.yml
index 6c70b53c25c5..e92086557a57 100644
--- a/config/feature_flags/development/deduplicate_process_commit_worker.yml
+++ b/config/feature_flags/worker/deduplicate_process_commit_worker.yml
@@ -3,6 +3,6 @@ name: deduplicate_process_commit_worker
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128233
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/420750
milestone: '16.3'
-type: development
+type: worker
group: group::source code
default_enabled: false
diff --git a/ee/spec/lib/ee/feature_spec.rb b/ee/spec/lib/ee/feature_spec.rb
index 8f164a820da1..82049c0812dd 100644
--- a/ee/spec/lib/ee/feature_spec.rb
+++ b/ee/spec/lib/ee/feature_spec.rb
@@ -19,7 +19,6 @@
describe '.enabled?' do
before do
described_class.reset
- skip_feature_flags_yaml_validation
allow(described_class).to receive(:log_feature_flag_states?).and_return(false)
stub_feature_flag_definition(:disabled_feature_flag)
diff --git a/ee/spec/requests/api/features_spec.rb b/ee/spec/requests/api/features_spec.rb
index f3dfe624f70e..e45379821fe9 100644
--- a/ee/spec/requests/api/features_spec.rb
+++ b/ee/spec/requests/api/features_spec.rb
@@ -15,8 +15,6 @@
Flipper.register(:perf_team) do |actor|
actor.respond_to?(:admin) && actor.admin?
end
-
- skip_feature_flags_yaml_validation
end
describe 'POST /feature' do
diff --git a/lib/feature.rb b/lib/feature.rb
index 4b3ebab6dce3..528d70355b23 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -121,7 +121,7 @@ def persisted_name?(feature_name)
# in production environment, but raise exception in development or tests.
# 2. The `default_enabled_if_undefined:` is tech debt related to Gitaly flags
# and should not be used outside of Gitaly's `lib/feature/gitaly.rb`
- def enabled?(key, thing = nil, type: :development, default_enabled_if_undefined: nil)
+ def enabled?(key, thing = nil, type: nil, default_enabled_if_undefined: nil)
thing = sanitized_thing(thing)
check_feature_flags_definition!(key, thing, type)
@@ -138,7 +138,7 @@ def enabled?(key, thing = nil, type: :development, default_enabled_if_undefined:
feature_value
end
- def disabled?(key, thing = nil, type: :development, default_enabled_if_undefined: nil)
+ def disabled?(key, thing = nil, type: nil, default_enabled_if_undefined: nil)
thing = sanitized_thing(thing)
# we need to make different method calls to make it easy to mock / define expectations in test mode
diff --git a/lib/feature/definition.rb b/lib/feature/definition.rb
index 14848f22f833..d48d4f45ebb6 100644
--- a/lib/feature/definition.rb
+++ b/lib/feature/definition.rb
@@ -74,10 +74,13 @@ def validate_default_enabled!
end
def valid_usage!(type_in_code:)
- unless Array(type).include?(type_in_code.to_s)
+ return if type_in_code.nil?
+
+ if type != type_in_code.to_s
# Raise exception in test and dev
- raise Feature::InvalidFeatureFlagError, "The `type:` of `#{key}` is not equal to config: " \
- "#{type_in_code} vs #{type}. Ensure to use valid type in #{path} or ensure that you use " \
+ raise Feature::InvalidFeatureFlagError,
+ "The given `type: :#{type_in_code}` for `#{key}` is not equal to the " \
+ ":#{type} set in its definition file. Ensure to use a valid type in #{path} or ensure that you use " \
"a valid syntax: #{TYPES.dig(type, :example)}"
end
end
@@ -122,7 +125,7 @@ def has_definition?(key)
def log_states?(key)
return false if key == :feature_flag_state_logs
- return false if Feature.disabled?(:feature_flag_state_logs, type: :ops)
+ return false if Feature.disabled?(:feature_flag_state_logs)
return false unless (feature = get(key))
feature.force_log_state_changes? || feature.for_upcoming_milestone?
@@ -131,6 +134,8 @@ def log_states?(key)
def valid_usage!(key, type:)
if definition = get(key)
definition.valid_usage!(type_in_code: type)
+ elsif type.nil?
+ raise InvalidFeatureFlagError, "Missing type for undefined feature `#{key}`"
elsif type_definition = self::TYPES[type]
raise InvalidFeatureFlagError, "Missing feature definition for `#{key}`" unless type_definition[:optional]
else
diff --git a/lib/gitlab/lograge/custom_options.rb b/lib/gitlab/lograge/custom_options.rb
index 6f180f89db04..c52228c9455a 100644
--- a/lib/gitlab/lograge/custom_options.rb
+++ b/lib/gitlab/lograge/custom_options.rb
@@ -32,7 +32,7 @@ def self.call(event)
::Gitlab::ExceptionLogFormatter.format!(exception, payload)
- if Feature.enabled?(:feature_flag_state_logs, type: :ops)
+ if Feature.enabled?(:feature_flag_state_logs)
payload[:feature_flag_states] = Feature.logged_states.map { |key, state| "#{key}:#{state ? 1 : 0}" }
end
diff --git a/lib/gitlab/redis/multi_store.rb b/lib/gitlab/redis/multi_store.rb
index 6d8ccf718b4e..e6262f7f61b5 100644
--- a/lib/gitlab/redis/multi_store.rb
+++ b/lib/gitlab/redis/multi_store.rb
@@ -252,17 +252,28 @@ def to_s
end
def use_primary_and_secondary_stores?
+ feature_flag = "use_primary_and_secondary_stores_for_#{instance_name.underscore}"
+
feature_table_exists? &&
- Feature.enabled?("use_primary_and_secondary_stores_for_#{instance_name.underscore}") && # rubocop:disable Cop/FeatureFlagUsage
+ Feature.enabled?(feature_flag, type: feature_flag_type(feature_flag)) && # rubocop:disable Cop/FeatureFlagUsage -- The flags are dynamic
!same_redis_store?
end
def use_primary_store_as_default?
+ feature_flag = "use_primary_store_as_default_for_#{instance_name.underscore}"
+
feature_table_exists? &&
- Feature.enabled?("use_primary_store_as_default_for_#{instance_name.underscore}") && # rubocop:disable Cop/FeatureFlagUsage
+ Feature.enabled?(feature_flag, type: feature_flag_type(feature_flag)) && # rubocop:disable Cop/FeatureFlagUsage -- The flags are dynamic
!same_redis_store?
end
+ def feature_flag_type(feature_flag)
+ feature_definition = Feature::Definition.get(feature_flag)
+ return if feature_definition
+
+ :undefined
+ end
+
def increment_pipelined_command_error_count(command_name)
@pipelined_command_error ||= Gitlab::Metrics.counter(:gitlab_redis_multi_store_pipelined_diff_error_total,
'Redis MultiStore pipelined command diff between stores')
diff --git a/spec/lib/feature/definition_spec.rb b/spec/lib/feature/definition_spec.rb
index b75c780a33e2..c68b37ce4f3a 100644
--- a/spec/lib/feature/definition_spec.rb
+++ b/spec/lib/feature/definition_spec.rb
@@ -55,11 +55,11 @@
end
describe '#valid_usage!' do
- context 'validates type' do
- it 'raises exception for invalid type' do
- expect { definition.valid_usage!(type_in_code: :invalid) }
- .to raise_error(/The `type:` of `feature_flag` is not equal to config/)
- end
+ it 'raises exception for invalid type' do
+ expect { definition.valid_usage!(type_in_code: :invalid) }
+ .to raise_error(
+ /The given `type: :invalid` for `feature_flag` is not equal to the :development set in its definition file./
+ )
end
end
diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb
index 336962904832..dacd1fcb212b 100644
--- a/spec/lib/feature/gitaly_spec.rb
+++ b/spec/lib/feature/gitaly_spec.rb
@@ -10,9 +10,9 @@
let_it_be(:repository_2) { project_2.repository.raw }
before do
- skip_feature_flags_yaml_validation
- allow(Feature::Definition).to receive(:get).with(any_args).and_return(
- Feature::Definition.new('flag.yml', name: :flag, type: :development)
+ allow(Feature::Definition).to receive(:get).and_call_original
+ allow(Feature::Definition).to receive(:get).with(:flag).and_return(
+ Feature::Definition.new('flag.yml', name: :flag, type: :undefined)
)
end
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 64c249770b7a..36856403d5dd 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -27,7 +27,6 @@ def wrap_all_methods_with_flag_check(lb, flag)
# reset Flipper AR-engine
Feature.reset
- skip_feature_flags_yaml_validation
end
describe '.current_request' do
@@ -253,15 +252,15 @@ def wrap_all_methods_with_flag_check(lb, flag)
it 'returns false (and tracks / raises exception for dev) for undefined feature' do
expect(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception)
- expect(described_class.enabled?(:some_random_feature_flag)).to be_falsey
+ expect(described_class.enabled?(:some_random_feature_fla, type: :undefined)).to be_falsey
end
it 'returns false for undefined feature with default_enabled_if_undefined: false' do
- expect(described_class.enabled?(:some_random_feature_flag, default_enabled_if_undefined: false)).to be_falsey
+ expect(described_class.enabled?(:some_random_feature_flag, type: :undefined, default_enabled_if_undefined: false)).to be_falsey
end
it 'returns true for undefined feature with default_enabled_if_undefined: true' do
- expect(described_class.enabled?(:some_random_feature_flag, default_enabled_if_undefined: true)).to be_truthy
+ expect(described_class.enabled?(:some_random_feature_flag, type: :undefined, default_enabled_if_undefined: true)).to be_truthy
end
it 'returns false for existing disabled feature in the database' do
@@ -307,7 +306,7 @@ def wrap_all_methods_with_flag_check(lb, flag)
base_class = Feature::BypassLoadBalancer.enabled? ? Feature::BypassLoadBalancer::FlipperRecord : ActiveRecord::Base
expect(base_class).to receive(:connection) { raise ActiveRecord::NoDatabaseError, "No database" }
- expect(described_class.enabled?(:a_feature, default_enabled_if_undefined: fake_default)).to eq(fake_default)
+ expect(described_class.enabled?(:a_feature, type: :undefined, default_enabled_if_undefined: fake_default)).to eq(fake_default)
end
context 'logging is enabled', :request_store do
@@ -497,7 +496,7 @@ def wrap_all_methods_with_flag_check(lb, flag)
it 'when invalid type is used' do
expect { described_class.enabled?(:my_feature_flag, type: :ops) }
- .to raise_error(/The `type:` of/)
+ .to raise_error(/The given `type: :ops`/)
end
context 'when default_enabled: is false in the YAML definition' do
@@ -581,19 +580,19 @@ def wrap_all_methods_with_flag_check(lb, flag)
end
end
- describe '.disable?' do
+ describe '.disabled?' do
it 'returns true (and tracks / raises exception for dev) for undefined feature' do
expect(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception)
- expect(described_class.disabled?(:some_random_feature_flag)).to be_truthy
+ expect(described_class.disabled?(:some_random_feature_flag, type: :undefined)).to be_truthy
end
it 'returns true for undefined feature with default_enabled_if_undefined: false' do
- expect(described_class.disabled?(:some_random_feature_flag, default_enabled_if_undefined: false)).to be_truthy
+ expect(described_class.disabled?(:some_random_feature_flag, type: :undefined, default_enabled_if_undefined: false)).to be_truthy
end
it 'returns false for undefined feature with default_enabled_if_undefined: true' do
- expect(described_class.disabled?(:some_random_feature_flag, default_enabled_if_undefined: true)).to be_falsey
+ expect(described_class.disabled?(:some_random_feature_flag, type: :undefined, default_enabled_if_undefined: true)).to be_falsey
end
it 'returns true for existing disabled feature in the database' do
diff --git a/spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb b/spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb
index 5a52394742f4..397db793d9ca 100644
--- a/spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb
@@ -9,7 +9,6 @@
let(:job) { { "job_id" => "a180b47c-3fd6-41b8-81e9-34da61c3400e" } }
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
diff --git a/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb b/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
index aaca544ef805..e25149217d6e 100644
--- a/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
@@ -13,7 +13,6 @@
let(:none_caught_up) { Gitlab::Database::LoadBalancing::LoadBalancer::NONE_CAUGHT_UP }
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
replication_lag!(false)
diff --git a/spec/lib/gitlab/gon_helper_spec.rb b/spec/lib/gitlab/gon_helper_spec.rb
index e167699e1d08..ba250c499a31 100644
--- a/spec/lib/gitlab/gon_helper_spec.rb
+++ b/spec/lib/gitlab/gon_helper_spec.rb
@@ -125,7 +125,6 @@
describe '#push_frontend_feature_flag' do
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
@@ -152,8 +151,6 @@
let(:gon) { class_double('Gon') }
before do
- skip_feature_flags_yaml_validation
-
allow(helper)
.to receive(:gon)
.and_return(gon)
diff --git a/spec/lib/gitlab/redis/cluster_util_spec.rb b/spec/lib/gitlab/redis/cluster_util_spec.rb
index f167065fd3f7..a51754501450 100644
--- a/spec/lib/gitlab/redis/cluster_util_spec.rb
+++ b/spec/lib/gitlab/redis/cluster_util_spec.rb
@@ -23,7 +23,6 @@
allow(redis_cluster).to receive(:id).and_return(1)
allow(Gitlab::Redis::MultiStore).to receive(:same_redis_store?).and_return(false)
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
diff --git a/spec/lib/gitlab/redis/cross_slot_spec.rb b/spec/lib/gitlab/redis/cross_slot_spec.rb
index ccf2de1f28f5..4e9830f4110a 100644
--- a/spec/lib/gitlab/redis/cross_slot_spec.rb
+++ b/spec/lib/gitlab/redis/cross_slot_spec.rb
@@ -45,7 +45,6 @@
before do
primary_store.set('a', 1)
secondary_store.set('a', 1)
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
diff --git a/spec/lib/gitlab/redis/multi_store_spec.rb b/spec/lib/gitlab/redis/multi_store_spec.rb
index c3705f6bb54d..348215d553c0 100644
--- a/spec/lib/gitlab/redis/multi_store_spec.rb
+++ b/spec/lib/gitlab/redis/multi_store_spec.rb
@@ -22,7 +22,6 @@
end
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index 5724c58f1a4c..a1421a464903 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -42,7 +42,6 @@
context 'when the deduplication depends on a FF' do
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
allow(AuthorizedProjectsWorker).to receive(:get_deduplication_options).and_return(feature_flag: :my_feature_flag)
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
index 74b6a4e9c88c..9b039ef1c344 100644
--- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
@@ -90,7 +90,6 @@
end
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
allow(described_class).to receive(:known_events).and_return(known_events)
end
diff --git a/spec/models/concerns/limitable_spec.rb b/spec/models/concerns/limitable_spec.rb
index c0a6aea2075c..1a28c2315808 100644
--- a/spec/models/concerns/limitable_spec.rb
+++ b/spec/models/concerns/limitable_spec.rb
@@ -59,7 +59,6 @@ def instance.project
stub_feature_flags("#{limit_feature_flag}": limit_feature_flag_value ? [instance.project] : false) if limit_feature_flag
stub_feature_flags("#{limit_feature_flag_for_override}": limit_feature_flag_override_value ? [instance.project] : false) if limit_feature_flag_for_override
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
MinimalTestClass.limit_relation = :custom_relation
diff --git a/spec/requests/api/features_spec.rb b/spec/requests/api/features_spec.rb
index d922947f3e94..3fb05aed6cca 100644
--- a/spec/requests/api/features_spec.rb
+++ b/spec/requests/api/features_spec.rb
@@ -26,7 +26,6 @@
actor.respond_to?(:admin) && actor.admin?
end
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
@@ -748,7 +747,7 @@
delete api("/features/#{feature_name}", admin, admin_mode: true)
Feature.reset
end.to change { Feature.persisted_name?(feature_name) }
- .and change { Feature.enabled?(feature_name) }
+ .and change { Feature.enabled?(feature_name, type: :undefined) }
expect(response).to have_gitlab_http_status(:no_content)
end
diff --git a/spec/requests/api/usage_data_spec.rb b/spec/requests/api/usage_data_spec.rb
index a2b2b0c6f4a2..ecade80c2fa2 100644
--- a/spec/requests/api/usage_data_spec.rb
+++ b/spec/requests/api/usage_data_spec.rb
@@ -137,7 +137,6 @@
context 'with unknown event' do
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
@@ -214,10 +213,6 @@
end
context 'with unknown event' do
- before do
- skip_feature_flags_yaml_validation
- end
-
it 'returns status ok' do
expect(Gitlab::Redis::HLL).not_to receive(:add)
diff --git a/spec/support/helpers/stub_feature_flags.rb b/spec/support/helpers/stub_feature_flags.rb
index 76fc8ebf84dd..ded475daabd9 100644
--- a/spec/support/helpers/stub_feature_flags.rb
+++ b/spec/support/helpers/stub_feature_flags.rb
@@ -77,10 +77,6 @@ def stub_feature_flag_gate(object)
StubFeatureGate.new(object)
end
- def skip_feature_flags_yaml_validation
- allow(Feature::Definition).to receive(:valid_usage!)
- end
-
def skip_default_enabled_yaml_check
allow(Feature::Definition).to receive(:default_enabled?).and_return(false)
end
diff --git a/spec/workers/concerns/worker_attributes_spec.rb b/spec/workers/concerns/worker_attributes_spec.rb
index 1c9d9a5a1ad4..33ff724d3f64 100644
--- a/spec/workers/concerns/worker_attributes_spec.rb
+++ b/spec/workers/concerns/worker_attributes_spec.rb
@@ -84,7 +84,6 @@ def self.name
context 'when feature_flag is provided' do
before do
stub_feature_flags(test_feature_flag: false)
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
end
@@ -113,7 +112,6 @@ def self.name
context 'when feature flag is set' do
before do
- skip_feature_flags_yaml_validation
skip_default_enabled_yaml_check
worker.deduplicate(:until_executing, feature_flag: :my_feature_flag)
--
GitLab