Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

3 files changed, 107 insertions, 0 deletions

diff --git a/lib/gitlab/hook_data/base_builder.rb b/lib/gitlab/hook_data/base_builder.rb
index 434d30d9717..e5bae61ae4e 100644
--- a/lib/gitlab/hook_data/base_builder.rb
+++ b/lib/gitlab/hook_data/base_builder.rb
@@ -21,6 +21,12 @@ module Gitlab
 
       private
 
+      def event_data(event)
+        event_name =  "#{object.class.name.downcase}_#{event}"
+
+        { event_name: event_name }
+      end
+
       def timestamps_data
         {
           created_at: object.created_at&.xmlschema,
diff --git a/lib/gitlab/hook_data/group_builder.rb b/lib/gitlab/hook_data/group_builder.rb
new file mode 100644
index 00000000000..5f76144eb83
--- /dev/null
+++ b/lib/gitlab/hook_data/group_builder.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module HookData
+    class GroupBuilder < BaseBuilder
+      alias_method :group, :object
+
+      # Sample data
+      # {
+      #  :created_at=>"2021-01-20T09:40:12Z",
+      #  :updated_at=>"2021-01-20T09:40:12Z",
+      #  :event_name=>"group_rename",
+      #  :name=>"group1",
+      #  :path=>"group1",
+      #  :full_path=>"group1",
+      #  :group_id=>1,
+      #  :old_path=>"old-path",
+      #  :old_full_path=>"old-path"
+      # }
+
+      def build(event)
+        [
+          timestamps_data,
+          event_data(event),
+          group_data,
+          event_specific_group_data(event)
+        ].reduce(:merge)
+      end
+
+      private
+
+      def group_data
+        {
+          name: group.name,
+          path: group.path,
+          full_path: group.full_path,
+          group_id: group.id
+        }
+      end
+
+      def event_specific_group_data(event)
+        return {} unless event == :rename
+
+        {
+          old_path: group.path_before_last_save,
+          old_full_path: group.full_path_before_last_save
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/hook_data/subgroup_builder.rb b/lib/gitlab/hook_data/subgroup_builder.rb
new file mode 100644
index 00000000000..a620219675a
--- /dev/null
+++ b/lib/gitlab/hook_data/subgroup_builder.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module HookData
+    class SubgroupBuilder < GroupBuilder
+      # Sample data
+      # {
+      #  :created_at=>"2021-01-20T09:40:12Z",
+      #  :updated_at=>"2021-01-20T09:40:12Z",
+      #  :event_name=>"subgroup_create",
+      #  :name=>"subgroup1",
+      #  :path=>"subgroup1",
+      #  :full_path=>"group1/subgroup1",
+      #  :group_id=>10,
+      #  :parent_group_id=>7,
+      #  :parent_name=>group1,
+      #  :parent_path=>group1,
+      #  :parent_full_path=>group1
+      # }
+
+      private
+
+      def event_data(event)
+        event_name =  case event
+                      when :create
+                        'subgroup_create'
+                      when :destroy
+                        'subgroup_destroy'
+                      end
+
+        { event_name: event_name }
+      end
+
+      def group_data
+        parent = group.parent
+
+        super.merge(
+          parent_group_id: parent.id,
+          parent_name: parent.name,
+          parent_path: parent.path,
+          parent_full_path: parent.full_path
+        )
+      end
+
+      def event_specific_group_data(event)
+        {}
+      end
+    end
+  end
+end