From e42fb4b0a6c02d0eebd530f5383ae8b7345207a5 Mon Sep 17 00:00:00 2001
From: Artem Ocheredko <galaxie.stern@gmail.com>
Date: Wed, 17 May 2017 11:50:18 +0300
Subject: [PATCH] HG188-add user identity (#86)

* HG-188 Move to erlang 19 dialyzer and user identity access

* HG-188 Postreview refactoring
---
 Jenkinsfile       |  2 +-
 Makefile          |  2 +-
 config/sys.config |  8 ++++++++
 rebar.config      |  5 +++++
 rebar.lock        | 38 ++++++++++++++++++++++++++++++--------
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ee2f41a..6298372 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ build('hellgate', 'docker-host', finalHook) {
       sh 'make wc_xref'
     }
     runStage('dialyze') {
-      withWsCache("_build/default/rebar3_18.3_plt") {
+      withWsCache("_build/default/rebar3_19.1_plt") {
         sh 'make wc_dialyze'
       }
     }
diff --git a/Makefile b/Makefile
index 0407b29..46616a1 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ BASE_IMAGE_NAME := service_erlang
 BASE_IMAGE_TAG := 13454a94990acb72f753623ec13599a9f6f4f852
 
 # Build image tag to be used
-BUILD_IMAGE_TAG := 7f6c3f231c0cffbf11e67f5a5e38366bef1c798f
+BUILD_IMAGE_TAG := 4fa802d2f534208b9dc2ae203e2a5f07affbf385
 
 CALL_ANYWHERE := all submodules rebar-update compile xref lint dialyze start devrel release clean distclean
 
diff --git a/config/sys.config b/config/sys.config
index 71f1fb3..285d39b 100644
--- a/config/sys.config
+++ b/config/sys.config
@@ -12,6 +12,14 @@
         ]}
     ]},
 
+    {dmt_client, [
+        {cache_update_interval, 5000}, % milliseconds
+        {service_urls, #{
+            'Repository' => <<"http://dominant:8022/v1/domain/repository">>,
+            'RepositoryClient' => <<"http://dominant:8022/v1/domain/repository_client">>
+        }}
+    ]},
+
     {hellgate, [
         {ip, "::"},
         {port, 8022},
diff --git a/rebar.config b/rebar.config
index 2cd8eca..2418add 100644
--- a/rebar.config
+++ b/rebar.config
@@ -34,6 +34,11 @@
     {gproc, "0.6.1"},
     {genlib, {git, "https://github.com/rbkmoney/genlib.git", {branch, "master"}}},
     {woody, {git, "git@github.com:rbkmoney/woody_erlang.git", {branch, "master"}}},
+    {woody_user_identity,
+        {git, "git@github.com:rbkmoney/woody_erlang_user_identity.git",
+            {branch, "master"}
+        }
+    },
     {dmsl, {git, "git@github.com:rbkmoney/damsel_erlang.git", {branch, "master"}}},
     {dmt_client, {git, "git@github.com:rbkmoney/dmt_client.git", {branch, "master"}}}
 ]}.
diff --git a/rebar.lock b/rebar.lock
index 2a5436e..73635eb 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,3 +1,4 @@
+{"1.1.0",
 [{<<"certifi">>,{pkg,<<"certifi">>,<<"0.7.0">>},2},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"1.0.4">>},1},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},2},
@@ -5,14 +6,14 @@
   {git,"git@github.com:rbkmoney/damsel_erlang.git",
        {ref,"56fb48e6a23471e49a88c0d646680fba14e74d35"}},
   0},
- {<<"dmt">>,
-  {git,"git@github.com:rbkmoney/dmt_core.git",
-       {ref,"cbcc1d24b8e50afc50a884a829c808d30da1a521"}},
-  1},
  {<<"dmt_client">>,
   {git,"git@github.com:rbkmoney/dmt_client.git",
-       {ref,"601f7bfb22953dd0603fdda5d44e0b23895a22d0"}},
+       {ref,"d2be019477bce6df639c4ded7670d8cc4df37f6a"}},
   0},
+ {<<"dmt_core">>,
+  {git,"git@github.com:rbkmoney/dmt_core.git",
+       {ref,"fdc4c1a3b7c22c148e04bbbdbbb83aeba9f99ea3"}},
+  1},
  {<<"genlib">>,
   {git,"https://github.com/rbkmoney/genlib.git",
        {ref,"82ff16f4314fc406dd90752467a08fe401b009ef"}},
@@ -38,9 +39,30 @@
  {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.1">>},2},
  {<<"thrift">>,
   {git,"https://github.com/rbkmoney/thrift_erlang.git",
-       {ref,"aca7fca9f1a7161a1324bf5b92f8402c90d0519e"}},
+       {ref,"240bbc842f6e9b90d01bd07838778cf48752b510"}},
   1},
  {<<"woody">>,
   {git,"git@github.com:rbkmoney/woody_erlang.git",
-       {ref,"b5ae9ae3abc8da470f68d2e2ca15ccc606801225"}},
-  0}].
+       {ref,"992c279466e7eb1c24a9d9c6e7e8d66c597bc7e1"}},
+  0},
+ {<<"woody_user_identity">>,
+  {git,"git@github.com:rbkmoney/woody_erlang_user_identity.git",
+       {ref,"9c7ad2b8beac9c88c54594b264743dec7b9cf696"}},
+  0}]}.
+[
+{pkg_hash,[
+ {<<"certifi">>, <<"861A57F3808F7EB0C2D1802AFEAAE0FA5DE813B0DF0979153CBAFCD853ABABAF">>},
+ {<<"cowboy">>, <<"A324A8DF9F2316C833A470D918AAF73AE894278B8AA6226CE7A9BF699388F878">>},
+ {<<"cowlib">>, <<"9D769A1D062C9C3AC753096F868CA121E2730B9A377DE23DEC0F7E08B1DF84EE">>},
+ {<<"goldrush">>, <<"2024BA375CEEA47E27EA70E14D2C483B2D8610101B4E852EF7F89163CDB6E649">>},
+ {<<"gproc">>, <<"4579663E5677970758A05D8F65D13C3E9814EC707AD51D8DCEF7294EDA1A730C">>},
+ {<<"hackney">>, <<"96A0A5E7E65B7ACAD8031D231965718CC70A9B4131A8B033B7543BBD673B8210">>},
+ {<<"idna">>, <<"AC62EE99DA068F43C50DC69ACF700E03A62A348360126260E87F2B54ECED86B2">>},
+ {<<"jsx">>, <<"749BEC6D205C694AE1786D62CEA6CC45A390437E24835FD16D12D74F07097727">>},
+ {<<"lager">>, <<"EEF4E18B39E4195D37606D9088EA05BF1B745986CF8EC84F01D332456FE88D17">>},
+ {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
+ {<<"mimerl">>, <<"993F9B0E084083405ED8252B99460C4F0563E41729AB42D9074FD5E52439BE88">>},
+ {<<"ranch">>, <<"E4965A144DC9FBE70E5C077C65E73C57165416A901BD02EA899CFD95AA890986">>},
+ {<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>},
+ {<<"ssl_verify_fun">>, <<"28A4D65B7F59893BC2C7DE786DEC1E1555BD742D336043FE644AE956C3497FBE">>}]}
+].