Merge branch 'ee-46481-preserve-warnings-even-if-passed' into 'master'

EE: Resolve "A lot of constants redefinition warnings"

See merge request gitlab-org/gitlab-ee!5927

app/helpers/webpack_helper.rb

-require 'gitlab/webpack/manifest'
-
 module WebpackHelper
   def webpack_bundle_tag(bundle)
     javascript_include_tag(*webpack_entrypoint_paths(bundle))

config/initializers/2_gitlab.rb

-require_relative '../../lib/gitlab'
+require_dependency 'gitlab'

config/initializers/omniauth.rb

@@ -19,18 +19,5 @@ end
 
 if Gitlab.config.omniauth.enabled
   provider_names = Gitlab.config.omniauth.providers.map(&:name)
-  require 'omniauth-kerberos' if provider_names.include?('kerberos')
-  require_dependency 'omni_auth/strategies/kerberos_spnego' if provider_names.include?('kerberos_spnego')
-
-  if provider_names.include?('group_saml')
-    OmniAuth.config.on_failure = ::Gitlab::Auth::GroupSaml::FailureHandler.new(OmniAuth.config.on_failure)
-  end
-end
-
-module OmniAuth
-  module Strategies
-    autoload :Bitbucket, Rails.root.join('lib', 'omni_auth', 'strategies', 'bitbucket')
-    autoload :GroupSaml, Rails.root.join('ee', 'lib', 'omni_auth', 'strategies', 'group_saml')
-    autoload :Jwt, Rails.root.join('lib', 'omni_auth', 'strategies', 'jwt')
-  end
+  Gitlab::Auth.omniauth_setup_providers(provider_names)
 end

ee/lib/ee/gitlab/auth.rb

 module EE
   module Gitlab
     module Auth
+      extend ::Gitlab::Utils::Override
+
+      override :omniauth_customized_providers
+      def omniauth_customized_providers
+        @omniauth_customized_providers ||=
+          super.concat(%w[kerberos_spnego group_saml])
+      end
+
+      override :omniauth_setup_a_provider
+      def omniauth_setup_a_provider(provider)
+        super
+
+        if provider == 'group_saml'
+          OmniAuth.config.on_failure =
+            ::Gitlab::Auth::GroupSaml::FailureHandler.new(
+              OmniAuth.config.on_failure)
+        end
+      end
+
       def find_with_user_password(login, password)
         if Devise.omniauth_providers.include?(:kerberos)
           kerberos_user = ::Gitlab::Kerberos::Authentication.login(login, password)

lib/gitlab/auth.rb

@@ -16,6 +16,25 @@ module Gitlab
     class << self
       prepend EE::Gitlab::Auth
 
+      def omniauth_customized_providers
+        @omniauth_customized_providers ||= %w[bitbucket jwt]
+      end
+
+      def omniauth_setup_providers(provider_names)
+        provider_names.each do |provider|
+          omniauth_setup_a_provider(provider)
+        end
+      end
+
+      def omniauth_setup_a_provider(provider)
+        case provider
+        when 'kerberos'
+          require 'omniauth-kerberos'
+        when *omniauth_customized_providers
+          require_dependency "omni_auth/strategies/#{provider}"
+        end
+      end
+
       def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 

lib/omni_auth/strategies/jwt.rb

@@ -3,7 +3,7 @@ require 'jwt'
 
 module OmniAuth
   module Strategies
-    class JWT
+    class Jwt
       ClaimInvalid = Class.new(StandardError)
 
       include OmniAuth::Strategy
@@ -56,7 +56,5 @@ module OmniAuth
         fail! :claim_invalid, e
       end
     end
-
-    class Jwt < JWT; end
   end
 end

lib/rspec_flaky/listener.rb

 require 'json'
 
-require_relative 'config'
-require_relative 'example'
-require_relative 'flaky_example'
-require_relative 'flaky_examples_collection'
-require_relative 'report'
+require_dependency 'rspec_flaky/config'
+require_dependency 'rspec_flaky/example'
+require_dependency 'rspec_flaky/flaky_example'
+require_dependency 'rspec_flaky/flaky_examples_collection'
+require_dependency 'rspec_flaky/report'
 
 module RspecFlaky
   class Listener

lib/rspec_flaky/report.rb

 require 'json'
 require 'time'
 
-require_relative 'config'
-require_relative 'flaky_examples_collection'
+require_dependency 'rspec_flaky/config'
+require_dependency 'rspec_flaky/flaky_examples_collection'
 
 module RspecFlaky
   # This class is responsible for loading/saving JSON reports, and pruning

lib/tasks/lint.rake

@@ -30,11 +30,12 @@ unless Rails.env.production?
         lint:static_verification
       ].each do |task|
         pid = Process.fork do
-          rd, wr = IO.pipe
+          rd_out, wr_out = IO.pipe
+          rd_err, wr_err = IO.pipe
           stdout = $stdout.dup
           stderr = $stderr.dup
-          $stdout.reopen(wr)
-          $stderr.reopen(wr)
+          $stdout.reopen(wr_out)
+          $stderr.reopen(wr_err)
 
           begin
             begin
@@ -48,14 +49,13 @@ unless Rails.env.production?
           ensure
             $stdout.reopen(stdout)
             $stderr.reopen(stderr)
-            wr.close
+            wr_out.close
+            wr_err.close
 
-            if msg
-              warn "\n#{msg}\n\n"
-              IO.copy_stream(rd, $stderr)
-            else
-              IO.copy_stream(rd, $stdout)
-            end
+            warn "\n#{msg}\n\n" if msg
+
+            IO.copy_stream(rd_out, $stdout)
+            IO.copy_stream(rd_err, $stderr)
           end
         end
 

scripts/prune-old-flaky-specs

@@ -5,7 +5,11 @@
 # gem manually on the CI
 require 'rubygems'
 
-require_relative '../lib/rspec_flaky/report'
+# In newer Ruby, alias_method is not private then we don't need __send__
+singleton_class.__send__(:alias_method, :require_dependency, :require) # rubocop:disable GitlabSecurity/PublicSend
+$:.unshift(File.expand_path('../lib', __dir__))
+
+require 'rspec_flaky/report'
 
 report_file = ARGV.shift
 unless report_file

spec/lib/omni_auth/strategies/jwt_spec.rb

@@ -43,7 +43,7 @@ describe OmniAuth::Strategies::Jwt do
       end
 
       it 'raises error' do
-        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::JWT::ClaimInvalid)
+        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::Jwt::ClaimInvalid)
       end
     end
 
@@ -61,7 +61,7 @@ describe OmniAuth::Strategies::Jwt do
       end
 
       it 'raises error' do
-        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::JWT::ClaimInvalid)
+        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::Jwt::ClaimInvalid)
       end
     end
 
@@ -80,7 +80,7 @@ describe OmniAuth::Strategies::Jwt do
       end
 
       it 'raises error' do
-        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::JWT::ClaimInvalid)
+        expect { strategy.decoded }.to raise_error(OmniAuth::Strategies::Jwt::ClaimInvalid)
       end
     end
   end