Merge branch '216345-add-project-group-to-group-list-when-specified-as-owner' into 'master'

Add project.group to group list when specified as owner

See merge request gitlab-org/gitlab!30934

changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml

+---
+title: Add a Project's group to list of groups when parsing for codeowner entries
+merge_request: 30934
+author:
+type: fixed

ee/lib/gitlab/code_owners/groups_loader.rb

@@ -23,7 +23,15 @@ module Gitlab
         return Group.none if extractor.names.empty?
 
         groups = project.invited_groups.where_full_path_in(extractor.names)
-        groups.with_route.with_users
+        group_list = groups.with_route.with_users.to_a
+
+        if extractor.names.include?(project.group&.full_path)
+          project.group.users.load
+
+          group_list << project.group
+        end
+
+        group_list
       end
     end
   end

ee/spec/lib/gitlab/checks/diff_check_spec.rb

@@ -39,6 +39,8 @@ describe Gitlab::Checks::DiffCheck do
         allow(project.repository).to receive(:code_owners_blob)
           .with(ref: codeowner_lookup_ref)
           .and_return(codeowner_blob)
+
+        stub_feature_flags(sectional_codeowners: false)
       end
 
       context 'the MR contains a renamed file matching a file path' do
@@ -56,10 +58,6 @@ describe Gitlab::Checks::DiffCheck do
         end
 
         context 'and the user is not listed as a codeowner' do
-          before do
-            stub_feature_flags(sectional_codeowners: false)
-          end
-
           it "returns an error message" do
             expect { diff_check.validate! }.to raise_error do |error|
               expect(error).to be_a(Gitlab::GitAccess::ForbiddenError)
@@ -84,16 +82,16 @@ describe Gitlab::Checks::DiffCheck do
           subject.send(:validate_code_owners).call(["docs/CODEOWNERS", "README"])
         end
 
-        context "and the user is not listed as a code owner" do
-          before do
-            stub_feature_flags(sectional_codeowners: false)
-          end
-
-          it "returns an error message" do
+        shared_examples_for "returns an error message" do
+          it "returns the expected error message" do
             expect(validation_result).to include("Pushes to protected branches")
           end
         end
 
+        context "and the user is not listed as a code owner" do
+          it_behaves_like "returns an error message"
+        end
+
         context "and the user is listed as a code owner" do
           # `user` is set as the owner of the incoming change by the shared
           #   context found in 'push rules checks context'
@@ -103,6 +101,32 @@ describe Gitlab::Checks::DiffCheck do
             expect(validation_result).to be_nil
           end
         end
+
+        context "when the codeowner entity is a group" do
+          let(:group_a) { create(:group) }
+          let(:project) { create(:project, :repository, namespace: group_a) }
+          let(:codeowner_content) do
+            <<~CODEOWNERS
+            *.rb @#{code_owner.username}
+            docs/CODEOWNERS @#{group_a.name}
+            *.js.coffee @#{group_a.name}
+            CODEOWNERS
+          end
+
+          context "and the user is part of the codeowning-group" do
+            before do
+              group_a.add_developer(user)
+            end
+
+            it "returns nil" do
+              expect(validation_result).to be_nil
+            end
+          end
+
+          context "and the user is not part of the codeowning-group" do
+            it_behaves_like "returns an error message"
+          end
+        end
       end
 
       context "the MR doesn't contain a matching file path" do

ee/spec/lib/gitlab/code_owners/groups_loader_spec.rb

@@ -51,7 +51,18 @@ describe Gitlab::CodeOwners::GroupsLoader do
         group = create(:group, path: "GROUP-1")
         create(:group, path: "GROUP-2")
         project.invited_groups << group
+        load_groups
+
+        expect(entry).to have_received(:add_matching_groups_from).with([group])
+      end
+    end
+
+    context "input matches project.group" do
+      let(:group) { create(:group) }
+      let(:project) { create(:project, :repository, namespace: group) }
+      let(:text) { "@#{project.group.name}" }
 
+      it "returns the project's group" do
         load_groups
 
         expect(entry).to have_received(:add_matching_groups_from).with([group])

ee/spec/lib/gitlab/code_owners/loader_spec.rb

@@ -71,7 +71,7 @@ describe Gitlab::CodeOwners::Loader do
         expect(loader.entries).to contain_exactly(expected_entry, other_entry)
       end
 
-      it 'only performs 3 query for users and groups' do
+      it 'only performs 4 queries for users and groups' do
         test_group = create(:group, path: 'test-group')
         test_group.add_developer(create(:user))
 
@@ -80,9 +80,12 @@ describe Gitlab::CodeOwners::Loader do
 
         project.invited_groups << [test_group, another_group]
 
-        # One query for users, one for the emails to later divide them across the entries
-        # one for groups with joined routes and users
-        expect { loader.entries }.not_to exceed_query_limit(3)
+        # - 1 query for users
+        # - 1 for the emails to later divide them across the entries
+        # - 1 for groups with joined routes and users
+        # - 1 for loading the users for the parent group
+        #
+        expect { loader.entries }.not_to exceed_query_limit(4)
       end
     end