TD-222: Update for valitydev/thrift compiler v0.14.2.3 (#19)

* Use valitydev/rebar3_thrift_compiler v0.4
* Reuse common Erlang / Java workflows

.github/workflows/build.yml

@@ -1,29 +0,0 @@
-name: Build Artifact
-
-on:
-  pull_request:
-    branches:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Install thrift
-        uses: valitydev/action-setup-thrift@v0.0.5
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up Maven
-        uses: actions/setup-java@v2
-        with:
-          java-version: '15'
-          distribution: 'adopt'
-      - name: Retrieve commit info
-        run: |
-          echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
-          echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
-        id: commit_info
-      - name: Build package
-        run: mvn --batch-mode -Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}" clean compile -f pom.xml

.github/workflows/deploy.yml

@@ -1,31 +0,0 @@
-name: Deploy Artifact
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'main'
-
-jobs:
-  deploy:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Install thrift
-        uses: valitydev/action-setup-thrift@v0.0.5
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Retrieve commit info
-        run: |
-          echo "::set-output name=COMMIT_NUMBER::$(git rev-list HEAD --count)"
-          echo "::set-output name=SHA_7::${GITHUB_SHA::7}"
-        id: commit_info
-      - name: Deploy package
-        uses: valitydev/action-deploy-jdk-package@v1.0.13
-        with:
-          server-username: ${{ secrets.OSSRH_USERNAME }}
-          server-password: ${{ secrets.OSSRH_TOKEN }}
-          deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-          deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-          maven-args: '-Dcommit.number=${{ steps.commit_info.outputs.COMMIT_NUMBER }} -Drevision="1.${{ steps.commit_info.outputs.COMMIT_NUMBER }}-${{ steps.commit_info.outputs.SHA_7 }}"'

.github/workflows/erlang-pr.yml

@@ -1,37 +1,21 @@
-name: Erlang
+name: Erlang CI Checks
+
 on:
-  pull_request:
-    branches: [ '*' ]
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
+      - 'epic/**'
+  pull_request:
+    branches: ['**']
 
 jobs:
-  build:
+  run:
-    name: Build and verify
+    name: Run checks
-    runs-on: ubuntu-latest
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-simple-build.yml@v1
-    steps:
+    with:
-
+      otp-version: 24
-      - uses: actions/checkout@v2
+      rebar-version: 3.18
-
+      thrift-version: 0.14.2.3
-      - uses: valitydev/action-setup-thrift@b457b89c7e1e960ea354f510bce69a725d16c556
+      use-thrift: true
-        with:
+      run-eunit: false
-          thrift-version: '0.14.2'
+      run-common-test: false
-
-      - uses: erlef/setup-beam@v1.10
-        id: beam
-        with:
-          otp-version: '24'
-          rebar3-version: '3.18'
-
-      - name: Restore PLT cache
-        uses: actions/cache@v2
-        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

.github/workflows/java-deploy.yml

@@ -0,0 +1,17 @@
+name: Java deploy
+
+on:
+  push:
+    branches:
+      - "master"
+      - "main"
+
+jobs:
+  deploy:
+    uses: valitydev/java-workflow/.github/workflows/maven-thrift-deploy.yml@v1
+    secrets:
+      server-username: ${{ secrets.OSSRH_USERNAME }}
+      server-password: ${{ secrets.OSSRH_TOKEN }}
+      deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+      deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

.github/workflows/java-pr.yml

@@ -0,0 +1,10 @@
+name: Java build
+
+on:
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  build:
+    uses: valitydev/java-workflow/.github/workflows/maven-thrift-build.yml@v1

proto/auth_context_provider.thrift

@@ -1,5 +1,5 @@
 namespace java dev.vality.orgmanagement
-namespace erlang orgmgmt
+namespace erlang orgmgmt.authctx_provider
 
 include "domain.thrift"
 include "proto/context.thrift"

proto/domain.thrift

@@ -1,4 +1,4 @@
 namespace java dev.vality.orgmanagement
-namespace erlang orgmgmt
+namespace erlang orgmgmt.domain
 
 typedef string UserID

rebar.config

@@ -1,6 +1,5 @@
 %% Common project erlang options.
 {erl_opts, [
-
     % mandatory
     debug_info,
     warnings_as_errors,
@@ -26,11 +25,7 @@
 ]}.
 
 {deps, [
-    {bouncer_proto,
+    {bouncer_proto, {git, "https://github.com/valitydev/bouncer-proto.git", {branch, "master"}}}
-        {git, "https://github.com/valitydev/bouncer-proto.git",
-            {branch, "master"}
-        }
-    }
 ]}.
 
 %% XRef checks
@@ -58,18 +53,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=orgmgmt"}
 ]}.

rebar.lock

@@ -1,4 +1,4 @@
 [{<<"bouncer_proto">>,
-  {git,"https://github.com/valitydev/bouncer-proto",
+  {git,"https://github.com/valitydev/bouncer-proto.git",
-       {ref,"3b5927d4ee59983e855f87ddaee2aac4deeae0fe"}},
+       {ref,"de15d375ee77c5002c55a1ba9a20a67d2c222115"}},
   0}].