fix: linting errors

Author: hamir-suspect

guard/lib/guard/front_repo/service_account.ex

@@ -9,7 +9,7 @@ defmodule Guard.FrontRepo.ServiceAccount do
           id: String.t(),
           description: String.t(),
           creator_id: String.t(),
-          user: Guard.FrontRepo.User.t() | nil,
+          user: Guard.FrontRepo.User.t() | nil
         }
 
   schema "service_accounts" do

guard/lib/guard/grpc_servers/service_account_server.ex

@@ -4,6 +4,7 @@ defmodule Guard.GrpcServers.ServiceAccountServer do
   require Logger
 
   import Guard.Utils, only: [grpc_error!: 2, valid_uuid?: 1, validate_uuid!: 1]
+  import Guard.GrpcServers.Utils, only: [observe_and_log: 3]
 
   alias Guard.Store.ServiceAccount
   alias Guard.Api.Organization
@@ -266,25 +267,4 @@ defmodule Guard.GrpcServers.ServiceAccountServer do
   end
 
   defp grpc_timestamp(_), do: nil
-
-  defp observe_and_log(name, request, f) do
-    Watchman.benchmark(name, fn ->
-      try do
-        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Started" end)
-        result = f.()
-        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Finished" end)
-
-        Watchman.increment({name, ["OK"]})
-        result
-      rescue
-        e ->
-          Logger.error(
-            "Service #{name} - request: #{inspect(request)} - Exited with an error: #{inspect(e)}"
-          )
-
-          Watchman.increment({name, ["ERROR"]})
-          reraise e, __STACKTRACE__
-      end
-    end)
-  end
 end

guard/lib/guard/grpc_servers/user_server.ex

@@ -4,6 +4,7 @@ defmodule Guard.GrpcServers.UserServer do
   require Logger
 
   import Guard.Utils, only: [grpc_error!: 2, valid_uuid?: 1, validate_uuid!: 1]
+  import Guard.GrpcServers.Utils, only: [observe_and_log: 3]
 
   alias Guard.Store.User.Front
   alias Guard.FrontRepo
@@ -849,25 +850,4 @@ defmodule Guard.GrpcServers.UserServer do
   end
 
   defp grpc_timestamp(_), do: nil
-
-  defp observe_and_log(name, request, f) do
-    Watchman.benchmark(name, fn ->
-      try do
-        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Started" end)
-        result = f.()
-        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Finished" end)
-
-        Watchman.increment({name, ["OK"]})
-        result
-      rescue
-        e ->
-          Logger.error(
-            "Service #{name} - request: #{inspect(request)} - Exited with an error: #{inspect(e)}"
-          )
-
-          Watchman.increment({name, ["ERROR"]})
-          reraise e, __STACKTRACE__
-      end
-    end)
-  end
 end

guard/lib/guard/grpc_servers/utils.ex

@@ -0,0 +1,31 @@
+defmodule Guard.GrpcServers.Utils do
+  @moduledoc """
+  Common utilities for GRPC servers.
+  """
+
+  require Logger
+
+  @doc """
+  Observes and logs GRPC service calls with benchmarking and metrics.
+  """
+  def observe_and_log(name, request, f) do
+    Watchman.benchmark(name, fn ->
+      try do
+        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Started" end)
+        result = f.()
+        Logger.debug(fn -> "Service #{name} - request: #{inspect(request)} - Finished" end)
+
+        Watchman.increment({name, ["OK"]})
+        result
+      rescue
+        e ->
+          Logger.error(
+            "Service #{name} - request: #{inspect(request)} - Exited with an error: #{inspect(e)}"
+          )
+
+          Watchman.increment({name, ["ERROR"]})
+          reraise e, __STACKTRACE__
+      end
+    end)
+  end
+end

guard/lib/guard/store/service_account.ex

@@ -150,16 +150,17 @@ defmodule Guard.Store.ServiceAccount do
   def delete(service_account_id) when is_binary(service_account_id) do
     if valid_uuid?(service_account_id) do
       case FrontRepo.transaction(fn ->
-        with {:ok, current_data} <- find(service_account_id),
-             {:ok, _updated_user} <- deactivate_user_record(service_account_id) do
-          :deleted
-        else
-          {:error, :not_found} ->
-            FrontRepo.rollback(:not_found)
-          {:error, _reason} ->
-            FrontRepo.rollback(:internal_error)
-        end
-      end) do
+             with {:ok, current_data} <- find(service_account_id),
+                  {:ok, _updated_user} <- deactivate_user_record(service_account_id) do
+               :deleted
+             else
+               {:error, :not_found} ->
+                 FrontRepo.rollback(:not_found)
+
+               {:error, _reason} ->
+                 FrontRepo.rollback(:internal_error)
+             end
+           end) do
         {:ok, :deleted} -> {:ok, :deleted}
         {:error, reason} -> {:error, reason}
       end

guard/test/guard/front_repo/service_account_test.exs

@@ -64,7 +64,7 @@ defmodule Guard.FrontRepo.ServiceAccountTest do
 
     test "requires creator_id field" do
       user = create_test_user()
-      
+
       attrs = %{
         id: user.id,
         description: "Test description"
@@ -183,7 +183,6 @@ defmodule Guard.FrontRepo.ServiceAccountTest do
       {:error, changeset} = FrontRepo.insert(changeset2)
       assert {"has already been taken", _} = changeset.errors[:id]
     end
-
   end
 
   describe "update_changeset/2" do
@@ -339,7 +338,7 @@ defmodule Guard.FrontRepo.ServiceAccountTest do
   defp create_test_service_account(user) do
     # Create a creator user to satisfy foreign key constraint
     creator_user = create_test_user()
-    
+
     attrs = %{
       id: user.id,
       description: "Test service account description",

guard/test/guard/store/service_account_test.exs

@@ -146,7 +146,11 @@ defmodule Guard.Store.ServiceAccountTest do
         assert result.service_account.org_id == params.org_id
         assert result.service_account.creator_id == params.creator_id
         assert result.service_account.deactivated == false
-        assert String.contains?(result.service_account.email, "@sa.test-org.#{Application.fetch_env!(:guard, :base_domain)}")
+
+        assert String.contains?(
+                 result.service_account.email,
+                 "@sa.test-org.#{Application.fetch_env!(:guard, :base_domain)}"
+               )
       end
     end
 
@@ -156,7 +160,11 @@ defmodule Guard.Store.ServiceAccountTest do
         {Guard.FrontRepo.User, [:passthrough],
          [reset_auth_token: fn _ -> {:ok, "plain-token"} end]}
       ]) do
-        params = ServiceAccountFactory.build_params_with_creator(name: "test-sa", org_id: Ecto.UUID.generate())
+        params =
+          ServiceAccountFactory.build_params_with_creator(
+            name: "test-sa",
+            org_id: Ecto.UUID.generate()
+          )
 
         {:ok, result} = ServiceAccount.create(params)
 
@@ -181,7 +189,8 @@ defmodule Guard.Store.ServiceAccountTest do
         {:ok, result} = ServiceAccount.create(params)
 
         # Should sanitize both name and org username
-        assert result.service_account.email == "[email protected].#{Application.fetch_env!(:guard, :base_domain)}"
+        assert result.service_account.email ==
+                 "[email protected].#{Application.fetch_env!(:guard, :base_domain)}"
       end
     end
 
@@ -196,7 +205,10 @@ defmodule Guard.Store.ServiceAccountTest do
         {:ok, result} = ServiceAccount.create(params)
 
         # Should use fallback email
-        assert String.contains?(result.service_account.email, "@sa.unknown.#{Application.fetch_env!(:guard, :base_domain)}")
+        assert String.contains?(
+                 result.service_account.email,
+                 "@sa.unknown.#{Application.fetch_env!(:guard, :base_domain)}"
+               )
       end
     end
 
@@ -249,7 +261,11 @@ defmodule Guard.Store.ServiceAccountTest do
         {:ok, updated_sa} = ServiceAccount.update(sa.id, update_params)
 
         assert updated_sa.user.name == "New Name"
-        assert String.contains?(updated_sa.user.email, "[email protected].#{Application.fetch_env!(:guard, :base_domain)}")
+
+        assert String.contains?(
+                 updated_sa.user.email,
+                 "[email protected].#{Application.fetch_env!(:guard, :base_domain)}"
+               )
       end
     end