Merge branch 'app-logger-8' into 'master'

Use AppLogger in ee/lib/ee/gitlab/auth/ldap/*

See merge request gitlab-org/gitlab!41055

changelogs/unreleased/app-logger-8.yml

+---
+title: Use applogger
+merge_request: 41055
+author: Rajendra Kadam
+type: other

ee/lib/ee/gitlab/auth/ldap/sync/group.rb

@@ -15,7 +15,7 @@ module EE
 
                 begin
                   group.start_ldap_sync
-                  Rails.logger.debug { "Started syncing all providers for '#{group.name}' group" } # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.debug "Started syncing all providers for '#{group.name}' group"
 
                   # Shuffle providers to prevent a scenario where sync fails after a time
                   # and only the first provider or two get synced. This shuffles the order
@@ -28,9 +28,9 @@ module EE
                   end
 
                   group.finish_ldap_sync
-                  Rails.logger.debug { "Finished syncing all providers for '#{group.name}' group" } # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.debug "Finished syncing all providers for '#{group.name}' group"
                 rescue ::Gitlab::Auth::Ldap::LdapConnectionError
-                  Rails.logger.warn("Error syncing all providers for '#{group.name}' group") # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.warn("Error syncing all providers for '#{group.name}' group")
                   group.fail_ldap_sync
                 end
               end
@@ -41,15 +41,15 @@ module EE
 
                 begin
                   group.start_ldap_sync
-                  Rails.logger.debug { "Started syncing '#{proxy.provider}' provider for '#{group.name}' group" } # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.debug "Started syncing '#{proxy.provider}' provider for '#{group.name}' group"
 
                   sync_group = new(group, proxy)
                   sync_group.update_permissions
 
                   group.finish_ldap_sync
-                  Rails.logger.debug { "Finished syncing '#{proxy.provider}' provider for '#{group.name}' group" } # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.debug "Finished syncing '#{proxy.provider}' provider for '#{group.name}' group"
                 rescue ::Gitlab::Auth::Ldap::LdapConnectionError
-                  Rails.logger.warn("Error syncing '#{proxy.provider}' provider for '#{group.name}' group") # rubocop:disable Gitlab/RailsLogger
+                  ::Gitlab::AppLogger.warn("Error syncing '#{proxy.provider}' provider for '#{group.name}' group")
                   group.fail_ldap_sync
                 end
               end
@@ -59,7 +59,7 @@ module EE
 
                 return true unless group.ldap_sync_started?
 
-                Rails.logger.warn "Group '#{group.name}' is not ready for LDAP sync. Skipping" # rubocop:disable Gitlab/RailsLogger
+                ::Gitlab::AppLogger.warn "Group '#{group.name}' is not ready for LDAP sync. Skipping"
                 false
               end
 
@@ -111,13 +111,13 @@ module EE
               # so we must propagate any higher inherited permissions unconditionally.
               inherit_higher_access_levels(group, access_levels)
 
-              logger.debug do
+              logger.debug(
                 <<-MSG.strip_heredoc.tr("\n", ' ')
                   Resolved '#{group.name}' group member access,
                   propagating any higher access inherited from a parent group:
                   #{access_levels.to_hash}
                 MSG
-              end
+              )
 
               update_existing_group_membership(group, access_levels)
               add_new_members(group, access_levels)
@@ -129,9 +129,7 @@ module EE
               if member_dns = get_member_dns(group_link)
                 access_levels.set(member_dns, to: group_link.group_access)
 
-                logger.debug do
-                  "Resolved '#{group.name}' group member access: #{access_levels.to_hash}"
-                end
+                logger.debug "Resolved '#{group.name}' group member access: #{access_levels.to_hash}"
               end
             end
 
@@ -141,7 +139,7 @@ module EE
 
             def dns_for_group_cn(group_cn)
               if config.group_base.blank?
-                logger.debug { "No `group_base` configured for '#{provider}' provider and group link CN #{group_cn}. Skipping" }
+                logger.debug "No `group_base` configured for '#{provider}' provider and group link CN #{group_cn}. Skipping"
 
                 return
               end
@@ -172,7 +170,7 @@ module EE
             # rubocop: enable CodeReuse/ActiveRecord
 
             def update_existing_group_membership(group, access_levels)
-              logger.debug { "Updating existing membership for '#{group.name}' group" }
+              logger.debug "Updating existing membership for '#{group.name}' group"
 
               multiple_ldap_providers = ::Gitlab::Auth::Ldap::Config.providers.count > 1
               existing_members = select_and_preload_group_members(group)
@@ -228,7 +226,7 @@ module EE
             end
 
             def add_new_members(group, access_levels)
-              logger.debug { "Adding new members to '#{group.name}' group" }
+              logger.debug "Adding new members to '#{group.name}' group"
 
               return unless access_levels.present?
 
@@ -247,14 +245,14 @@ module EE
                     access_level
                   )
                 else
-                  logger.debug do
+                  logger.debug(
                     <<-MSG.strip_heredoc.tr("\n", ' ')
                       #{self.class.name}: User with DN `#{member_dn}` should have access
                       to '#{group.name}' group but there is no user in GitLab with that
                       identity. Membership will be updated once the user signs in for
                       the first time.
                     MSG
-                  end
+                  )
                 end
               end
             end
@@ -276,13 +274,13 @@ module EE
             end
 
             def warn_cannot_remove_last_owner(user, group)
-              logger.warn do
+              logger.warn(
                 <<-MSG.strip_heredoc.tr("\n", ' ')
                   #{self.class.name}: LDAP group sync cannot remove #{user.name}
                   (#{user.id}) from group #{group.name} (#{group.id}) as this is
                   the group's last owner
                 MSG
-              end
+              )
             end
 
             # rubocop: disable CodeReuse/ActiveRecord
@@ -310,7 +308,7 @@ module EE
             # rubocop: enable CodeReuse/ActiveRecord
 
             def logger
-              Rails.logger # rubocop:disable Gitlab/RailsLogger
+              ::Gitlab::AppLogger
             end
 
             def config

ee/lib/ee/gitlab/auth/ldap/sync/users.rb

@@ -39,7 +39,7 @@ module EE
 
               true
             rescue ::Gitlab::Auth::Ldap::LdapConnectionError
-              Rails.logger.warn("Error syncing #{attribute} users for provider '#{provider}'. LDAP connection Error") # rubocop:disable Gitlab/RailsLogger
+              ::Gitlab::AppLogger.warn("Error syncing #{attribute} users for provider '#{provider}'. LDAP connection Error")
 
               false
             end
@@ -64,13 +64,13 @@ module EE
 
                 user
               else
-                Rails.logger.debug do # rubocop:disable Gitlab/RailsLogger
+                ::Gitlab::AppLogger.debug(
                   <<-MSG.strip_heredoc.tr("\n", ' ')
                     #{self.class.name}: User with DN `#{member_dn}` should be marked as
                     #{attribute} but there is no user in GitLab with that identity.
                     Membership will be updated once the user signs in for the first time.
                   MSG
-                end
+                )
 
                 nil
               end

ee/spec/lib/ee/gitlab/auth/ldap/sync/admin_users_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::AdminUsers do
       end
 
       it 'logs a debug message' do
-        expect(Rails.logger)
+        expect(Gitlab::AppLogger)
           .to receive(:warn)
                 .with("Error syncing admin users for provider 'ldapmain'. LDAP connection Error")
                 .at_least(:once)

ee/spec/lib/ee/gitlab/auth/ldap/sync/external_users_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::ExternalUsers do
       end
 
       it 'logs a debug message' do
-        expect(Rails.logger)
+        expect(Gitlab::AppLogger)
           .to receive(:warn)
                 .with("Error syncing external users for provider 'ldapmain'. LDAP connection Error")
                 .at_least(:once)

ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Group do
       it 'logs a debug message' do
         group.start_ldap_sync
 
-        expect(Rails.logger)
+        expect(Gitlab::AppLogger)
           .to receive(:warn)
                 .with(/^Group '\w*' is not ready for LDAP sync. Skipping/)
                 .at_least(:once)
@@ -67,7 +67,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Group do
       end
 
       it 'logs a debug message' do
-        expect(Rails.logger)
+        expect(Gitlab::AppLogger)
           .to receive(:warn).at_least(:once)
 
         execute
@@ -187,7 +187,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Group do
         it 'does not update permissions unless ldap sync status is started' do
           group.finish_ldap_sync
 
-          expect(Rails.logger)
+          expect(Gitlab::AppLogger)
             .to receive(:warn).with(/status must be 'started' before updating permissions/)
 
           sync_group.update_permissions
@@ -611,7 +611,7 @@ RSpec.describe EE::Gitlab::Auth::Ldap::Sync::Group do
           it 'does not update permissions unless ldap sync status is started' do
             group.finish_ldap_sync
 
-            expect(Rails.logger)
+            expect(Gitlab::AppLogger)
                 .to receive(:warn).with(/status must be 'started' before updating permissions/)
 
             sync_group.update_permissions