Skip to content

Commit ffb6efd

Browse files
Fix linting warnings
1 parent bdf64c1 commit ffb6efd

File tree

6 files changed

+29
-66
lines changed

6 files changed

+29
-66
lines changed
Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,15 @@
11
defmodule EphemeralEnvironments.Grpc.EphemeralEnvironmentsServer do
22
use GRPC.Server, service: InternalApi.EphemeralEnvironments.EphemeralEnvironments.Service
33

4-
alias InternalApi.EphemeralEnvironments.{
5-
ListRequest,
6-
ListResponse,
7-
DescribeRequest,
8-
DescribeResponse,
9-
CreateRequest,
10-
CreateResponse,
11-
UpdateRequest,
12-
UpdateResponse,
13-
DeleteRequest,
14-
DeleteResponse,
15-
CordonRequest,
16-
CordonResponse
17-
}
4+
alias EphemeralEnvironments.Service.EphemeralEnvironmentType
185

196
def list(request, _stream) do
20-
case EphemeralEnvironments.Service.EphemeralEnvironmentType.list(request.org_id) do
21-
{:ok, environment_types} ->
22-
%{environment_types: environment_types}
23-
24-
{:error, error_message} ->
25-
raise GRPC.RPCError, status: :unknown, message: error_message
26-
end
7+
{:ok, environment_types} = EphemeralEnvironmentType.list(request.org_id)
8+
%{environment_types: environment_types}
279
end
2810

2911
def describe(request, _stream) do
30-
case EphemeralEnvironments.Service.EphemeralEnvironmentType.describe(
31-
request.id,
32-
request.org_id
33-
) do
12+
case EphemeralEnvironmentType.describe(request.id, request.org_id) do
3413
{:ok, environment_type} ->
3514
# Note: instances field will be added once we implement instance management
3615
%{environment_type: environment_type, instances: []}
@@ -44,7 +23,7 @@ defmodule EphemeralEnvironments.Grpc.EphemeralEnvironmentsServer do
4423
end
4524

4625
def create(request, _stream) do
47-
case EphemeralEnvironments.Service.EphemeralEnvironmentType.create(request.environment_type) do
26+
case EphemeralEnvironmentType.create(request.environment_type) do
4827
{:ok, ret} ->
4928
%{environment_type: ret}
5029

@@ -54,7 +33,7 @@ defmodule EphemeralEnvironments.Grpc.EphemeralEnvironmentsServer do
5433
end
5534

5635
def update(request, _stream) do
57-
case EphemeralEnvironments.Service.EphemeralEnvironmentType.update(request.environment_type) do
36+
case EphemeralEnvironmentType.update(request.environment_type) do
5837
{:ok, environment_type} ->
5938
%{environment_type: environment_type}
6039

@@ -67,10 +46,8 @@ defmodule EphemeralEnvironments.Grpc.EphemeralEnvironmentsServer do
6746
end
6847

6948
def delete(_request, _stream) do
70-
%DeleteResponse{}
7149
end
7250

7351
def cordon(_request, _stream) do
74-
%CordonResponse{}
7552
end
7653
end

ee/ephemeral_environments/lib/ephemeral_environments/service/ephemeral_environment_type.ex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,9 @@ defmodule EphemeralEnvironments.Service.EphemeralEnvironmentType do
159159
String.replace(acc, "%{#{key}}", safe_to_string(value))
160160
end)
161161
end)
162-
|> Enum.map(fn {field, errors} ->
162+
|> Enum.map_join("; ", fn {field, errors} ->
163163
"#{field}: #{Enum.join(errors, ", ")}"
164164
end)
165-
|> Enum.join("; ")
166165
end
167166

168167
# Safely convert values to strings, handling complex types

ee/ephemeral_environments/lib/ephemeral_environments/utils/proto.ex

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ defmodule EphemeralEnvironments.Utils.Proto do
5454
end
5555

5656
def to_map(value), do: value
57-
defp convert_value(value, module, field) when is_list(value), do: Enum.map(value, &to_map/1)
58-
defp convert_value(value, module, field) when is_struct(value), do: to_map(value)
57+
defp convert_value(value, _module, _field) when is_list(value), do: Enum.map(value, &to_map/1)
58+
defp convert_value(value, _module, _field) when is_struct(value), do: to_map(value)
5959

6060
defp convert_value(value, module, field) when is_integer(value) do
6161
# Check if this field is an enum by looking at the field definition
@@ -78,37 +78,33 @@ defmodule EphemeralEnvironments.Utils.Proto do
7878
# If given field is of type enum inside the parent module, the name of the enum module
7979
# will be returned. Otherwise it will return nil.
8080
defp get_enum_module(module, field) do
81-
try do
82-
field_props =
83-
module.__message_props__().field_props |> Enum.map(fn {_num, props} -> props end)
81+
field_props =
82+
module.__message_props__().field_props |> Enum.map(fn {_num, props} -> props end)
8483

85-
field_info = find_field_info(field_props, field)
84+
field_info = find_field_info(field_props, field)
8685

87-
if field_info && field_info.enum? do
88-
case field_info.type do
89-
{:enum, enum_module} -> enum_module
90-
_ -> nil
91-
end
92-
else
93-
nil
86+
if field_info && field_info.enum? do
87+
case field_info.type do
88+
{:enum, enum_module} -> enum_module
89+
_ -> nil
9490
end
95-
rescue
96-
_ -> nil
91+
else
92+
nil
9793
end
94+
rescue
95+
_ -> nil
9896
end
9997

10098
defp integer_to_atom(enum_module, value) do
101-
try do
102-
enum_module.__message_props__()
103-
|> Map.get(:field_props, %{})
104-
|> Enum.find(fn {_name, props} -> props[:enum_value] == value end)
105-
|> case do
106-
{name, _} -> normalize_enum_name(name, enum_module)
107-
nil -> value
108-
end
109-
rescue
110-
_ -> value
99+
enum_module.__message_props__()
100+
|> Map.get(:field_props, %{})
101+
|> Enum.find(fn {_name, props} -> props[:enum_value] == value end)
102+
|> case do
103+
{name, _} -> normalize_enum_name(name, enum_module)
104+
nil -> value
111105
end
106+
rescue
107+
_ -> value
112108
end
113109

114110
# Normalize enum names by removing prefix and lowercasing

ee/ephemeral_environments/lib/internal_api/include/google/protobuf/timestamp.pb.ex

Lines changed: 0 additions & 8 deletions
This file was deleted.

ee/ephemeral_environments/scripts/internal_protos.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
list='
2-
include/google/protobuf/timestamp
32
ephemeral_environments
43
rbac
54
'

ee/ephemeral_environments/test/grpc/ephemeral_environments_server_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defmodule EphemeralEnvironments.Grpc.EphemeralEnvironmentsServerTest do
1616

1717
@org_id Ecto.UUID.generate()
1818
@user_id Ecto.UUID.generate()
19-
@grpc_port 50051
19+
@grpc_port 50_051
2020

2121
setup do
2222
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Repo)

0 commit comments

Comments
 (0)