From 7c2fb757eca893042b44c055eb17bf5cc22c6de3 Mon Sep 17 00:00:00 2001
From: dinama <dinama@users.noreply.github.com>
Date: Wed, 18 Aug 2021 10:39:47 +0300
Subject: [PATCH] ED-242: erlang 24 (#544)

---
 Makefile     |  5 +++--
 rebar.config | 27 +++++++++---------------
 rebar.lock   | 59 +++++++++++++++++++++++++++-------------------------
 3 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/Makefile b/Makefile
index 1736ff8..2b4441f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,11 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)
 
 # Base image for the service
 BASE_IMAGE_NAME := service-erlang
-BASE_IMAGE_TAG := c114fc51a7b166d22144fcbf856f217dc7b5946f
+BASE_IMAGE_TAG := fe43cb7176f34abcde7b101755600ecd8be635e3
 
+# Build image tag to be used
 BUILD_IMAGE_NAME := build-erlang
-BUILD_IMAGE_TAG := 2ea61e9556ad67d5918f060ed50353662ed84e59
+BUILD_IMAGE_TAG := d2d1596cf70bede667f875691650ccde788c7148
 
 CALL_ANYWHERE := \
 	submodules \
diff --git a/rebar.config b/rebar.config
index 4832d9c..1ef7a73 100644
--- a/rebar.config
+++ b/rebar.config
@@ -26,8 +26,8 @@
 
 %% Common project dependencies.
 {deps, [
-    {cowboy, "2.7.0"},
-    {jose, "1.11.1"},
+    {cowboy, "2.9.0"},
+    {jose, "1.11.2"},
     {genlib, {git, "https://github.com/rbkmoney/genlib.git", {branch, "master"}}},
     {cowboy_draining_server, {git, "https://github.com/rbkmoney/cowboy_draining_server.git", {branch, "master"}}},
     {woody, {git, "https://github.com/rbkmoney/woody_erlang.git", {branch, "master"}}},
@@ -44,13 +44,14 @@
     {erl_health, {git, "https://github.com/rbkmoney/erlang-health.git", {branch, master}}},
     {uac, {git, "https://github.com/rbkmoney/erlang_uac.git", {branch, master}}},
     {lechiffre, {git, "https://github.com/rbkmoney/lechiffre.git", {branch, master}}},
-    {prometheus, "4.6.0"},
+    {prometheus, "4.8.1"},
     {prometheus_cowboy, "0.1.8"},
     {bouncer_proto, {git, "https://github.com/rbkmoney/bouncer-proto.git", {branch, master}}},
     {bouncer_client, {git, "https://github.com/rbkmoney/bouncer_client_erlang.git", {branch, master}}},
-    {token_keeper_client, {git, "git@github.com:rbkmoney/token-keeper-client.git", {branch, master}}},
+    {token_keeper_client, {git, "https://github.com/rbkmoney/token-keeper-client.git", {branch, master}}},
     {party_client, {git, "https://github.com/rbkmoney/party_client_erlang.git", {branch, master}}},
-    {payout_manager_proto, {git, "git@github.com:rbkmoney/payout-manager-proto.git", {branch, master}}}
+    {payout_manager_proto, {git, "https://github.com/rbkmoney/payout-manager-proto.git", {branch, master}}},
+    {how_are_you, {git, "https://github.com/rbkmoney/how_are_you.git", {branch, master}}}
 ]}.
 
 %% XRef checks
@@ -82,17 +83,9 @@
 {profiles, [
     {prod, [
         {deps, [
-            {recon, "2.3.2"},
-            {how_are_you, {
-                git,
-                "https://github.com/rbkmoney/how_are_you.git",
-                {ref, "29f9d3d"}
-            }},
-            {logger_logstash_formatter, {
-                git,
-                "https://github.com/rbkmoney/logger_logstash_formatter.git",
-                {ref, "87e52c7"}
-            }}
+            {recon, "2.3.6"},
+            {logger_logstash_formatter,
+                {git, "https://github.com/rbkmoney/logger_logstash_formatter.git", {ref, "87e52c7"}}}
         ]},
         {relx, [
             {release, {capi, "0.1.0"}, [
@@ -122,7 +115,7 @@
 ]}.
 
 {plugins, [
-    {erlfmt, "0.15.1"}
+    {erlfmt, "1.0.0"}
 ]}.
 
 {erlfmt, [
diff --git a/rebar.lock b/rebar.lock
index be7c4d4..cd7465d 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,6 +1,6 @@
 {"1.2.0",
 [{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
- {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},3},
+ {<<"bear">>,{pkg,<<"bear">>,<<"0.9.0">>},2},
  {<<"bender_client">>,
   {git,"https://github.com/rbkmoney/bender_client_erlang.git",
        {ref,"69024efc38167c515d1dc7b7c2bb52262ffe7d0d"}},
@@ -23,7 +23,7 @@
   {git,"https://github.com/rbkmoney/cg_mon.git",
        {ref,"5a87a37694e42b6592d3b4164ae54e0e87e24e18"}},
   1},
- {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.7.0">>},0},
+ {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0},
  {<<"cowboy_access_log">>,
   {git,"https://github.com/rbkmoney/cowboy_access_log.git",
        {ref,"c058ad42cd11c6503feb398fb8587c2f72155a60"}},
@@ -36,14 +36,14 @@
   {git,"https://github.com/rbkmoney/cowboy_draining_server.git",
        {ref,"186cf4d0722d4ad79afe73d371df6b1371e51905"}},
   0},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.8.0">>},1},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
  {<<"damsel">>,
   {git,"https://github.com/rbkmoney/damsel.git",
        {ref,"824c05e003783c2d8f1f797b1f2243147ba8be9c"}},
   0},
  {<<"dmt_client">>,
   {git,"https://github.com/rbkmoney/dmt_client.git",
-       {ref,"53924f4de479d6a5e05199b5d25931237150d72d"}},
+       {ref,"3f66402843ffeb488010f707a193858cb09325e0"}},
   0},
  {<<"dmt_core">>,
   {git,"https://github.com/rbkmoney/dmt_core.git",
@@ -56,8 +56,8 @@
   0},
  {<<"folsom">>,
   {git,"https://github.com/folsom-project/folsom.git",
-       {ref,"eeb1cc467eb64bd94075b95b8963e80d8b4df3df"}},
-  2},
+       {ref,"62fd0714e6f0b4e7833880afe371a9c882ea0fc2"}},
+  1},
  {<<"genlib">>,
   {git,"https://github.com/rbkmoney/genlib.git",
        {ref,"3e1776536802739d8819351b15d54ec70568aba7"}},
@@ -70,18 +70,18 @@
  {<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.4">>},0},
  {<<"how_are_you">>,
   {git,"https://github.com/rbkmoney/how_are_you.git",
-       {ref,"8f11d17eeb6eb74096da7363a9df272fd3099718"}},
-  1},
+       {ref,"2fd8013420328464c2c84302af2781b86577b39f"}},
+  0},
  {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},1},
  {<<"jesse">>,
   {git,"https://github.com/rbkmoney/jesse.git",
        {ref,"9b980b7f9ce09b6a136fe5a23d404d1b903f3061"}},
   0},
- {<<"jose">>,{pkg,<<"jose">>,<<"1.11.1">>},0},
+ {<<"jose">>,{pkg,<<"jose">>,<<"1.11.2">>},0},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},0},
  {<<"lechiffre">>,
   {git,"https://github.com/rbkmoney/lechiffre.git",
-       {ref,"7915b7650abc80535d8c183642c5a409c942edf0"}},
+       {ref,"ab894bc7c0e830f4372d302036f044d20c76ca73"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},1},
@@ -99,24 +99,25 @@
        {ref,"a6471d4074f8098f8db0da57a2e676a22804d3ff"}},
   0},
  {<<"payout_manager_proto">>,
-  {git,"git@github.com:rbkmoney/payout-manager-proto.git",
+  {git,"https://github.com/rbkmoney/payout-manager-proto.git",
        {ref,"b6cd2286a438685fceb1f020e24dc42750b74a3e"}},
   0},
  {<<"payproc_errors">>,
   {git,"https://github.com/rbkmoney/payproc-errors-erlang.git",
        {ref,"ebbfa3775c77d665f519d39ca9afa08c28d7733f"}},
   0},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.6.0">>},0},
+ {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.8.1">>},0},
  {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},0},
  {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},1},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.7.1">>},1},
+ {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},1},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"reporter_proto">>,
   {git,"https://github.com/rbkmoney/reporter-proto.git",
        {ref,"aafbfac4463711d43f8e8ed4da103967b95e1fb6"}},
   0},
  {<<"scoper">>,
   {git,"https://github.com/rbkmoney/scoper.git",
-       {ref,"89a973bf3cedc5a48c9fd89d719d25e79fe10027"}},
+       {ref,"a2c2b7a4b1770205b7b1dbe2e0df6c88044e6244"}},
   0},
  {<<"snowflake">>,
   {git,"https://github.com/rbkmoney/snowflake.git",
@@ -128,7 +129,7 @@
        {ref,"846a0819d9b6d09d0c31f160e33a78dbad2067b4"}},
   1},
  {<<"token_keeper_client">>,
-  {git,"git@github.com:rbkmoney/token-keeper-client.git",
+  {git,"https://github.com/rbkmoney/token-keeper-client.git",
        {ref,"e526db14a1d07af71f498a6ed25d1de114ef57a3"}},
   0},
  {<<"token_keeper_proto">>,
@@ -142,7 +143,7 @@
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},1},
  {<<"woody">>,
   {git,"https://github.com/rbkmoney/woody_erlang.git",
-       {ref,"d9fca6da55a46e39bdb7ad2c0dba0b7205a7e70b"}},
+       {ref,"330bdcf71e99c2ea7aed424cd718939cb360ec1c"}},
   0},
  {<<"woody_user_identity">>,
   {git,"https://github.com/rbkmoney/woody_erlang_user_identity.git",
@@ -151,46 +152,48 @@
 [
 {pkg_hash,[
  {<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
- {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
+ {<<"bear">>, <<"A31CCF5361791DD5E708F4789D67E2FEF496C4F05935FC59ADC11622F834D128">>},
  {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
  {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
- {<<"cowboy">>, <<"91ED100138A764355F43316B1D23D7FF6BDB0DE4EA618CB5D8677C93A7A2F115">>},
- {<<"cowlib">>, <<"FD0FF1787DB84AC415B8211573E9A30A3EBE71B5CBFF7F720089972B2319C8A4">>},
+ {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
  {<<"email_validator">>, <<"7E09A862E9AA99AE2CA6FD2A718D2B94360E32940A1339B53DFEE6B774BCDB03">>},
  {<<"gproc">>, <<"853CCB7805E9ADA25D227A157BA966F7B34508F386A3E7E21992B1B484230699">>},
  {<<"hackney">>, <<"99DA4674592504D3FB0CFEF0DB84C3BA02B4508BAE2DFF8C0108BAA0D6E0977C">>},
  {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
- {<<"jose">>, <<"59DA64010C69AAD6CDE2F5B9248B896B84472E99BD18F246085B7B9FE435DCDB">>},
+ {<<"jose">>, <<"F4C018CCF4FDCE22C71E44D471F15F723CB3EFAB5D909AB2BA202B5BF35557B3">>},
  {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
  {<<"parse_trans">>, <<"BB87AC362A03CA674EBB7D9D498F45C03256ADED7214C9101F7035EF44B798C7">>},
- {<<"prometheus">>, <<"20510F381DB1CCAB818B4CF2FAC5FA6AB5CC91BC364A154399901C001465F46F">>},
+ {<<"prometheus">>, <<"FA76B152555273739C14B06F09F485CF6D5D301FE4E9D31B7FF803D26025D7A0">>},
  {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
  {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
- {<<"ranch">>, <<"6B1FAB51B49196860B733A49C07604465A47BDB78AA10C1C16A3D199F7F8C881">>},
+ {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
+ {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
  {<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
- {<<"bear">>, <<"534217DCE6A719D59E54FB0EB7A367900DBFC5F85757E8C1F94269DF383F6D9B">>},
+ {<<"bear">>, <<"47F71F098F2E3CD05E124A896C5EC2F155967A2B6FF6731E0D627312CCAB7E28">>},
  {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
  {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
- {<<"cowboy">>, <<"04FD8C6A39EDC6AAA9C26123009200FC61F92A3A94F3178C527B70B767C6E605">>},
- {<<"cowlib">>, <<"79F954A7021B302186A950A32869DBC185523D99D3E44CE430CD1F3289F41ED4">>},
+ {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
  {<<"email_validator">>, <<"2B1E6DF7BB14155C8D7D131F1C95CF4676200BC056EEBA82123396833FF94DA2">>},
  {<<"gproc">>, <<"587E8AF698CCD3504CF4BA8D90F893EDE2B0F58CABB8A916E2BF9321DE3CF10B">>},
  {<<"hackney">>, <<"DE16FF4996556C8548D512F4DBE22DD58A587BF3332E7FD362430A7EF3986B16">>},
  {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
- {<<"jose">>, <<"078F6C9FB3CD2F4CFAFC972C814261A7D1E8D2B3685C0A76EB87E158EFFF1AC5">>},
+ {<<"jose">>, <<"98143FBC48D55F3A18DABA82D34FE48959D44538E9697C08F34200FA5F0947D2">>},
  {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
  {<<"parse_trans">>, <<"F99E368830BEA44552224E37E04943A54874F08B8590485DE8D13832B63A2DC3">>},
- {<<"prometheus">>, <<"4905FD2992F8038ECCD7AA0CD22F40637ED618C0BED1F75C05AACEC15B7545DE">>},
+ {<<"prometheus">>, <<"6EDFBE928D271C7F657A6F2C46258738086584BD6CAE4A000B8B9A6009BA23A5">>},
  {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
  {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
- {<<"ranch">>, <<"451D8527787DF716D99DC36162FCA05934915DB0B6141BBDAC2EA8D3C7AFC7D7">>},
+ {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
+ {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
  {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].