Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

2 files changed, 15 insertions, 5 deletions

diff --git a/lib/gitlab/audit/auditor.rb b/lib/gitlab/audit/auditor.rb
index e3d2b394404..a59237fbb1f 100644
--- a/lib/gitlab/audit/auditor.rb
+++ b/lib/gitlab/audit/auditor.rb
@@ -77,12 +77,12 @@ module Gitlab
         @authentication_provider = @context[:authentication_provider]
 
         # TODO: Remove this code once we close https://gitlab.com/gitlab-org/gitlab/-/issues/367870
-        return unless @is_audit_event_yaml_defined
+        return if @is_audit_event_yaml_defined
 
-        # rubocop:disable Gitlab/RailsLogger
-        Rails.logger.warn('WARNING: Logging audit events without an event type definition will be deprecated soon.')
-        Rails.logger.warn('See https://docs.gitlab.com/ee/development/audit_event_guide/#event-type-definitions')
-        # rubocop:enable Gitlab/RailsLogger
+        message = 'Logging audit events without an event type definition will be deprecated soon ' \
+                  '(https://docs.gitlab.com/ee/development/audit_event_guide/#event-type-definitions)'
+
+        Gitlab::AppLogger.warn(message: message, event_type: @name)
       end
 
       def single_audit
diff --git a/lib/gitlab/audit/type/definition.rb b/lib/gitlab/audit/type/definition.rb
index 81c88a3a0ae..772023616b8 100644
--- a/lib/gitlab/audit/type/definition.rb
+++ b/lib/gitlab/audit/type/definition.rb
@@ -13,6 +13,10 @@ module Gitlab
         validate :validate_schema
         validate :validate_file_name
 
+        def self.declarative_policy_class
+          'AuditEvents::DefinitionPolicy'
+        end
+
         InvalidAuditEventTypeError = Class.new(StandardError)
 
         AUDIT_EVENT_TYPE_SCHEMA_PATH = Rails.root.join('config', 'audit_events', 'types', 'type_schema.json')
@@ -78,6 +82,12 @@ module Gitlab
             definitions.keys.map(&:to_s)
           end
 
+          def names_with_category
+            definitions.map do |event_name, value|
+              { event_name: event_name, feature_category: value.attributes[:feature_category] }
+            end
+          end
+
           def defined?(key)
             get(key).present?
           end