Upgrades to dmt v2 #major

.github/workflows/tag-action.yml

@@ -0,0 +1,18 @@
+name: Create Tag
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - uses: valitydev/action-tagger@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          with-v: true

apps/capi/src/capi_handler_tokens.erl

@@ -9,6 +9,7 @@
 -include_lib("tds_proto/include/tds_storage_thrift.hrl").
 -include_lib("damsel/include/dmsl_paytool_provider_thrift.hrl").
 -include_lib("moneypenny/include/mnp_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_conf_v2_thrift.hrl").
 
 -include_lib("bouncer_proto/include/bouncer_rstn_thrift.hrl").
 
@@ -748,4 +749,11 @@ encode_payment_service_ref(Provider) ->
     #domain_PaymentServiceRef{id = Provider}.
 
 validate_payment_service_ref(#domain_PaymentServiceRef{} = Ref) ->
-    dmt_client:try_checkout_data({payment_service, Ref}).
+    try
+        #domain_conf_v2_VersionedObject{object = {_Type, Object}} =
+            dmt_client:checkout_object(latest, {payment_service, Ref}),
+        {ok, Object}
+    catch
+        throw:#domain_conf_v2_ObjectNotFound{} ->
+            {error, object_not_found}
+    end.

apps/capi/src/capi_merchant_id.erl

@@ -1,8 +1,9 @@
 -module(capi_merchant_id).
 
 -include_lib("damsel/include/dmsl_paytool_provider_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_thrift.hrl").
 
--type party_id() :: dmsl_domain_thrift:'PartyID'().
+-type party_id() :: dmsl_base_thrift:'ID'().
 -type shop_id() :: dmsl_domain_thrift:'ShopID'().
 -type realm() :: dmsl_domain_thrift:'PaymentInstitutionRealm'().
 -type merchant_data() :: dmsl_paytool_provider_thrift:'MerchantID'().
@@ -18,11 +19,11 @@
 -define(THRIFT_TYPE, {struct, struct, {dmsl_paytool_provider_thrift, 'MerchantID'}}).
 
 -spec party_id(merchant_data()) -> party_id().
-party_id(#paytool_provider_MerchantID{party_id = PartyID}) ->
+party_id(#paytool_provider_MerchantID{party_ref = #domain_PartyConfigRef{id = PartyID}}) ->
     PartyID.
 
 -spec shop_id(merchant_data()) -> shop_id().
-shop_id(#paytool_provider_MerchantID{shop_id = ShopID}) ->
+shop_id(#paytool_provider_MerchantID{shop_ref = #domain_ShopConfigRef{id = ShopID}}) ->
     ShopID.
 
 -spec realm(merchant_data()) -> realm() | undefined.
@@ -32,8 +33,8 @@ realm(#paytool_provider_MerchantID{realm = Realm}) ->
 -spec encode(realm(), party_id(), shop_id()) -> merchant_id().
 encode(Realm, PartyID, ShopID) ->
     encode(#paytool_provider_MerchantID{
-        party_id = PartyID,
-        shop_id = ShopID,
+        party_ref = #domain_PartyConfigRef{id = PartyID},
+        shop_ref = #domain_ShopConfigRef{id = ShopID},
         realm = Realm
     }).
 
@@ -74,8 +75,8 @@ merchant_id_test_() ->
     MerchantID = encode(Realm, PartyID, ShopID),
     MerchantData = decode(MerchantID),
     [
-        ?_assertEqual(undefined, decode(<<"*CwABAAAAIXBhcnR5LWE0ZW">>)),
-        ?_assertEqual(undefined, decode(<<"CwABAAAAIXBhcnR5LWE0ZW">>)),
+        ?_assertEqual(undefined, decode(<<"*DAABCwABAAAAIXBhcnR5LW">>)),
+        ?_assertEqual(undefined, decode(<<"DAABCwABAAAAIXBhcnR5LW">>)),
         ?_assertNotEqual(undefined, MerchantData),
         ?_assertEqual(PartyID, party_id(MerchantData)),
         ?_assertEqual(ShopID, shop_id(MerchantData)),

apps/capi/test/capi_ct_helper.erl

@@ -4,7 +4,7 @@
 -include_lib("capi_dummy_data.hrl").
 -include_lib("capi_token_keeper_data.hrl").
 -include_lib("damsel/include/dmsl_domain_thrift.hrl").
--include_lib("damsel/include/dmsl_domain_conf_thrift.hrl").
+-include_lib("damsel/include/dmsl_domain_conf_v2_thrift.hrl").
 
 -export([init_suite/2]).
 -export([init_suite/3]).
@@ -67,35 +67,56 @@ init_suite(Module, Config, CapiEnv) ->
     SupPid = start_mocked_service_sup(Module),
     WoodyApp = start_app(woody),
     ScoperApp = start_app(scoper),
+    AllObjects = #{
+        ?PAYMENT_SYSTEM_REF(<<"VISA">>) =>
+            ?PAYMENT_SYSTEM_OBJ(
+                <<"VISA">>,
+                bankcard_validator_legacy:get_payment_system_ruleset(<<"VISA">>)
+            ),
+        ?PAYMENT_SYSTEM_REF(<<"MASTERCARD">>) =>
+            ?PAYMENT_SYSTEM_OBJ(
+                <<"MASTERCARD">>,
+                bankcard_validator_legacy:get_payment_system_ruleset(<<"MASTERCARD">>)
+            ),
+        ?PAYMENT_SERVICE_REF(<<"qiwi">>) =>
+            ?PAYMENT_SERVICE_OBJ(
+                <<"qiwi">>
+            ),
+        ?PAYMENT_SERVICE_REF(<<"euroset">>) =>
+            ?PAYMENT_SERVICE_OBJ(
+                <<"euroset">>
+            )
+    },
     ServiceURLs = mock_services_(
         [
+            {
+                'RepositoryClient',
+                {dmsl_domain_conf_v2_thrift, 'RepositoryClient'},
+                fun('CheckoutObject', {{version, 1}, ObjectRef}) ->
+                    case maps:get(ObjectRef, AllObjects, undefined) of
+                        undefined ->
+                            woody_error:raise(business, #domain_conf_v2_ObjectNotFound{});
+                        Object ->
+                            {ok, #domain_conf_v2_VersionedObject{
+                                info = #domain_conf_v2_VersionedObjectInfo{
+                                    version = 1,
+                                    changed_at = genlib_rfc3339:format(genlib_time:unow(), second),
+                                    changed_by = #domain_conf_v2_Author{
+                                        id = ?STRING,
+                                        name = ?STRING,
+                                        email = ?STRING
+                                    }
+                                },
+                                object = Object
+                            }}
+                    end
+                end
+            },
             {
                 'Repository',
-                {dmsl_domain_conf_thrift, 'Repository'},
-                fun('Checkout', _) ->
-                    {ok, #domain_conf_Snapshot{
-                        version = 1,
-                        domain = #{
-                            ?PAYMENT_SYSTEM_REF(<<"VISA">>) =>
-                                ?PAYMENT_SYSTEM_OBJ(
-                                    <<"VISA">>,
-                                    bankcard_validator_legacy:get_payment_system_ruleset(<<"VISA">>)
-                                ),
-                            ?PAYMENT_SYSTEM_REF(<<"MASTERCARD">>) =>
-                                ?PAYMENT_SYSTEM_OBJ(
-                                    <<"MASTERCARD">>,
-                                    bankcard_validator_legacy:get_payment_system_ruleset(<<"MASTERCARD">>)
-                                ),
-                            ?PAYMENT_SERVICE_REF(<<"qiwi">>) =>
-                                ?PAYMENT_SERVICE_OBJ(
-                                    <<"qiwi">>
-                                ),
-                            ?PAYMENT_SERVICE_REF(<<"euroset">>) =>
-                                ?PAYMENT_SERVICE_OBJ(
-                                    <<"euroset">>
-                                )
-                        }
-                    }}
+                {dmsl_domain_conf_v2_thrift, 'Repository'},
+                fun('GetLatestVersion', _) ->
+                    {ok, 1}
                 end
             }
         ],

apps/capi/test/capi_payment_resources_tests_SUITE.erl

@@ -1064,6 +1064,7 @@ gateway_merchant_id() ->
     % MerchantID сгенерированный в capi методом
     % capi_merchant_id:encode(live, <<"party-a4ef-4d03-b666-bdec4b26c5f7">>, <<"shop-a4ef-4d03-b666-bdec4b26c5f7">>)
     <<
-        "CwABAAAAIXBhcnR5LWE0ZWYtNGQwMy1iNjY2LWJkZWM0YjI2YzVmNwsAAgAAAC"
-        "BzaG9wLWE0ZWYtNGQwMy1iNjY2LWJkZWM0YjI2YzVmNwgAAwAAAAEA"
+        "DAABCwABAAAAIXBhcnR5LWE0ZWYtNGQwMy1iNjY2LWJkZWM0YjI2YzVmNwAMAA"
+        "ILAAEAAAAgc2hvcC1hNGVmLTRkMDMtYjY2Ni1iZGVjNGIyNmM1ZjcACAADAAAA"
+        "AQA"
     >>.

rebar.config

@@ -26,6 +26,8 @@
 
 %% Common project dependencies.
 {deps, [
+    {prometheus, "4.11.0"},
+    {prometheus_cowboy, "0.1.9"},
     {cowboy, "2.9.0"},
     {jsx, "3.1.0"},
     % ??? Pinning to version "1.11.2" from hex here causes constant upgrading and recompilation of the entire project
@@ -34,7 +36,7 @@
     {cowboy_draining_server, {git, "https://github.com/valitydev/cowboy_draining_server.git", {branch, "master"}}},
     {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"}}},
-    {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}},
+    {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.17"}}},
     {lechiffre, {git, "https://github.com/valitydev/lechiffre.git", {tag, "v0.1.0"}}},
     {binbase_proto, {git, "https://github.com/valitydev/binbase-proto.git", {branch, "master"}}},
     {tds_proto, {git, "https://github.com/valitydev/tds-proto.git", {branch, "master"}}},
@@ -49,9 +51,7 @@
     {bouncer_proto, {git, "https://github.com/valitydev/bouncer-proto.git", {branch, "master"}}},
     {bouncer_client, {git, "https://github.com/valitydev/bouncer-client-erlang.git", {tag, "v1.1.0"}}},
     {token_keeper_client, {git, "https://github.com/valitydev/token-keeper-client.git", {tag, "v1.1.0"}}},
-    {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {branch, master}}},
-    {prometheus, "4.11.0"},
-    {prometheus_cowboy, "0.1.9"},
+    {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.3"}}},
     % Generated dependencies
     {swag_server, {git, "https://github.com/valitydev/swag-payments.git", {branch, "release/erlang/server/v2"}}},
     {swag_client, {git, "https://github.com/valitydev/swag-payments.git", {branch, "release/erlang/client/v2"}}},

rebar.lock

@@ -1,9 +1,9 @@
 {"1.2.0",
-[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.6">>},2},
+[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.7">>},2},
  {<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},2},
  {<<"bankcard_validator">>,
   {git,"https://github.com/valitydev/bankcard-validator.git",
-       {ref,"d9c82e9fa7b017278b3f72d9e27ff0249a5e40d7"}},
+       {ref,"28073759961858a76a8ebaa294f32ed3123d6dd6"}},
   0},
  {<<"binbase_proto">>,
   {git,"https://github.com/valitydev/binbase-proto.git",
@@ -15,7 +15,7 @@
   0},
  {<<"bouncer_proto">>,
   {git,"https://github.com/valitydev/bouncer-proto.git",
-       {ref,"07dcc7b9b4599923b20bcf5f84642c3a1d6570e2"}},
+       {ref,"31866c36c049dc568d4bc795a641690db3cb20ab"}},
   0},
  {<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},1},
  {<<"cds_proto">>,
@@ -45,16 +45,12 @@
  {<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2},
  {<<"damsel">>,
   {git,"https://github.com/valitydev/damsel.git",
-       {ref,"24932cdc557a75bfb3a4aeb1738638366003aba4"}},
+       {ref,"f831d3aa5fdfd0338b41af44d1eeffe810ca9708"}},
   0},
  {<<"dmt_client">>,
   {git,"https://github.com/valitydev/dmt_client.git",
-       {ref,"d8a4f490d49c038d96f1cbc2a279164c6f4039f9"}},
+       {ref,"20c18cc9b51d0f273db60c929e8a8a871d6a1866"}},
   0},
- {<<"dmt_core">>,
-  {git,"https://github.com/valitydev/dmt-core.git",
-       {ref,"19d8f57198f2cbe5b64aa4a923ba32774e505503"}},
-  1},
  {<<"email_validator">>,{pkg,<<"email_validator">>,<<"1.1.0">>},0},
  {<<"erl_health">>,
   {git,"https://github.com/valitydev/erlang-health.git",
@@ -112,7 +108,7 @@
   0},
  {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},0},
  {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.9">>},0},
- {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.14">>},1},
+ {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.15">>},1},
  {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"scoper">>,
@@ -141,7 +137,7 @@
        {ref,"3a60e5dc5bbd709495024f26e100b041c3547fd9"}},
   1},
  {<<"tls_certificate_check">>,
-  {pkg,<<"tls_certificate_check">>,<<"1.27.0">>},
+  {pkg,<<"tls_certificate_check">>,<<"1.29.0">>},
   1},
  {<<"token_keeper_client">>,
   {git,"https://github.com/valitydev/token-keeper-client.git",
@@ -162,7 +158,7 @@
   0}]}.
 [
 {pkg_hash,[
- {<<"accept">>, <<"AD44AC7D704BF70EF8FB2E313EF5B978F9D1330BDDAC64509E93AFDA13281215">>},
+ {<<"accept">>, <<"CD6E34A2D7E28CA38B2D3CB233734CA0C221EFBC1F171F91FEC5F162CC2D18DA">>},
  {<<"acceptor_pool">>, <<"43C20D2ACAE35F0C2BCD64F9D2BDE267E459F0F3FD23DAB26485BF518C281B21">>},
  {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
  {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
@@ -185,14 +181,14 @@
  {<<"parse_trans">>, <<"6E6AA8167CB44CC8F39441D05193BE6E6F4E7C2946CB2759F015F8C56B76E5FF">>},
  {<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
  {<<"prometheus_cowboy">>, <<"D9D5B300516A61ED5AE31391F8EEEEB202230081D32A1813F2D78772B6F274E1">>},
- {<<"prometheus_httpd">>, <<"529A63CA2A451FC5D28C77020787A75AF661DADF721E7EC14B5842412FB67A32">>},
+ {<<"prometheus_httpd">>, <<"8F767D819A5D36275EAB9264AFF40D87279151646776069BF69FBDBBD562BD75">>},
  {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
- {<<"tls_certificate_check">>, <<"2C1C7FC922A329B9EB45DDF39113C998BBDEB28A534219CD884431E2AEE1811E">>},
+ {<<"tls_certificate_check">>, <<"4473005EB0BBDAD215D7083A230E2E076F538D9EA472C8009FD22006A4CFC5F6">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
- {<<"accept">>, <<"A5167FA1AE90315C3F1DD189446312F8A55D00EFA357E9C569BDA47736B874C3">>},
+ {<<"accept">>, <<"CA69388943F5DAD2E7232A5478F16086E3C872F48E32B88B378E1885A59F5649">>},
  {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>},
  {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
  {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
@@ -215,10 +211,10 @@
  {<<"parse_trans">>, <<"620A406CE75DADA827B82E453C19CF06776BE266F5A67CFF34E1EF2CBB60E49A">>},
  {<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
  {<<"prometheus_cowboy">>, <<"5F71C039DEB9E9FF9DD6366BC74C907A463872B85286E619EFF0BDA15111695A">>},
- {<<"prometheus_httpd">>, <<"8B39F8CB6467B80D648FB982FDEB796BAB006BB43B1C95279289F311DB562D4E">>},
+ {<<"prometheus_httpd">>, <<"67736D000745184D5013C58A63E947821AB90CB9320BC2E6AE5D3061C6FFE039">>},
  {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
- {<<"tls_certificate_check">>, <<"51A5AD3DBD72D4694848965F3B5076E8B55D70EB8D5057FCDDD536029AB8A23C">>},
+ {<<"tls_certificate_check">>, <<"5B0D0E5CB0F928BC4F210DF667304ED91C5BFF2A391CE6BDEDFBFE70A8F096C5">>},
  {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].