upgrade: +images +deps +composer +erlfmt (#161)

2024-11-06 02:25:17 +00:00 · 2021-06-16 11:47:42 +03:00 · 2021-06-16 11:47:42 +03:00 · 22dad3f2b8
commit 22dad3f2b8
parent 735843f619
5 changed files with 51 additions and 51 deletions
--- a/6
+++ b/6
@ -14,11 +14,11 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)

 # Base image for the service
 BASE_IMAGE_NAME := service-erlang
-BASE_IMAGE_TAG := c0aee9a464ee26b8887dd9660dca69d4c3444179
+BASE_IMAGE_TAG := e95691e5793a8cc497d37fd16c8869215846d926

 # Build image tag to be used
 BUILD_IMAGE_NAME := build-erlang
-BUILD_IMAGE_TAG := 9bedaf514a40f758f1e94d3d542e009bf21d96c1
+BUILD_IMAGE_TAG := 4e43ee45b2d476686130b136dce2572a366d3f6a

 CALL_ANYWHERE := all submodules compile xref lint dialyze release clean distclean check_format format

@ -45,7 +45,7 @@ xref: submodules
 	$(REBAR) xref

 lint:
-	elvis rock
+	elvis -V rock

 check_format:
 	$(REBAR) fmt -c
--- a/docker-compose.sh
+++ b/docker-compose.sh
@ -15,7 +15,7 @@ services:
        condition: service_healthy

  machinegun:
-    image: dr2.rbkmoney.com/rbkmoney/machinegun:0f68aa7e5f90eb97f6be66b667a853614fa62636
+    image: dr2.rbkmoney.com/rbkmoney/machinegun:627130675ad6e7ee2127126740fe369542905b4b
    command: /opt/machinegun/bin/machinegun foreground
    volumes:
      - ./test/machinegun/config.yaml:/opt/machinegun/etc/config.yaml
--- a/rebar.config
+++ b/rebar.config
@ -96,7 +96,7 @@
 ]}.

 {plugins, [
-    {erlfmt, "0.8.0"}
+    {erlfmt, "0.14.1"}
 ]}.

 {erlfmt, [
--- a/rebar.lock
+++ b/rebar.lock
@ -1,21 +1,21 @@
 {"1.2.0",
 [{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
 {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},3},
- {<<"cache">>,{pkg,<<"cache">>,<<"2.2.0">>},1},
- {<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.1">>},2},
+ {<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},1},
+ {<<"certifi">>,{pkg,<<"certifi">>,<<"2.6.1">>},2},
 {<<"cg_mon">>,
  {git,"https://github.com/rbkmoney/cg_mon.git",
       {ref,"5a87a37694e42b6592d3b4164ae54e0e87e24e18"}},
  1},
- {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.7.0">>},1},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.8.0">>},2},
+ {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},1},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2},
 {<<"damsel">>,
  {git,"git@github.com:rbkmoney/damsel.git",
       {ref,"c6c5feabd6408ce24393bd63636a46c7c23f0949"}},
  0},
 {<<"dmt_client">>,
  {git,"git@github.com:rbkmoney/dmt_client.git",
-       {ref,"24e3aad9ce6a84128b4a0fca12582cec743f46de"}},
+       {ref,"37f376e239a2182cbb2a7a052797e99955edbaad"}},
  0},
 {<<"dmt_core">>,
  {git,"git@github.com:rbkmoney/dmt_core.git",
@ -23,7 +23,7 @@
  0},
 {<<"erl_health">>,
  {git,"https://github.com/rbkmoney/erlang-health.git",
-       {ref,"406fdd367bc085eec48e2337dad63a86ef81acd3"}},
+       {ref,"5958e2f35cd4d09f40685762b82b82f89b4d9333"}},
  0},
 {<<"folsom">>,
  {git,"https://github.com/folsom-project/folsom.git",
@ -31,84 +31,84 @@
  2},
 {<<"genlib">>,
  {git,"https://github.com/rbkmoney/genlib.git",
-       {ref,"1ca08793ad8af0beb26eda8cd00687c69f7ef8b4"}},
+       {ref,"3e1776536802739d8819351b15d54ec70568aba7"}},
  0},
- {<<"gproc">>,{pkg,<<"gproc">>,<<"0.8.0">>},1},
- {<<"hackney">>,{pkg,<<"hackney">>,<<"1.15.2">>},1},
+ {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},1},
+ {<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.4">>},1},
 {<<"how_are_you">>,
  {git,"https://github.com/rbkmoney/how_are_you.git",
       {ref,"8f11d17eeb6eb74096da7363a9df272fd3099718"}},
  1},
- {<<"idna">>,{pkg,<<"idna">>,<<"6.0.0">>},2},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.0">>},1},
+ {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2},
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},1},
 {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
 {<<"mg_proto">>,
  {git,"https://github.com/rbkmoney/machinegun_proto.git",
-       {ref,"7def31fad4c7a49f7dcf46545ee99cd7186ba1fc"}},
+       {ref,"f77367a05c89162bf1e6c3928d611343aba9717a"}},
  0},
 {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2},
- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},3},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2},
 {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.6.0">>},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">>},2},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2},
 {<<"scoper">>,
  {git,"https://github.com/rbkmoney/scoper.git",
-       {ref,"8e3499b17a0a34eeb32f92ad192e6cc5bd76e77b"}},
+       {ref,"89a973bf3cedc5a48c9fd89d719d25e79fe10027"}},
  0},
 {<<"snowflake">>,
  {git,"https://github.com/rbkmoney/snowflake.git",
-       {ref,"7f379ad5e389e1c96389a8d60bae8117965d6a6d"}},
+       {ref,"de159486ef40cec67074afe71882bdc7f7deab72"}},
  1},
- {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.5">>},2},
+ {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
 {<<"thrift">>,
  {git,"https://github.com/rbkmoney/thrift_erlang.git",
-       {ref,"4eda678c985d2894251b91ae43aacf7941846cc9"}},
+       {ref,"846a0819d9b6d09d0c31f160e33a78dbad2067b4"}},
  1},
- {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.4.1">>},3},
+ {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
 {<<"woody">>,
  {git,"https://github.com/rbkmoney/woody_erlang.git",
-       {ref,"d106ef66bdd9ac303e05e1d5cddde85e0fa5f36a"}},
+       {ref,"d9fca6da55a46e39bdb7ad2c0dba0b7205a7e70b"}},
  0}]}.
 [
 {pkg_hash,[
 {<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
 {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
- {<<"cache">>, <<"3C11DBF4CD8FCD5787C95A5FB2A04038E3729CFCA0386016EEA8C953AB48A5AB">>},
- {<<"certifi">>, <<"867CE347F7C7D78563450A18A6A28A8090331E77FA02380B4A21962A65D36EE5">>},
- {<<"cowboy">>, <<"91ED100138A764355F43316B1D23D7FF6BDB0DE4EA618CB5D8677C93A7A2F115">>},
- {<<"cowlib">>, <<"FD0FF1787DB84AC415B8211573E9A30A3EBE71B5CBFF7F720089972B2319C8A4">>},
- {<<"gproc">>, <<"CEA02C578589C61E5341FCE149EA36CCEF236CC2ECAC8691FBA408E7EA77EC2F">>},
- {<<"hackney">>, <<"07E33C794F8F8964EE86CEBEC1A8ED88DB5070E52E904B8F12209773C1036085">>},
- {<<"idna">>, <<"689C46CBCDF3524C44D5F3DDE8001F364CD7608A99556D8FBD8239A5798D4C10">>},
- {<<"jsx">>, <<"749BEC6D205C694AE1786D62CEA6CC45A390437E24835FD16D12D74F07097727">>},
+ {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
+ {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
+ {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
+ {<<"gproc">>, <<"853CCB7805E9ADA25D227A157BA966F7B34508F386A3E7E21992B1B484230699">>},
+ {<<"hackney">>, <<"99DA4674592504D3FB0CFEF0DB84C3BA02B4508BAE2DFF8C0108BAA0D6E0977C">>},
+ {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
+ {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
 {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
 {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
- {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
+ {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
 {<<"prometheus">>, <<"20510F381DB1CCAB818B4CF2FAC5FA6AB5CC91BC364A154399901C001465F46F">>},
 {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
 {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
- {<<"ranch">>, <<"6B1FAB51B49196860B733A49C07604465A47BDB78AA10C1C16A3D199F7F8C881">>},
- {<<"ssl_verify_fun">>, <<"6EAF7AD16CB568BB01753DBBD7A95FF8B91C7979482B95F38443FE2C8852A79B">>},
- {<<"unicode_util_compat">>, <<"D869E4C68901DD9531385BB0C8C40444EBF624E60B6962D95952775CAC5E90CD">>}]},
+ {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
+ {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
+ {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
 {<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
 {<<"bear">>, <<"534217DCE6A719D59E54FB0EB7A367900DBFC5F85757E8C1F94269DF383F6D9B">>},
- {<<"cache">>, <<"3E7D6706DE5DF76C4D71C895B4BE62B01C3DE6EDB63197035E465C3BCE63F19B">>},
- {<<"certifi">>, <<"805ABD97539CAF89EC6D4732C91E62BA9DA0CDA51AC462380BBD28EE697A8C42">>},
- {<<"cowboy">>, <<"04FD8C6A39EDC6AAA9C26123009200FC61F92A3A94F3178C527B70B767C6E605">>},
- {<<"cowlib">>, <<"79F954A7021B302186A950A32869DBC185523D99D3E44CE430CD1F3289F41ED4">>},
- {<<"gproc">>, <<"580ADAFA56463B75263EF5A5DF4C86AF321F68694E7786CB057FD805D1E2A7DE">>},
- {<<"hackney">>, <<"E0100F8EF7D1124222C11AD362C857D3DF7CB5F4204054F9F0F4A728666591FC">>},
- {<<"idna">>, <<"4BDD305EB64E18B0273864920695CB18D7A2021F31A11B9C5FBCD9A253F936E2">>},
- {<<"jsx">>, <<"A8BA15D5BAC2C48B2BE1224A0542AD794538D79E2CC16841A4E24CA75F0F8378">>},
+ {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
+ {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
+ {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
+ {<<"gproc">>, <<"587E8AF698CCD3504CF4BA8D90F893EDE2B0F58CABB8A916E2BF9321DE3CF10B">>},
+ {<<"hackney">>, <<"DE16FF4996556C8548D512F4DBE22DD58A587BF3332E7FD362430A7EF3986B16">>},
+ {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
+ {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
 {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
 {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
- {<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
+ {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},
 {<<"prometheus">>, <<"4905FD2992F8038ECCD7AA0CD22F40637ED618C0BED1F75C05AACEC15B7545DE">>},
 {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
 {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
- {<<"ranch">>, <<"451D8527787DF716D99DC36162FCA05934915DB0B6141BBDAC2EA8D3C7AFC7D7">>},
- {<<"ssl_verify_fun">>, <<"13104D7897E38ED7F044C4DE953A6C28597D1C952075EB2E328BC6D6F2BFC496">>},
- {<<"unicode_util_compat">>, <<"1D1848C40487CDB0B30E8ED975E34E025860C02E419CB615D255849F3427439D">>}]}
+ {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
+ {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
+ {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].
--- a/src/dmt_api_repository_handler.erl
+++ b/src/dmt_api_repository_handler.erl
@ -96,12 +96,12 @@ handle_operation_invalid(Invalid) ->
                    object_ref = Ref,
                    referenced_by = ReferencedBy
                }}
-                || {Ref, ReferencedBy} <- Refs
+             || {Ref, ReferencedBy} <- Refs
            ];
        {object_reference_cycles, Cycles} ->
            [
                {object_reference_cycle, #'ObjectReferenceCycle'{cycle = Cycle}}
-                || Cycle <- Cycles
+             || Cycle <- Cycles
            ]
    end.