Merge branch 'current-settings-use-request-store-during-request'

4a50e1f0 · Douwe Maan · c0f19cc9 · c8eb1dcc · 4a50e1f0 · 4a50e1f0
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ v 8.8.3
  - Fix gitlab importer failing to import new projects due to missing credentials
  - Fix import URL migration not rescuing with the correct Error
  - In search results, only show notes on confidential issues that the user has access to
+  - Fix health check access token changing due to old application settings being used
 v 8.8.2
  - Added remove due date button. !4209

--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -102,6 +102,10 @@ def self.expire
    Rails.cache.delete(CACHE_KEY)
  end
+  def self.cached
+    Rails.cache.fetch(CACHE_KEY)
+  end
  def self.create_from_defaults
    create(
      default_projects_limit: Settings.gitlab['default_projects_limit'],

--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
 module Gitlab
  module CurrentSettings
    def current_application_settings
-      key = :current_application_settings
+      if RequestStore.active?
+        RequestStore.fetch(:current_application_settings) { ensure_application_settings! }
-      RequestStore.store[key] ||= begin
+      else
-        settings = nil
+        ensure_application_settings!
+      end
+    end
-        if connect_to_db?
+    def ensure_application_settings!
-          settings = ::ApplicationSetting.current
+      settings = ::ApplicationSetting.cached
-          settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
-        end
-        settings || fake_application_settings
+      if !settings && connect_to_db?
+        settings = ::ApplicationSetting.current
+        settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
      end
+      settings || fake_application_settings
    end
    def fake_application_settings

--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -11,7 +11,7 @@
    let(:user_params) { { user: { name: "new_user", username: "new_username", email: "new@user.com", password: "Any_password" } } }
    context 'when sending email confirmation' do
-      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(false) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false) }
      it 'logs user in directly' do
        post(:create, user_params)
@@ -21,7 +21,7 @@
    end
    context 'when not sending email confirmation' do
-      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
      it 'does not authenticate user and sends confirmation email' do
        post(:create, user_params)

--- a/spec/lib/gitlab/akismet_helper_spec.rb
+++ b/spec/lib/gitlab/akismet_helper_spec.rb
@@ -6,8 +6,8 @@
  before do
    allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
-    current_application_settings.akismet_enabled = true
+    allow_any_instance_of(ApplicationSetting).to receive(:akismet_enabled).and_return(true)
-    current_application_settings.akismet_api_key = '12345'
+    allow_any_instance_of(ApplicationSetting).to receive(:akismet_api_key).and_return('12345')
  end
  describe '#check_for_spam?' do

--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -51,7 +51,7 @@
          context 'when enabled email_author_in_body' do
            before do
-              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+              allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
            end
            it 'contains a link to note author' do
@@ -230,7 +230,7 @@
          context 'when enabled email_author_in_body' do
            before do
-              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+              allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
            end
            it 'contains a link to note author' do
@@ -454,7 +454,7 @@
        context 'when enabled email_author_in_body' do
          before do
-            allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+            allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
          end
          it 'contains a link to note author' do

--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -67,7 +67,7 @@
    describe 'email' do
      context 'when no signup domains listed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return([]) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([]) }
        it 'accepts any email' do
          user = build(:user, email: "info@example.com")
          expect(user).to be_valid
@@ -75,7 +75,7 @@
      end
      context 'when a signup domain is listed and subdomains are allowed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com']) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com']) }
        it 'accepts info@example.com' do
          user = build(:user, email: "info@example.com")
          expect(user).to be_valid
@@ -93,7 +93,7 @@
      end
      context 'when a signup domain is listed and subdomains are not allowed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return(['example.com']) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com']) }
        it 'accepts info@example.com' do
          user = build(:user, email: "info@example.com")
@@ -141,7 +141,7 @@
  end
  describe '#confirm' do
-    before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
+    before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
    let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
    it 'returns unconfirmed' do

--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -13,7 +13,7 @@
    end
    context "cannot create group with restricted visibility level" do
-      before { allow(current_application_settings).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
      it { is_expected.not_to be_persisted }
    end
  end