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

nanodirijabl · web-flow · commit 2f4415bd605e · 2025-03-20T10:41:42.000+03:00
* TECH-76: Upgrades to Erlang/OTP 27

* Lmao oops, fixes dep. Doesn't seem to get broken anyway

* Bumps CI
diff --git a/.env b/.env
@@ -2,6 +2,6 @@
 # You SHOULD specify point releases here so that build time and run time Erlang/OTPs
 # are the same. See: https://github.com/erlware/relx/pull/902
 SERVICE_NAME=wapi-pcidss
-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.yaml b/.github/workflows/erlang-checks.yaml
@@ -18,7 +18,7 @@ jobs:
       thrift-version: ${{ steps.thrift-version.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        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.18
     with:
       otp-version: ${{ needs.setup.outputs.otp-version }}
       rebar-version: ${{ needs.setup.outputs.rebar-version }}
diff --git a/apps/wapi/src/wapi.app.src b/apps/wapi/src/wapi.app.src
@@ -9,6 +9,8 @@
         public_key,
         genlib,
         lechiffre,
+        prometheus,
+        prometheus_cowboy,
         woody,
         wapi_woody_client,
         scoper,
diff --git a/apps/wapi/src/wapi_crypto.erl b/apps/wapi/src/wapi_crypto.erl
@@ -1,13 +1,13 @@
 -module(wapi_crypto).
 
--include_lib("fistful_proto/include/ff_proto_resource_token_thrift.hrl").
+-include_lib("fistful_proto/include/fistful_restoken_thrift.hrl").
 
 -type encrypted_token() :: binary().
 -type deadline() :: wapi_utils:deadline().
--type resource_token() :: ff_proto_resource_token_thrift:'ResourceToken'().
--type resource_payload() :: ff_proto_resource_token_thrift:'ResourcePayload'().
+-type resource_token() :: fistful_restoken_thrift:'ResourceToken'().
+-type resource_payload() :: fistful_restoken_thrift:'ResourcePayload'().
 -type resource() :: {bank_card, bank_card()}.
--type bank_card() :: ff_proto_base_thrift:'BankCard'().
+-type bank_card() :: fistful_fistful_base_thrift:'BankCard'().
 
 -export_type([encrypted_token/0]).
 -export_type([resource/0]).
@@ -18,7 +18,7 @@
 -spec create_resource_token(resource(), deadline()) -> encrypted_token().
 create_resource_token(Resource, ValidUntil) ->
     ResourceToken = encode_resource_token(Resource, ValidUntil),
-    ThriftType = {struct, struct, {ff_proto_resource_token_thrift, 'ResourceToken'}},
+    ThriftType = {struct, struct, {fistful_restoken_thrift, 'ResourceToken'}},
     {ok, EncodedToken} = lechiffre:encode(ThriftType, ResourceToken),
     TokenVersion = token_version(),
     <<TokenVersion/binary, ".", EncodedToken/binary>>.
@@ -45,18 +45,18 @@ token_version() ->
     <<"v2">>.
 
 decrypt_token(EncryptedToken) ->
-    ThriftType = {struct, struct, {ff_proto_resource_token_thrift, 'ResourceToken'}},
+    ThriftType = {struct, struct, {fistful_restoken_thrift, 'ResourceToken'}},
     case lechiffre:decode(ThriftType, EncryptedToken) of
         {ok, ResourceToken} ->
-            Resource = decode_resource_payload(ResourceToken#rst_ResourceToken.payload),
-            ValidUntil = decode_deadline(ResourceToken#rst_ResourceToken.valid_until),
+            Resource = decode_resource_payload(ResourceToken#restoken_ResourceToken.payload),
+            ValidUntil = decode_deadline(ResourceToken#restoken_ResourceToken.valid_until),
             {ok, {Resource, ValidUntil}};
         {error, _} = Error ->
             Error
     end.
 
 decrypt_token_v1(EncryptedToken) ->
-    ThriftType = {struct, struct, {ff_proto_base_thrift, 'BankCard'}},
+    ThriftType = {struct, struct, {fistful_fistful_base_thrift, 'BankCard'}},
     case lechiffre:decode(ThriftType, EncryptedToken) of
         {ok, BankCard} ->
             {ok, {{bank_card, BankCard}, undefined}};
@@ -72,14 +72,14 @@ encode_deadline(Deadline) ->
 
 -spec encode_resource_token(resource(), deadline()) -> resource_token().
 encode_resource_token(Resource, ValidUntil) ->
-    #rst_ResourceToken{
+    #restoken_ResourceToken{
         payload = encode_resource_payload(Resource),
         valid_until = encode_deadline(ValidUntil)
     }.
 
 -spec encode_resource_payload(resource()) -> resource_payload().
 encode_resource_payload({bank_card, BankCard}) ->
-    {bank_card_payload, #rst_BankCardPayload{
+    {bank_card_payload, #restoken_BankCardPayload{
         bank_card = BankCard
     }}.
 
@@ -91,4 +91,4 @@ decode_deadline(Deadline) ->
 
 -spec decode_resource_payload(resource_payload()) -> resource().
 decode_resource_payload({bank_card_payload, Payload}) ->
-    {bank_card, Payload#rst_BankCardPayload.bank_card}.
+    {bank_card, Payload#restoken_BankCardPayload.bank_card}.
diff --git a/apps/wapi/src/wapi_handler.erl b/apps/wapi/src/wapi_handler.erl
@@ -132,7 +132,7 @@ process_woody_error(_Source, resource_unavailable, _Details) ->
 process_woody_error(_Source, result_unknown, _Details) ->
     wapi_handler_utils:reply_error(504).
 
-do_authorize_api_key(SwagContext = #{auth_context := PreAuthContext}, WoodyContext) ->
+do_authorize_api_key(#{auth_context := PreAuthContext} = SwagContext, WoodyContext) ->
     case wapi_auth:authorize_api_key(PreAuthContext, make_token_context(SwagContext), WoodyContext) of
         {ok, AuthContext} ->
             SwagContext#{auth_context => AuthContext};
diff --git a/apps/wapi/src/wapi_payres_handler.erl b/apps/wapi/src/wapi_payres_handler.erl
@@ -1,6 +1,6 @@
 -module(wapi_payres_handler).
 
--include_lib("fistful_proto/include/ff_proto_base_thrift.hrl").
+-include_lib("fistful_proto/include/fistful_fistful_base_thrift.hrl").
 -include_lib("cds_proto/include/cds_proto_storage_thrift.hrl").
 
 -include_lib("opentelemetry_api/include/otel_tracer.hrl").
@@ -90,15 +90,15 @@ handle_request(OperationID, Req, SwagContext, Opts) ->
     end).
 
 -spec prepare(operation_id(), req_data(), handler_context(), handler_opts()) -> {ok, request_state()} | no_return().
-prepare(OperationID = 'StoreBankCard', #{'BankCard' := CardData}, Context, _Opts) ->
+prepare('StoreBankCard' = OperationID, #{'BankCard' := CardData}, Context, _Opts) ->
     Authorize = mk_auth_function(OperationID, Context),
     Process = fun() ->
         CVV = maps:get(<<"cvv">>, CardData, undefined),
         {BankCard, AuthData} = process_card_data(CardData, CVV, Context),
         wapi_handler_utils:reply_ok(201, decode_bank_card(BankCard, AuthData))
     end,
     {ok, #{authorize => Authorize, process => Process}};
-prepare(OperationID = 'GetBankCard', #{'token' := Token}, Context, _Opts) ->
+prepare('GetBankCard' = OperationID, #{'token' := Token}, Context, _Opts) ->
     Authorize = mk_auth_function(OperationID, Context),
     Process = fun() ->
         try
@@ -145,8 +145,8 @@ decrypt_token(Token) ->
                     _ ->
                         Resource
                 end,
-            LastDigits = wapi_utils:get_last_pan_digits(BankCard#'BankCard'.masked_pan),
-            Bin = BankCard#'BankCard'.bin,
+            LastDigits = wapi_utils:get_last_pan_digits(BankCard#fistful_base_BankCard.masked_pan),
+            Bin = BankCard#fistful_base_BankCard.bin,
             genlib_map:compact(
                 #{
                     <<"token">> => Token,
@@ -278,7 +278,7 @@ to_thrift(card_data, Data) ->
     };
 to_thrift(bank_card, BankCard) ->
     ExpDate = genlib_map:get(exp_date, BankCard),
-    #'BankCard'{
+    #fistful_base_BankCard{
         token = maps:get(token, BankCard),
         bin = maps:get(bin, BankCard),
         masked_pan = maps:get(last_digits, BankCard),
@@ -289,7 +289,7 @@ to_thrift(bank_card, BankCard) ->
 to_thrift(exp_date, undefined) ->
     undefined;
 to_thrift(exp_date, {Month, Year}) ->
-    #'BankCardExpDate'{
+    #fistful_base_BankCardExpDate{
         month = Month,
         year = Year
     };
@@ -302,7 +302,7 @@ to_thrift(session_data, undefined) ->
 to_thrift(payment_system, undefined) ->
     undefined;
 to_thrift(payment_system, ID) ->
-    #'PaymentSystemRef'{id = ID}.
+    #fistful_base_PaymentSystemRef{id = ID}.
 
 decode_bank_card(BankCard, AuthData) ->
     #{
diff --git a/apps/wapi/src/wapi_sup.erl b/apps/wapi/src/wapi_sup.erl
@@ -44,7 +44,7 @@ get_logic_handler_info() ->
 -spec enable_health_logging(erl_health:check()) -> erl_health:check().
 enable_health_logging(Check) ->
     EvHandler = {erl_health_event_handler, []},
-    maps:map(fun(_, V = {_, _, _}) -> #{runner => V, event_handler => EvHandler} end, Check).
+    maps:map(fun(_, {_, _, _} = V) -> #{runner => V, event_handler => EvHandler} end, Check).
 
 -spec get_prometheus_route() -> {iodata(), module(), _Opts :: any()}.
 get_prometheus_route() ->
diff --git a/apps/wapi/src/wapi_swagger_server.erl b/apps/wapi/src/wapi_swagger_server.erl
@@ -75,7 +75,7 @@ mk_operation_id_getter(#{env := Env}) ->
 %% cowboy_router:execute/2.
 %% NOTE: Be careful when upgrade cowboy in this project
 %% because cowboy_router:execute/2 call can change.
-get_operation_id(Req = #{host := _Host, path := _Path}, Env) ->
+get_operation_id(#{host := _Host, path := _Path} = Req, Env) ->
     case cowboy_router:execute(Req, Env) of
         {ok, _, #{handler_opts := {_Operations, _LogicHandler, _SwaggerHandlerOpts} = HandlerOpts}} ->
             case swag_server_payres_utils:get_operation_id(Req, HandlerOpts) of
diff --git a/apps/wapi/test/wapi_SUITE.erl b/apps/wapi/test/wapi_SUITE.erl
@@ -2,7 +2,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--include_lib("fistful_proto/include/ff_proto_base_thrift.hrl").
+-include_lib("fistful_proto/include/fistful_fistful_base_thrift.hrl").
 -include_lib("cds_proto/include/cds_proto_storage_thrift.hrl").
 -include_lib("binbase_proto/include/binbase_binbase_thrift.hrl").
 -include_lib("stdlib/include/assert.hrl").
@@ -251,8 +251,8 @@ create_resource_test(C) ->
         <<"token">> := ResourceToken
     }} = call_store_bank_card(CardNumber, C),
     {ok, {{bank_card, BankCard}, _ValidUntil}} = wapi_crypto:decrypt_resource_token(ResourceToken),
-    ?assertEqual(?BIN(CardNumber), BankCard#'BankCard'.bin),
-    ?assertEqual(?LAST_DIGITS(CardNumber), BankCard#'BankCard'.masked_pan).
+    ?assertEqual(?BIN(CardNumber), BankCard#fistful_base_BankCard.bin),
+    ?assertEqual(?LAST_DIGITS(CardNumber), BankCard#fistful_base_BankCard.masked_pan).
 
 -spec valid_until_resource_test(config()) -> test_return().
 valid_until_resource_test(C) ->
diff --git a/apps/wapi/test/wapi_ct_helper_bouncer.erl b/apps/wapi/test/wapi_ct_helper_bouncer.erl
@@ -1,9 +1,7 @@
 -module(wapi_ct_helper_bouncer).
 
--include_lib("common_test/include/ct.hrl").
 -include_lib("wapi_dummy_data.hrl").
 -include_lib("wapi_bouncer_data.hrl").
--include_lib("stdlib/include/assert.hrl").
 
 -export([mock_client/1]).
 -export([mock_arbiter/2]).
@@ -81,7 +79,7 @@ combine_fragments(Fragments) ->
     [Fragment | Rest] = maps:values(Fragments),
     lists:foldl(fun combine_fragments/2, Fragment, Rest).
 
-combine_fragments(Fragment1 = #ctx_v1_ContextFragment{}, Fragment2 = #ctx_v1_ContextFragment{}) ->
+combine_fragments(#ctx_v1_ContextFragment{} = Fragment1, #ctx_v1_ContextFragment{} = Fragment2) ->
     combine_records(Fragment1, Fragment2).
 
 combine_records(Record1, Record2) ->
diff --git a/apps/wapi/test/wapi_ct_helper_token_keeper.erl b/apps/wapi/test/wapi_ct_helper_token_keeper.erl
@@ -110,10 +110,8 @@ encode_context(Context) ->
 encode_context_content(Context) ->
     Type = {struct, struct, {bouncer_ctx_v1_thrift, 'ContextFragment'}},
     Codec = thrift_strict_binary_codec:new(),
-    case thrift_strict_binary_codec:write(Codec, Type, Context) of
-        {ok, Codec1} ->
-            thrift_strict_binary_codec:close(Codec1)
-    end.
+    {ok, Codec1} = thrift_strict_binary_codec:write(Codec, Type, Context),
+    thrift_strict_binary_codec:close(Codec1).
 
 %%
 
diff --git a/apps/wapi_client/src/wapi_client_payres.erl b/apps/wapi_client/src/wapi_client_payres.erl
@@ -10,12 +10,12 @@
 store_bank_card(Context, Request) ->
     Params = #{body => Request},
     {Url, PreparedParams, Opts} = wapi_client_lib:make_request(Context, Params),
-    Response = swag_client_payres_payment_resources_api:store_bank_card(Url, PreparedParams, Opts),
+    Response = swag_client_payres_withdrawal_resources_api:store_bank_card(Url, PreparedParams, Opts),
     wapi_client_lib:handle_response(Response).
 
 -spec get_bank_card(context(), binary()) -> {ok, #{binary() => _}} | {error, term()}.
 get_bank_card(Context, Token) ->
     Params = #{binding => #{<<"token">> => Token}},
     {Url, PreparedParams, Opts} = wapi_client_lib:make_request(Context, Params),
-    Response = swag_client_payres_payment_resources_api:get_bank_card(Url, PreparedParams, Opts),
+    Response = swag_client_payres_withdrawal_resources_api:get_bank_card(Url, PreparedParams, Opts),
     wapi_client_lib:handle_response(Response).
diff --git a/elvis.config b/elvis.config
@@ -13,7 +13,9 @@
                     {elvis_style, no_if_expression, disable},
                     %% Project rules
                     {elvis_style, atom_naming_convention, disable},
-                    {elvis_style, macro_names, disable}
+                    {elvis_style, macro_names, disable},
+                    {elvis_style, export_used_types, disable},
+                    {elvis_style, no_throw, disable}
                 ]
             },
             #{
@@ -35,7 +37,9 @@
                     % Tests are usually more comprehensible when a bit more verbose.
                     {elvis_style, dont_repeat_yourself, #{min_complexity => 50}},
                     {elvis_style, god_modules, disable},
-                    {elvis_style, macro_names, disable}
+                    {elvis_style, macro_names, disable},
+                    {elvis_style, export_used_types, disable},
+                    {elvis_style, no_throw, disable}
                 ]
             },
             #{
@@ -57,7 +61,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
@@ -39,27 +39,29 @@
     %%
     {bankcard_validator, {git, "https://github.com/valitydev/bankcard-validator.git", {branch, "master"}}},
     {bouncer_proto, {git, "https://github.com/valitydev/bouncer-proto.git", {branch, "master"}}},
-    {bouncer_client, {git, "https://github.com/valitydev/bouncer-client-erlang.git", {branch, "master"}}},
+    {bouncer_client, {git, "https://github.com/valitydev/bouncer-client-erlang.git", {tag, "v1.1.0"}}},
     {cowboy_cors, {git, "https://github.com/valitydev/cowboy_cors.git", {branch, "master"}}},
     {cowboy_access_log, {git, "https://github.com/valitydev/cowboy_access_log.git", {branch, "master"}}},
     {cowboy_draining_server, {git, "https://github.com/valitydev/cowboy_draining_server.git", {branch, "master"}}},
     {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {branch, "master"}}},
     {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}},
-    {genlib, {git, "https://github.com/valitydev/genlib.git", {branch, "master"}}},
-    {lechiffre, {git, "https://github.com/valitydev/lechiffre.git", {branch, "master"}}},
-    {scoper, {git, "https://github.com/valitydev/scoper.git", {branch, "master"}}},
-    {token_keeper_client, {git, "https://github.com/valitydev/token-keeper-client.git", {branch, "master"}}},
-    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {branch, "master"}}},
-    {woody_user_identity, {git, "https://github.com/valitydev/woody_erlang_user_identity.git", {branch, "master"}}},
+    {genlib, {git, "https://github.com/valitydev/genlib.git", {tag, "v1.1.0"}}},
+    {lechiffre, {git, "https://github.com/valitydev/lechiffre.git", {tag, "v0.1.0"}}},
+    {scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}},
+    {token_keeper_client, {git, "https://github.com/valitydev/token-keeper-client.git", {tag, "v1.1.0"}}},
+    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}},
+    {woody_user_identity, {git, "https://github.com/valitydev/woody_erlang_user_identity.git", {tag, "v1.1.0"}}},
+    {prometheus, "4.11.0"},
+    {prometheus_cowboy, "0.1.9"},
     %% Libraries generated with swagger-codegen-erlang from valitydev/swag-wallets
     {swag_server_payres,
         {git, "https://github.com/valitydev/swag-wallets", {branch, "release/erlang/payres-server/v0"}}},
     {swag_client_payres,
         {git, "https://github.com/valitydev/swag-wallets", {branch, "release/erlang/payres-client/v0"}}},
     %% OpenTelemetry deps
-    {opentelemetry_api, "1.2.1"},
-    {opentelemetry, "1.3.0"},
-    {opentelemetry_exporter, "1.3.0"}
+    {opentelemetry_api, "1.4.0"},
+    {opentelemetry, "1.5.0"},
+    {opentelemetry_exporter, "1.8.0"}
 ]}.
 
 %% XRef checks
@@ -82,7 +84,6 @@
         % mandatory
         unmatched_returns,
         error_handling,
-        race_conditions,
         unknown
     ]},
     {plt_apps, all_deps}
@@ -91,21 +92,13 @@
 {profiles, [
     {prod, [
         {deps, [
-            %% NOTE
-            %% Because of a dependency conflict, prometheus libs are only included in production build for now
-            %% https://github.com/project-fifo/rebar3_lint/issues/42
-            %% https://github.com/valitydev/hellgate/pull/2/commits/884724c1799703cee4d1033850fe32c17f986d9e
-            {prometheus, "4.8.1"},
-            {prometheus_cowboy, "0.1.8"},
             % for introspection on production
             {recon, "2.5.2"},
             {logger_logstash_formatter,
-                {git, "https://github.com/valitydev/logger_logstash_formatter.git", {ref, "08a66a6"}}},
-            {iosetopts, {git, "https://github.com/valitydev/iosetopts.git", {ref, "edb445c"}}}
+                {git, "https://github.com/valitydev/logger_logstash_formatter.git", {ref, "08a66a6"}}}
         ]},
         {relx, [
             {release, {'wapi-pcidss', "0.0.1"}, [
-                iosetopts,
                 {recon, load},
                 {runtime_tools, load},
                 {tools, load},
@@ -131,9 +124,9 @@
 ]}.
 
 {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"},
     {rebar3_thrift_compiler, {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {tag, "0.4"}}}
 ]}.
 
diff --git a/rebar.lock b/rebar.lock
