Merge branch 'main' into feat/service-accounts

Author: hamir-suspect

front/assets/js/edit_notification.js

@@ -29,6 +29,9 @@ export var EditNotification = {
                      class="form-control w-100"
                      placeholder="e.g. my-project, /hotfix-*/, /.*/" >
               <p class="f6 mt1 mb0 nb1">Comma separated, regular expressions allowed</p>
+              <p class="f6 mt2 pa2 bg-washed-yellow ba b--yellow br2">
+                  <strong>Note:</strong> Regardless of the regex patterns specified, notifications will only be sent for projects to which the creator of this notification has access.
+              </p>
             </div>
 
             <div class="pl4 mb3">

front/lib/front_web/controllers/notifications_controller.ex

@@ -4,11 +4,7 @@ defmodule FrontWeb.NotificationsController do
 
   alias Front.Async
   alias Front.Audit
-
-  alias Front.Models.{
-    Notification,
-    Organization
-  }
+  alias Front.Models.{Notification, Organization, User}
 
   plug(FrontWeb.Plugs.FetchPermissions, scope: "org")
   plug(FrontWeb.Plugs.PageAccess, permissions: "organization.view")
@@ -25,6 +21,7 @@ defmodule FrontWeb.NotificationsController do
 
       {:ok, organization} = Async.await(fetch_organization)
       {:ok, notifications} = Async.await(fetch_notifications)
+      notifications = add_user_data_to_notifications(notifications)
 
       render(
         conn,
@@ -298,6 +295,27 @@ defmodule FrontWeb.NotificationsController do
     |> render("404.html")
   end
 
+  defp add_user_data_to_notifications(notifications) when is_list(notifications) do
+    import Enum
+
+    creators =
+      notifications
+      |> map(& &1.metadata.creator_id)
+      |> reject(&(&1 == ""))
+      |> uniq()
+      |> User.find_many()
+
+    map(notifications, fn n ->
+      if n.metadata.creator_id != "" do
+        default_username = Application.get_env(:front, :default_user_name)
+        creator = find(creators, &(&1.id == n.metadata.creator_id)) || %{name: default_username}
+        %{n | metadata: Map.put(n.metadata, :creator, creator)}
+      else
+        n
+      end
+    end)
+  end
+
   def get_rule_identifiers(params) do
     params
     |> Map.keys()

front/lib/front_web/templates/notifications/_notifications.html.eex

@@ -1,6 +1,11 @@
 <%= Enum.map(@notifications, fn notification -> %>
   <div class="bg-white shadow-1 br3 pa3 mv3">
-        <div class="f4 f3-m b mb2"><%= notification.metadata.name %></div>
+        <div class="flex items-center justify-between mb2">
+            <div class="f4 f3-m b"><%= notification.metadata.name %></div>
+            <%= if Map.has_key?(notification.metadata, :creator) && Map.has_key?(notification.metadata.creator, :name) do %>
+              <div class="f6 black-50 tr">last modified by <%= notification.metadata.creator.name %></div>
+            <% end %>
+        </div>
 
         <div class="overflow-auto nowrap">
           <%= Enum.map(notification.spec.rules, fn rule -> %>

front/lib/front_web/templates/notifications/form.html.eex

@@ -50,6 +50,9 @@
                   class: "form-control w-100",
                   placeholder: "e.g. my-project, /hotfix-*/, /.*/" %>
               <p class="f6 mt1 mb0 nb1">Comma separated, regular expressions allowed</p>
+              <p class="f6 mt2 pa2 bg-washed-yellow ba b--yellow br2">
+                  <strong>Note:</strong> Regardless of the regex patterns specified, notifications will only be sent for projects to which the creator of this notification has access.
+              </p>
             </div>
             <div class="mb3 pl4">
               <label class="db b mb1">

notifications/lib/notifications/api/public_api/serialization.ex

@@ -15,6 +15,7 @@ defmodule Notifications.Api.PublicApi.Serialization do
     Notification.Metadata.new(
       name: notification.name,
       id: notification.id,
+      creator_id: notification.creator_id,
       create_time: unix_timestamp(notification.inserted_at),
       update_time: unix_timestamp(notification.updated_at)
     )

zebra/lib/zebra/workers/task_finisher.ex

@@ -61,7 +61,7 @@ defmodule Zebra.Workers.TaskFinisher do
       log(task.id, "Processing task, results #{inspect(results)}, states #{inspect(states)}")
 
       if Enum.all?(states, fn s -> s == Job.state_finished() end) do
-        case calculate_task_result(results) do
+        case calculate_task_result(results, task) do
           {:ok, result} ->
             finish(task, jobs, result)
             publish(task)
@@ -92,8 +92,13 @@ defmodule Zebra.Workers.TaskFinisher do
     log(task.id, "marked as finished")
   end
 
-  def calculate_task_result(job_results) do
+  def calculate_task_result(job_results, task) do
     cond do
+      # If fail_fast:stop is active and there's a failure, show as failed
+      task.fail_fast_strategy == "stop" &&
+          Enum.any?(job_results, fn r -> r == Job.result_failed() end) ->
+        {:ok, "failed"}
+
       Enum.any?(job_results, fn r -> r == Job.result_stopped() end) ->
         {:ok, "stopped"}
 

zebra/test/zebra/workers/task_finisher_test.exs

@@ -60,20 +60,45 @@ defmodule Zebra.Workers.TaskFinisherTest do
   describe ".calculate_task_result" do
     test "when any of the jobs are stopped => result is stopped" do
       results = ["passed", "failed", "stopped"]
+      {:ok, task} = Support.Factories.Task.create()
 
-      assert {:ok, "stopped"} = W.calculate_task_result(results)
+      assert {:ok, "stopped"} = W.calculate_task_result(results, task)
     end
 
     test "when any of the jobs are failed => result is failed" do
       results = ["passed", "failed", "passed"]
+      {:ok, task} = Support.Factories.Task.create()
 
-      assert {:ok, "failed"} = W.calculate_task_result(results)
+      assert {:ok, "failed"} = W.calculate_task_result(results, task)
     end
 
     test "when all of the jobs are passed => result is passed" do
-      results = ["passed", "failed", "passed"]
+      results = ["passed", "passed", "passed"]
+      {:ok, task} = Support.Factories.Task.create()
+
+      assert {:ok, "passed"} = W.calculate_task_result(results, task)
+    end
+
+    test "when fail_fast:stop is active and jobs are stopped due to failure => result is failed" do
+      results = ["passed", "failed", "stopped", "stopped"]
+      {:ok, task} = Support.Factories.Task.create(%{fail_fast_strategy: "stop"})
+
+      assert {:ok, "failed"} = W.calculate_task_result(results, task)
+    end
+
+    test "when fail_fast:stop is active but no jobs failed => result is stopped" do
+      results = ["passed", "stopped", "stopped"]
+      {:ok, task} = Support.Factories.Task.create(%{fail_fast_strategy: "stop"})
+
+      assert {:ok, "stopped"} = W.calculate_task_result(results, task)
+    end
+
+    test "when fail_fast:cancel is active and jobs are stopped due to failure => result is stopped" do
+      results = ["passed", "failed", "stopped"]
+      {:ok, task} = Support.Factories.Task.create(%{fail_fast_strategy: "cancel"})
 
-      assert {:ok, "failed"} = W.calculate_task_result(results)
+      # With cancel strategy, we don't override the normal logic
+      assert {:ok, "stopped"} = W.calculate_task_result(results, task)
     end
   end