fix: formatting and remove redundant transaction

Author: hamir-suspect

guard/lib/guard/grpc_servers/service_account_server.ex

@@ -3,18 +3,14 @@ defmodule Guard.GrpcServers.ServiceAccountServer do
 
   require Logger
 
-  import Guard.Utils, only: [grpc_error!: 2, valid_uuid?: 1, validate_uuid!: 1]
+  import Guard.Utils, only: [grpc_error!: 2, validate_uuid!: 1]
   import Guard.GrpcServers.Utils, only: [observe_and_log: 3]
 
   alias Guard.Store.ServiceAccount
   alias Guard.Api.Organization
   alias Google.Protobuf.Timestamp
   alias InternalApi.ServiceAccount, as: ServiceAccountPB
 
-  @user_exchange "user_exchange"
-  @updated_routing_key "updated"
-  @deleted_routing_key "deleted"
-
   @spec create(ServiceAccountPB.CreateRequest.t(), GRPC.Server.Stream.t()) ::
           ServiceAccountPB.CreateResponse.t()
   def create(

guard/lib/guard/service_account/actions.ex

@@ -9,7 +9,6 @@ defmodule Guard.ServiceAccount.Actions do
 
   require Logger
 
-  alias Guard.Repo
   alias Guard.FrontRepo
   alias Guard.Store.ServiceAccount
 
@@ -20,8 +19,6 @@ defmodule Guard.ServiceAccount.Actions do
           creator_id: String.t()
         }
 
-  @exchange_name "user_exchange"
-
   @doc """
   Create a new service account.
 
@@ -38,7 +35,8 @@ defmodule Guard.ServiceAccount.Actions do
   @spec create(service_account_params()) ::
           {:ok, %{service_account: map(), api_token: String.t()}} | {:error, atom() | list()}
   def create(
-        %{org_id: org_id, name: name, description: description, creator_id: creator_id} = params
+        %{org_id: _org_id, name: _name, description: _description, creator_id: _creator_id} =
+          params
       ) do
     case _create(params) do
       {:ok, {service_account, api_token}} ->
@@ -127,7 +125,7 @@ defmodule Guard.ServiceAccount.Actions do
     # Use nested transactions because FrontRepo and Repo are different databases
     FrontRepo.transaction(fn ->
       with {:ok, result} <- ServiceAccount.create(params),
-           {:ok, rbac_user} <- create_rbac_user_in_transaction(result.service_account) do
+           {:ok, _rbac_user} <- create_rbac_user_in_transaction(result.service_account) do
         # Return the service account data and API token
         {result.service_account, result.api_token}
       else
@@ -139,24 +137,19 @@ defmodule Guard.ServiceAccount.Actions do
 
   defp create_rbac_user_in_transaction(service_account) do
     # RBAC operations use Guard.Repo (different database from FrontRepo)
-    case Repo.transaction(fn ->
-           case Guard.Store.RbacUser.create(
-                  service_account.id,
-                  service_account.email,
-                  service_account.name
-                ) do
-             :ok ->
-               case Guard.Store.RbacUser.fetch(service_account.id) do
-                 nil -> Repo.rollback(:rbac_user_not_found)
-                 rbac_user -> rbac_user
-               end
-
-             :error ->
-               Repo.rollback(:rbac_user_creation_failed)
-           end
-         end) do
-      {:ok, rbac_user} -> {:ok, rbac_user}
-      {:error, error} -> {:error, error}
+    case Guard.Store.RbacUser.create(
+           service_account.id,
+           service_account.email,
+           service_account.name
+         ) do
+      :ok ->
+        case Guard.Store.RbacUser.fetch(service_account.id) do
+          nil -> {:error, :rbac_user_not_found}
+          rbac_user -> {:ok, rbac_user}
+        end
+
+      :error ->
+        {:error, :rbac_user_creation_failed}
     end
   end
 end

guard/lib/guard/store/service_account.ex

@@ -12,7 +12,7 @@ defmodule Guard.Store.ServiceAccount do
   import Guard.Utils, only: [valid_uuid?: 1]
 
   alias Guard.FrontRepo
-  alias Guard.FrontRepo.{User, ServiceAccount, Organization}
+  alias Guard.FrontRepo.{User, ServiceAccount}
   alias Guard.AuthenticationToken
   alias Ecto.Changeset
 
@@ -119,7 +119,7 @@ defmodule Guard.Store.ServiceAccount do
   def update(service_account_id, params) when is_binary(service_account_id) do
     if valid_uuid?(service_account_id) do
       FrontRepo.transaction(fn ->
-        with {:ok, current_data} <- find(service_account_id),
+        with {:ok, _current_data} <- find(service_account_id),
              {:ok, updated_user} <- update_user_record(service_account_id, params),
              {:ok, updated_service_account} <-
                update_service_account_record(service_account_id, params) do
@@ -150,7 +150,7 @@ 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),
+             with {:ok, _current_data} <- find(service_account_id),
                   {:ok, _updated_user} <- deactivate_user_record(service_account_id) do
                :deleted
              else
@@ -187,7 +187,7 @@ defmodule Guard.Store.ServiceAccount do
   def regenerate_token(service_account_id) when is_binary(service_account_id) do
     if valid_uuid?(service_account_id) do
       FrontRepo.transaction(fn ->
-        with {:ok, current_data} <- find(service_account_id),
+        with {:ok, _current_data} <- find(service_account_id),
              {:ok, {plain_token, hashed_token}} <- generate_api_token(),
              {:ok, _updated_user} <- update_user_token(service_account_id, hashed_token) do
           plain_token

guard/test/guard/user/actions_test.exs

@@ -148,7 +148,7 @@ defmodule Guard.User.ActionsTest do
     test "should handle service account user in update operations" do
       with_mock Guard.Events.UserCreated, publish: fn _, _ -> :ok end do
         # Create a service account using the factory
-        {:ok, %{service_account: service_account, user: service_account_user}} =
+        {:ok, %{service_account: _service_account, user: service_account_user}} =
           Support.Factories.ServiceAccountFactory.insert(name: "Original SA Name")
 
         # Try to update the service account user via User.Actions
@@ -168,12 +168,9 @@ defmodule Guard.User.ActionsTest do
     test "should prevent email changes for service account users" do
       with_mock Guard.Events.UserCreated, publish: fn _, _ -> :ok end do
         # Create a service account
-        {:ok, %{service_account: service_account, user: service_account_user}} =
+        {:ok, %{service_account: _service_account, user: service_account_user}} =
           Support.Factories.ServiceAccountFactory.insert()
 
-        original_email = service_account_user.email
-
-        # Try to change the email of a service account user
         update_params = %{
           email: "[email protected]"
         }
@@ -190,7 +187,7 @@ defmodule Guard.User.ActionsTest do
     test "should maintain service account properties during update" do
       with_mock Guard.Events.UserCreated, publish: fn _, _ -> :ok end do
         # Create a service account
-        {:ok, %{service_account: service_account, user: service_account_user}} =
+        {:ok, %{service_account: _service_account, user: service_account_user}} =
           Support.Factories.ServiceAccountFactory.insert()
 
         # Update with various parameters
@@ -211,7 +208,7 @@ defmodule Guard.User.ActionsTest do
     test "should not create repository providers for service account users" do
       with_mock Guard.Events.UserCreated, publish: fn _, _ -> :ok end do
         # Create a service account
-        {:ok, %{service_account: service_account, user: service_account_user}} =
+        {:ok, %{service_account: _service_account, user: service_account_user}} =
           Support.Factories.ServiceAccountFactory.insert()
 
         # Try to add repository providers (should not work or should be ignored)

guard/test/support/factories/service_account_factory.ex

@@ -105,7 +105,7 @@ defmodule Support.Factories.ServiceAccountFactory do
   defp get_description(nil), do: ""
   defp get_description(description), do: description
 
-  defp generate_synthetic_email(name, org_id) do
+  defp generate_synthetic_email(name, _org_id) do
     sanitized_name = String.downcase(name) |> String.replace(~r/[^a-z0-9\-]/, "-")
     "#{sanitized_name}@sa.test-org.#{Application.fetch_env!(:guard, :base_domain)}"
   end