Add alias method usage_ping_enabled?
Related issue #333269 (closed)
What does this MR do?
-
In
SubmitUsagePingService
we check ifGitlab::CurrentSettings.usage_ping_enabled?
-
Gitlab::CurrentSettings.usage_ping_enabled?
goes toGitlab::CurrentSettings
and forwards theusage_ping_enabled?
method toApplicationSettings
.ApplicationSettings
is includingApplicationSettingImplementation
which makes sure that we can override configs from config files or the database.- In
ApplicationSettingImplementation
we have a method where we overrideusage_ping_enabled
to account for the logic to first check if the config file has changed tofalse
and then later check the database - However, when calling
CurrentSettings.usage_ping_enabled?
we do this with the?
version (which comes from ActiveRecord) so we don't go to the overriddenusage_ping_enabled
method and therefore we ignore the config settings.
- In
-
With this MR we add
alias_method :usage_ping_enabled?, :usage_ping_enabled
This way we have theusage_ping_enabled?
available forCurrentSettings
module.
Testing scenarios
Scenario 1
Database enabled config disabled
Usage Ping should not be generated and sent
Scenario 2
Database disabled config enabled
Usage Ping should not be generated and sent
Scenario 3
Database disabled config disabled
Usage Ping should not be generated and sent
Scenario 3
Database enabled, config enabled
Usage Ping should be generated and sent
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
-
I have included changelog trailers, or none are needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team