TD-312: Bump to valitydev/damsel@dac2cb5 (#21)

Also use valitydev/thrift compiler v0.14.2.3 w/ `app_namespaces`.

* Reuse Erlang CI workflow
* Specify `damsel` as dependency

.github/workflows/erlang-pr.yml

@@ -1,37 +1,17 @@
-name: Erlang
+name: Erlang build
+
 on:
   pull_request:
-    branches: ['*']
+    branches:
-  push:
+      - "*"
-    branches: [master]
 
 jobs:
   build:
-    name: Build and verify
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-simple-build.yml@v1
-    runs-on: ubuntu-latest
+    with:
-    steps:
+      otp-version: 24
-
+      rebar-version: 3
-      - uses: actions/checkout@v3
+      use-thrift: true
-
+      thrift-version: 0.14.2.3
-      - uses: valitydev/action-setup-thrift@v1
+      run-eunit: false
-        with:
+      run-common-test: false
-          thrift-version: '0.14.2.2'
-
-      - uses: erlef/setup-beam@v1.9
-        id: beam
-        with:
-          otp-version: '24'
-          rebar3-version: '3.18'
-
-      - name: Restore PLT cache
-        uses: actions/cache@v3
-        id: plt-cache
-        with:
-          key: |
-            ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-plt
-          path: |
-            _build/default/rebar3_*_plt
-
-      - run: rebar3 compile
-      - run: rebar3 xref
-      - run: rebar3 dialyzer

proto/configurator.thrift

@@ -3,7 +3,7 @@ include "limiter.thrift"
 include "limiter_config.thrift"
 
 namespace java dev.vality.limiter.configurator
-namespace erlang limiter.configurator
+namespace erlang limproto.configurator
 
 typedef string LimitName
 typedef limiter_config.LimitConfigID LimitConfigID

proto/limiter.thrift

@@ -4,7 +4,7 @@ include "limiter_base.thrift"
 include "limiter_context.thrift"
 
 namespace java dev.vality.limiter
-namespace erlang limiter
+namespace erlang limproto.limiter
 
 typedef string LimitChangeID
 typedef string LimitID

proto/limiter_base.thrift

@@ -1,7 +1,7 @@
 include "proto/domain.thrift"
 
 namespace java dev.vality.limiter.base
-namespace erlang limiter.base
+namespace erlang limproto.base
 
 struct AmountRange {
     1: required AmountBound upper

proto/limiter_config.thrift

@@ -3,7 +3,7 @@
  */
 
 namespace java   dev.vality.limiter.config
-namespace erlang limiter.config
+namespace erlang limproto.config
 
 include "proto/base.thrift"
 include "proto/domain.thrift"

proto/limiter_context.thrift

@@ -3,7 +3,7 @@ include "proto/domain.thrift"
 include "limiter_payproc_context.thrift"
 
 namespace java dev.vality.limiter.context
-namespace erlang limiter.context
+namespace erlang limproto.context.limiter
 
 typedef base.ID ID
 

proto/limiter_payproc_context.thrift

@@ -2,7 +2,7 @@ include "proto/base.thrift"
 include "proto/domain.thrift"
 
 namespace java dev.vality.limiter.payproc.context
-namespace erlang limiter.context.payproc
+namespace erlang limproto.context.payproc
 
 /**
  * Контекст, получаемый из сервисов, реализующих один из интерфейсов протокола

proto/limiter_range.thrift

@@ -3,7 +3,7 @@
  */
 
 namespace java   dev.vality.limiter.range
-namespace erlang limiter.range
+namespace erlang limproto.range
 
 include "proto/base.thrift"
 include "proto/domain.thrift"

proto/time_range.thrift

@@ -3,7 +3,7 @@
  */
 
 namespace java   dev.vality.limiter.range.time
-namespace erlang limiter.time.range
+namespace erlang limproto.timerange
 
 include "proto/base.thrift"
 include "proto/domain.thrift"

rebar.config

@@ -1,6 +1,5 @@
 %% Common project erlang options.
 {erl_opts, [
-
     % mandatory
     debug_info,
     warnings_as_errors,
@@ -26,9 +25,7 @@
 ]}.
 
 {deps, [
-    {damsel,
+    {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}}
-        {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}
-    }
 ]}.
 
 %% XRef checks
@@ -52,18 +49,17 @@
 
 {plugins, [
     {rebar3_thrift_compiler,
-        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
+        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {tag, "0.4"}}}
 ]}.
 
 {provider_hooks, [
     {pre, [
         {compile, {thrift, compile}},
-        {clean  , {thrift, clean  }}
+        {clean, {thrift, clean}}
     ]}
 ]}.
 
 {thrift_compiler_opts, [
     {in_dir, "proto"},
-    {in_files, all},
+    {gen, "erlang:app_namespaces"}
-    {gen, "erlang:scoped_typenames,app_prefix=lim"}
 ]}.

rebar.lock

@@ -1,4 +1,4 @@
 [{<<"damsel">>,
   {git,"https://github.com/valitydev/damsel.git",
-       {ref,"d384c125d16c0204e23b0d96a6ef791244a72315"}},
+       {ref,"dac2cb599499cc0701e60856f4092c9ab283eedf"}},
   0}].

src/limiter_proto.app.src

@@ -3,6 +3,7 @@
     {vsn, "1.0.0"},
     {applications, [
         kernel,
-        stdlib
+        stdlib,
+        damsel
     ]}
 ]}.