Merge branch 'rmay-216344-2' into 'master'

Improve scoped broadcast message support for shell

See merge request gitlab-org/gitlab!46333

app/services/post_receive_service.rb

@@ -29,9 +29,7 @@ class PostReceiveService
       response.add_alert_message(message)
     end
 
-    broadcast_message = BroadcastMessage.current_banner_messages&.last&.message
     response.add_alert_message(broadcast_message)
-
     response.add_merge_request_urls(merge_request_urls)
 
     # Neither User nor Project are guaranteed to be returned; an orphaned write deploy
@@ -74,6 +72,24 @@ class PostReceiveService
 
     ::MergeRequests::GetUrlsService.new(project).execute(params[:changes])
   end
+
+  private
+
+  def broadcast_message
+    banner = nil
+
+    if project
+      scoped_messages = BroadcastMessage.current_banner_messages(project.full_path).select do |message|
+        message.target_path.present? && message.matches_current_path(project.full_path)
+      end
+
+      banner = scoped_messages.last
+    end
+
+    banner ||= BroadcastMessage.current_banner_messages.last
+
+    banner&.message
+  end
 end
 
 PostReceiveService.prepend_if_ee('EE::PostReceiveService')

changelogs/unreleased/rmay-216344-2.yml

+---
+title: Allow for return of scoped broadcast messages on shell
+merge_request: 46333
+author:
+type: changed

spec/services/post_receive_service_spec.rb

@@ -232,6 +232,49 @@ RSpec.describe PostReceiveService do
     end
   end
 
+  context "broadcast message has a target_path" do
+    let!(:older_scoped_message) do
+      create(:broadcast_message, message: "Old top secret", target_path: "/company/sekrit-project")
+    end
+
+    let!(:latest_scoped_message) do
+      create(:broadcast_message, message: "Top secret", target_path: "/company/sekrit-project")
+    end
+
+    let!(:unscoped_message) do
+      create(:broadcast_message, message: "Hi")
+    end
+
+    context "no project path matches" do
+      it "does not output the scoped broadcast messages" do
+        expect(subject).not_to include(build_alert_message(older_scoped_message.message))
+        expect(subject).not_to include(build_alert_message(latest_scoped_message.message))
+      end
+
+      it "does output another message that doesn't have a target_path" do
+        expect(subject).to include(build_alert_message(unscoped_message.message))
+      end
+    end
+
+    context "project path matches" do
+      before do
+        allow(project).to receive(:full_path).and_return("/company/sekrit-project")
+      end
+
+      it "does output the latest scoped broadcast message" do
+        expect(subject).to include(build_alert_message(latest_scoped_message.message))
+      end
+
+      it "does not output the older scoped broadcast message" do
+        expect(subject).not_to include(build_alert_message(older_scoped_message.message))
+      end
+
+      it "does not output another message that doesn't have a target_path" do
+        expect(subject).not_to include(build_alert_message(unscoped_message.message))
+      end
+    end
+  end
+
   context 'with a redirected data' do
     it 'returns redirected message on the response' do
       project_moved = Gitlab::Checks::ProjectMoved.new(project.repository, user, 'http', 'foo/baz')