TECH-76: Upgrades to Erlang/OTP 27 (#35)

nanodirijabl · web-flow · commit bcf48f3f14a9 · 2025-02-06T14:12:51.000+03:00
* TECH-76: Upgrades to Erlang/OTP 27

* Bumps deps
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
 SERVICE_NAME=limiter
-OTP_VERSION=24.3.4
-REBAR_VERSION=3.18
+OTP_VERSION=27.1.2
+REBAR_VERSION=3.24
 THRIFT_VERSION=0.14.2.3
diff --git a/.github/workflows/erlang-checks.yml b/.github/workflows/erlang-checks.yml
@@ -18,7 +18,7 @@ jobs:
       thrift-version: ${{ steps.thrift-version.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - run: grep -v '^#' .env >> $GITHUB_ENV
       - id: otp-version
         run: echo "::set-output name=version::$OTP_VERSION"
@@ -30,7 +30,7 @@ jobs:
   run:
     name: Run checks
     needs: setup
-    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.15
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.17
     with:
       otp-version: ${{ needs.setup.outputs.otp-version }}
       rebar-version: ${{ needs.setup.outputs.rebar-version }}
diff --git a/apps/limiter/src/lim_body.erl b/apps/limiter/src/lim_body.erl
@@ -47,5 +47,5 @@ apply_op_behaviour(Operation, Body, #{op_behaviour := ComputationConfig}) ->
 apply_op_behaviour(_Operation, Body, _Config) ->
     Body.
 
-invert_body(Cash = #{amount := Amount}) ->
+invert_body(#{amount := Amount} = Cash) ->
     Cash#{amount := -Amount}.
diff --git a/apps/limiter/src/lim_client_woody.erl b/apps/limiter/src/lim_client_woody.erl
@@ -32,7 +32,7 @@ get_service_client_config(ServiceName) ->
     ServiceClients = genlib_app:env(?APP, service_clients, #{}),
     maps:get(ServiceName, ServiceClients, #{}).
 
--spec get_service_client_url(atom()) -> lim_maybe:maybe(woody:url()).
+-spec get_service_client_url(atom()) -> lim_maybe:'maybe'(woody:url()).
 get_service_client_url(ServiceName) ->
     maps:get(url, get_service_client_config(ServiceName), undefined).
 
diff --git a/apps/limiter/src/lim_config_machine.erl b/apps/limiter/src/lim_config_machine.erl
@@ -200,7 +200,7 @@ created_at(#{created_at := CreatedAt}) ->
 id(#{id := ID}) ->
     ID.
 
--spec description(config()) -> lim_maybe:maybe(description()).
+-spec description(config()) -> lim_maybe:'maybe'(description()).
 description(#{description := ID}) ->
     ID;
 description(_) ->
@@ -238,7 +238,7 @@ scope(_) ->
 context_type(#{context_type := Value}) ->
     Value.
 
--spec op_behaviour(config()) -> lim_maybe:maybe(op_behaviour()).
+-spec op_behaviour(config()) -> lim_maybe:'maybe'(op_behaviour()).
 op_behaviour(#{op_behaviour := Value}) ->
     Value;
 op_behaviour(_) ->
@@ -281,21 +281,21 @@ get_limit(ID, Version, LimitContext) ->
     end).
 
 -spec hold(lim_change(), lim_context()) -> ok | {error, config_error() | {processor(), hold_error()}}.
-hold(LimitChange = #limiter_LimitChange{id = ID, version = Version}, LimitContext) ->
+hold(#limiter_LimitChange{id = ID, version = Version} = LimitChange, LimitContext) ->
     do(fun() ->
         {Handler, Config} = unwrap(get_handler(ID, Version, LimitContext)),
         unwrap(Handler, Handler:hold(LimitChange, Config, LimitContext))
     end).
 
 -spec commit(lim_change(), lim_context()) -> ok | {error, config_error() | {processor(), commit_error()}}.
-commit(LimitChange = #limiter_LimitChange{id = ID, version = Version}, LimitContext) ->
+commit(#limiter_LimitChange{id = ID, version = Version} = LimitChange, LimitContext) ->
     do(fun() ->
         {Handler, Config} = unwrap(get_handler(ID, Version, LimitContext)),
         unwrap(Handler, Handler:commit(LimitChange, Config, LimitContext))
     end).
 
 -spec rollback(lim_change(), lim_context()) -> ok | {error, config_error() | {processor(), rollback_error()}}.
-rollback(LimitChange = #limiter_LimitChange{id = ID, version = Version}, LimitContext) ->
+rollback(#limiter_LimitChange{id = ID, version = Version} = LimitChange, LimitContext) ->
     do(fun() ->
         {Handler, Config} = unwrap(get_handler(ID, Version, LimitContext)),
         unwrap(Handler, Handler:rollback(LimitChange, Config, LimitContext))
@@ -836,11 +836,11 @@ not_implemented(What) ->
 
 %%
 
--spec apply_event(machinery:event(timestamped_event(event())), lim_maybe:maybe(config())) -> config().
+-spec apply_event(machinery:event(timestamped_event(event())), lim_maybe:'maybe'(config())) -> config().
 apply_event({_ID, _Ts, {ev, _EvTs, Event}}, Config) ->
     apply_event_(Event, Config).
 
--spec apply_event_(event(), lim_maybe:maybe(config())) -> config().
+-spec apply_event_(event(), lim_maybe:'maybe'(config())) -> config().
 apply_event_({created, Config}, undefined) ->
     Config.
 
diff --git a/apps/limiter/src/lim_maybe.erl b/apps/limiter/src/lim_maybe.erl
@@ -4,10 +4,10 @@
 
 -module(lim_maybe).
 
--type maybe(T) ::
+-type 'maybe'(T) ::
     undefined | T.
 
--export_type([maybe/1]).
+-export_type(['maybe'/1]).
 
 -export([from_result/1]).
 -export([to_list/1]).
@@ -18,13 +18,13 @@
 
 %%
 
--spec from_result({ok, T} | {error, _}) -> maybe(T).
+-spec from_result({ok, T} | {error, _}) -> 'maybe'(T).
 from_result({ok, T}) ->
     T;
 from_result({error, _}) ->
     undefined.
 
--spec to_list(maybe(T)) -> [T].
+-spec to_list('maybe'(T)) -> [T].
 to_list(undefined) ->
     [];
 to_list(T) ->
@@ -40,14 +40,14 @@ apply(Fun, Arg, _Default) when Arg =/= undefined ->
 apply(_Fun, undefined, Default) ->
     Default.
 
--spec get_defined([maybe(T)]) -> T.
+-spec get_defined(['maybe'(T)]) -> T.
 get_defined([]) ->
     erlang:error(badarg);
 get_defined([Value | _Tail]) when Value =/= undefined ->
     Value;
 get_defined([undefined | Tail]) ->
     get_defined(Tail).
 
--spec get_defined(maybe(T), maybe(T)) -> T.
+-spec get_defined('maybe'(T), 'maybe'(T)) -> T.
 get_defined(V1, V2) ->
     get_defined([V1, V2]).
diff --git a/apps/limiter/src/lim_payproc_context.erl b/apps/limiter/src/lim_payproc_context.erl
@@ -33,9 +33,9 @@ get_operation(#context_payproc_Context{op = undefined}) ->
 make_change_context(#context_payproc_Context{op = undefined}) ->
     {ok, #{}};
 make_change_context(
-    Context = #context_payproc_Context{
+    #context_payproc_Context{
         op = {Operation, _}
-    }
+    } = Context
 ) ->
     {ok,
         genlib_map:compact(#{
diff --git a/apps/limiter/src/lim_posting.erl b/apps/limiter/src/lim_posting.erl
@@ -18,14 +18,14 @@ new(#{account_id_from := From, account_id_to := To}, Amount, Currency) ->
         description = <<>>
     }).
 
-reverse_negative_posting(Posting = #accounter_Posting{amount = Amount}) when Amount < 0 ->
+reverse_negative_posting(#accounter_Posting{amount = Amount} = Posting) when Amount < 0 ->
     PostingReversed = reverse(Posting),
     PostingReversed#accounter_Posting{amount = -Amount};
 reverse_negative_posting(Posting) ->
     Posting.
 
 -spec reverse(posting()) -> posting().
-reverse(Posting = #accounter_Posting{from_id = AccountFrom, to_id = AccountTo}) ->
+reverse(#accounter_Posting{from_id = AccountFrom, to_id = AccountTo} = Posting) ->
     Posting#accounter_Posting{
         from_id = AccountTo,
         to_id = AccountFrom
diff --git a/apps/limiter/src/lim_range_codec.erl b/apps/limiter/src/lim_range_codec.erl
@@ -31,11 +31,11 @@ marshal(change, {time_range_created, TimeRange}) ->
     {time_range_created, #range_TimeRangeCreatedChange{time_range = marshal(time_range, TimeRange)}};
 marshal(
     range,
-    Range = #{
+    #{
         id := ID,
         type := Type,
         created_at := CreatedAt
-    }
+    } = Range
 ) ->
     #range_LimitRange{
         id = ID,
diff --git a/apps/limiter/src/lim_range_machine.erl b/apps/limiter/src/lim_range_machine.erl
@@ -123,7 +123,7 @@ get(ID, LimitContext) ->
     get_state(ID, lim_context:woody_context(LimitContext)).
 
 -spec ensure_exists(create_params(), time_range(), lim_context()) -> {ok, time_range_ext()}.
-ensure_exists(Params = #{id := ID}, TimeRange, LimitContext) ->
+ensure_exists(#{id := ID} = Params, TimeRange, LimitContext) ->
     WoodyCtx = lim_context:woody_context(LimitContext),
     case get_state(ID, WoodyCtx) of
         {ok, State} ->
@@ -246,15 +246,15 @@ not_implemented(What) ->
 
 %%
 
--spec apply_event(machinery:event(timestamped_event(event())), lim_maybe:maybe(limit_range_state())) ->
+-spec apply_event(machinery:event(timestamped_event(event())), lim_maybe:'maybe'(limit_range_state())) ->
     limit_range_state().
 apply_event({_ID, _Ts, {ev, _EvTs, Event}}, Config) ->
     apply_event_(Event, Config).
 
--spec apply_event_(event(), lim_maybe:maybe(limit_range_state())) -> limit_range_state().
+-spec apply_event_(event(), lim_maybe:'maybe'(limit_range_state())) -> limit_range_state().
 apply_event_({created, LimitRange}, undefined) ->
     LimitRange;
-apply_event_({time_range_created, TimeRange}, LimitRange = #{ranges := Ranges}) ->
+apply_event_({time_range_created, TimeRange}, #{ranges := Ranges} = LimitRange) ->
     LimitRange#{ranges => [TimeRange | Ranges]};
 apply_event_({time_range_created, TimeRange}, LimitRange) ->
     LimitRange#{ranges => [TimeRange]}.
diff --git a/apps/limiter/src/lim_turnover_metric.erl b/apps/limiter/src/lim_turnover_metric.erl
@@ -51,7 +51,7 @@ get_commit_body(Config, LimitContext) ->
 
 denominate(#{amount := Amount, currency := Currency}, Currency, _Config, _LimitContext) ->
     {ok, Amount};
-denominate(Body = #{currency := Currency}, DestinationCurrency, Config, LimitContext) ->
+denominate(#{currency := Currency} = Body, DestinationCurrency, Config, LimitContext) ->
     case lim_config_machine:currency_conversion(Config) of
         false -> currencies_mismatch_error(Currency, DestinationCurrency);
         true -> convert_currency(Body, DestinationCurrency, Config, LimitContext)
diff --git a/apps/limiter/src/lim_turnover_processor.erl b/apps/limiter/src/lim_turnover_processor.erl
@@ -87,7 +87,7 @@ find_range_balance_amount(LimitRangeID, TimeRange, LimitContext) ->
     end.
 
 -spec hold(lim_change(), config(), lim_context()) -> ok | {error, hold_error()}.
-hold(LimitChange = #limiter_LimitChange{id = LimitID, version = Version}, Config, LimitContext) ->
+hold(#limiter_LimitChange{id = LimitID, version = Version} = LimitChange, Config, LimitContext) ->
     do(fun() ->
         TimeRangeAccount = unwrap(ensure_limit_time_range(LimitID, Version, Config, LimitContext)),
         Metric = unwrap(compute_metric(hold, Config, LimitContext)),
@@ -96,7 +96,7 @@ hold(LimitChange = #limiter_LimitChange{id = LimitID, version = Version}, Config
     end).
 
 -spec commit(lim_change(), config(), lim_context()) -> ok | {error, commit_error()}.
-commit(LimitChange = #limiter_LimitChange{id = LimitID, version = Version}, Config, LimitContext) ->
+commit(#limiter_LimitChange{id = LimitID, version = Version} = LimitChange, Config, LimitContext) ->
     do(fun() ->
         TimeRangeAccount = unwrap(ensure_limit_time_range(LimitID, Version, Config, LimitContext)),
         PlanID = construct_plan_id(LimitChange),
@@ -120,7 +120,7 @@ commit(LimitChange = #limiter_LimitChange{id = LimitID, version = Version}, Conf
     end).
 
 -spec rollback(lim_change(), config(), lim_context()) -> ok | {error, rollback_error()}.
-rollback(LimitChange = #limiter_LimitChange{id = LimitID, version = Version}, Config, LimitContext) ->
+rollback(#limiter_LimitChange{id = LimitID, version = Version} = LimitChange, Config, LimitContext) ->
     do(fun() ->
         TimeRangeAccount = unwrap(ensure_limit_time_range(LimitID, Version, Config, LimitContext)),
         Metric = unwrap(compute_metric(hold, Config, LimitContext)),
diff --git a/apps/limiter/src/lim_wthdproc_context.erl b/apps/limiter/src/lim_wthdproc_context.erl
@@ -29,9 +29,9 @@ get_operation(#context_withdrawal_Context{op = undefined}) ->
 make_change_context(#context_withdrawal_Context{op = undefined}) ->
     {ok, #{}};
 make_change_context(
-    Context = #context_withdrawal_Context{
+    #context_withdrawal_Context{
         op = {Operation, _}
-    }
+    } = Context
 ) ->
     {ok,
         genlib_map:compact(#{
diff --git a/apps/limiter/test/lim_turnover_SUITE.erl b/apps/limiter/test/lim_turnover_SUITE.erl
@@ -271,7 +271,6 @@ end_per_testcase(_Name, C) ->
     version = Version
 }).
 -define(LIMIT_REQUEST(ID, Changes), #limiter_LimitRequest{operation_id = ID, limit_changes = Changes}).
--define(LIMIT(Amount), #limiter_Limit{amount = Amount}).
 
 -spec commit_with_long_change_id(config()) -> _.
 commit_with_long_change_id(C) ->
@@ -1122,10 +1121,10 @@ configure_limit(TimeRange, Scope, Metric, CurrencyConversion, ID, C) ->
     ConfigSource = proplists:get_value(limit_config_source, C, legacy),
     put_config_into_repository(ConfigSource, CreateParams, ?config(client, C)).
 
-put_config_into_repository(legacy, CreateParams = #config_LimitConfigParams{id = ID}, Client) ->
+put_config_into_repository(legacy, #config_LimitConfigParams{id = ID} = CreateParams, Client) ->
     {ok, _LimitConfig} = lim_client:create_config(CreateParams, Client),
     {ID, undefined};
-put_config_into_repository(repository, CreateParams = #config_LimitConfigParams{id = ID}, _Client) ->
+put_config_into_repository(repository, #config_LimitConfigParams{id = ID} = CreateParams, _Client) ->
     LimitConfigObject = mk_limit_config_object(CreateParams),
     Version = dmt_client:insert({limit_config, LimitConfigObject}),
     {ID, Version}.
diff --git a/elvis.config b/elvis.config
@@ -11,7 +11,10 @@
                     {elvis_style, god_modules, #{limit => 30, ignore => [lim_config_machine]}},
                     {elvis_style, nesting_level, #{level => 3}},
                     {elvis_style, dont_repeat_yourself, #{min_complexity => 20}},
-                    {elvis_style, no_if_expression, disable}
+                    {elvis_style, no_if_expression, disable},
+                    {elvis_style, no_throw, disable},
+                    {elvis_style, no_import, disable},
+                    {elvis_style, export_used_types, disable}
                 ]
             },
             #{
@@ -27,7 +30,8 @@
                     {elvis_style, used_ignored_variable, disable},
                     % Tests are usually more comprehensible when a bit more verbose.
                     {elvis_style, dont_repeat_yourself, #{min_complexity => 20}},
-                    {elvis_style, god_modules, #{limit => 50, ignore => [lim_turnover_SUITE]}}
+                    {elvis_style, god_modules, #{limit => 50, ignore => [lim_turnover_SUITE]}},
+                    {elvis_style, export_used_types, disable}
                 ]
             },
             #{
@@ -49,7 +53,8 @@
                     {elvis_text_style, no_tabs},
                     {elvis_text_style, no_trailing_whitespace},
                     %% Temporarily disabled till regex pattern is available
-                    {elvis_project, no_deps_master_rebar, disable}
+                    {elvis_project, no_deps_master_rebar, disable},
+                    {elvis_project, no_branch_deps, disable}
                 ]
             },
             #{
diff --git a/rebar.config b/rebar.config
@@ -32,11 +32,11 @@
     {limiter_proto, {git, "https://github.com/valitydev/limiter-proto.git", {branch, "master"}}},
     {liminator_proto, {git, "https://github.com/valitydev/liminator-proto.git", {branch, "master"}}},
     {xrates_proto, {git, "https://github.com/valitydev/xrates-proto.git", {branch, "master"}}},
-    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {branch, "master"}}},
+    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {tag, "v1.1.0"}}},
     {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}},
-    {genlib, {git, "https://github.com/valitydev/genlib.git", {branch, "master"}}},
-    {scoper, {git, "https://github.com/valitydev/scoper.git", {branch, "master"}}},
-    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {branch, "master"}}},
+    {genlib, {git, "https://github.com/valitydev/genlib.git", {tag, "v1.1.0"}}},
+    {scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}},
+    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}},
     {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {branch, "master"}}},
     {opentelemetry_api, "1.2.1"},
     {opentelemetry, "1.3.0"},
@@ -101,9 +101,9 @@
 ]}.
 
 {project_plugins, [
-    {rebar3_lint, "1.0.1"},
-    {erlfmt, "1.0.0"},
-    {covertool, "2.0.4"}
+    {rebar3_lint, "3.2.6"},
+    {erlfmt, "1.5.0"},
+    {covertool, "2.0.7"}
 ]}.
 
 %% Linter config.
diff --git a/rebar.lock b/rebar.lock
