valitydev/bouncer-proto
14
0
Fork 0
mirror of https://github.com/valitydev/bouncer-proto.git synced 2024-11-06 10:55:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from valitydev/ft/BACKLOG-27/build

Browse Source 
Build impl
This commit is contained in:
Egor Cherniak 2022-01-12 19:45:28 +03:00 committed by GitHub
commit 3b5927d4ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 93 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,29 @@
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.1
- 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

31
.github/workflows/deploy.yml vendored Normal file
View File

@ -0,0 +1,31 @@
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.1
- 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.9
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 }}"'

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "build_utils"]
path = build_utils
url = git@github.com:rbkmoney/build_utils

27
Jenkinsfile vendored
View File

@ -1,27 +0,0 @@
#!groovy
// -*- mode: groovy -*-
build('bouncer-proto', 'docker-host') {
checkoutRepo()
loadBuildUtils()
def pipeDefault
def gitUtils
runStage('load pipeline') {
env.JENKINS_LIB = "build_utils/jenkins_lib"
pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
pipeJavaProto = load("${env.JENKINS_LIB}/pipeJavaProto.groovy")
gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
}
pipeDefault() {
runStage('compile') {
withGithubPrivkey {
sh "make wc_compile"
}
}
env.skipSonar = 'true'
pipeJavaProto()
}
}

42
Makefile
View File

@ -1,42 +0,0 @@
THRIFT = $(or $(shell which thrift), $(error "`thrift' executable missing"))
REBAR = $(shell which rebar3 2>/dev/null || which ./rebar3)
SUBMODULES = build_utils
SUBTARGETS = $(patsubst %,%/.git,$(SUBMODULES))
UTILS_PATH := build_utils
TEMPLATES_PATH := .
# Name of the service
SERVICE_NAME := bouncer-proto
# Build image tag to be used
BUILD_IMAGE_TAG := 917afcdd0c0a07bf4155d597bbba72e962e1a34a
CALL_ANYWHERE := \
all submodules compile clean distclean
CALL_W_CONTAINER := $(CALL_ANYWHERE)
all: compile
-include $(UTILS_PATH)/make_lib/utils_container.mk
.PHONY: $(CALL_W_CONTAINER)
# CALL_ANYWHERE
$(SUBTARGETS): %/.git: %
git submodule update --init $<
touch $@
submodules: $(SUBTARGETS)
compile: submodules
$(REBAR) compile
clean:
$(REBAR) clean
distclean:
$(REBAR) clean -a
rm -rfv _build
include $(UTILS_PATH)/make_lib/java_proto.mk

2
README.md
View File

@ -1,5 +1,3 @@
# bouncer-proto
[![Build Status](http://ci.rbkmoney.com/buildStatus/icon?job=rbkmoney_private/bouncer-proto/master)](http://ci.rbkmoney.com/job/rbkmoney_private/job/bouncer-proto/job/master/)
Thrift protocol for relatively generic decision making services.

1
build_utils

@ -1 +0,0 @@
Subproject commit 34f432a1e8e0adedbba23ecd29c1eb2412a8d416

45
pom.xml
View File

@ -5,44 +5,41 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>parent</artifactId>
<version>1.0.5</version>
<groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId>
<version>1.0.0</version>
</parent>
<groupId>com.rbkmoney</groupId>
<artifactId>bouncer-proto</artifactId>
<version>1.0.0</version>
<version>${revision}</version>
<packaging>jar</packaging>
<name>Bouncer</name>
<description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
<url>https://github.com/rbkmoney/bouncer-proto.git</url>
<developers>
<developer>
<organization>RBK.money</organization>
<organizationUrl>https://rbk.money</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/rbkmoney/bouncer-proto.git</connection>
<developerConnection>scm:git:ssh://github.com/rbkmoney/bouncer-proto.git</developerConnection>
<url>https://github.com/rbkmoney/bouncer-proto/tree/master</url>
</scm>
<url>https://github.com/valitydev/bouncer-proto.git</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revision>SNAPSHOT</revision>
</properties>
<dependencies>
<dependency>
<groupId>com.rbkmoney.woody</groupId>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>[1.1.21,)</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>fistful-proto</artifactId>
<version>1.129-8c9aa31</version>
</dependency>
</dependencies>
<build>
@ -84,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
@ -94,8 +91,8 @@
<configuration>
<relocations>
<relocation>
<pattern>com.rbkmoney.bouncer</pattern>
<shadedPattern>com.rbkmoney.bouncer.v${commit.number}</shadedPattern>
<pattern>dev.vality.bouncer</pattern>
<shadedPattern>dev.vality.bouncer.v${commit.number}</shadedPattern>
</relocation>
</relocations>
<shadedArtifactAttached>true</shadedArtifactAttached>

2
proto/base.thrift
View File

@ -1,4 +1,4 @@
namespace java com.rbkmoney.bouncer.base
namespace java dev.vality.bouncer.base
namespace erlang bouncer_base
typedef i32 Version

2
proto/context.thrift
View File

@ -1,4 +1,4 @@
namespace java com.rbkmoney.bouncer.ctx
namespace java dev.vality.bouncer.ctx
namespace erlang bctx
enum ContextFragmentType {

15
proto/context_v1.thrift
View File

@ -2,7 +2,7 @@
* Модель контекстов для принятия решений контроля доступа.
*/
namespace java com.rbkmoney.bouncer.context.v1
namespace java dev.vality.bouncer.context.v1
namespace erlang bctx_v1
include "base.thrift"
@ -144,7 +144,7 @@ struct Requester {
/**
* Контекст, получаемый из сервисов, реализующих один из интерфейсов протокола
* https://github.com/rbkmoney/damsel/tree/master/proto/payment_processing.thrift
* https://github.com/valitydev/damsel/tree/master/proto/payment_processing.thrift
* (например данные о платёжных сущностях invoicing в hellgate)
* и содержащий _проверенную_ информацию
*/
@ -181,7 +181,7 @@ struct Customer {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [вебхуков]
* (https://github.com/rbkmoney/damsel/tree/master/proto/webhooker.thrift)
* (https://github.com/valitydev/damsel/tree/master/proto/webhooker.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextWebhooks {
@ -201,7 +201,6 @@ struct WebhookFilter {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [отчётов]
* (https://github.com/rbkmoney/reporter_proto/tree/master/proto/reports.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextReports {
@ -217,7 +216,7 @@ struct Report {
/**
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [выплат]
* (https://github.com/rbkmoney/damsel/tree/master/proto/payout_processing.thrift)
* (https://github.com/valitydev/damsel/tree/master/proto/payout_processing.thrift)
* и содержащий _проверенную_ информацию.
*/
struct ContextPayouts {
@ -233,7 +232,7 @@ struct Payout {
/** wallet
* Контекст, получаемый из сервисов, реализующих один из интерфейсов протокола
* (https://github.com/rbkmoney/fistful-proto)
* (https://github.com/valitydev/fistful-proto)
* (например wallet в fistful-server)
* и содержащий _проверенную_ информацию
@ -279,7 +278,7 @@ type = "Destination" {
/** wallet_webhooks
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [вебхуков]
* (https://github.com/rbkmoney/fistful-proto/blob/master/proto/webhooker.thrift)
* (https://github.com/valitydev/fistful-proto/blob/master/proto/webhooker.thrift)
* и содержащий _проверенную_ информацию.
Информация о возможных объектах и полях к ним относящихся:
@ -294,7 +293,7 @@ type = "WalletWebhook" {
/** wallet_reports
* Контекст, получаемый из сервисов, реализующих протоколы сервиса [отчётов]
* (https://github.com/rbkmoney/fistful-reporter-proto)
* (https://github.com/valitydev/fistful-reporter-proto)
* (например wallet в fistful-server)
* и содержащий _проверенную_ информацию

2
proto/decisions.thrift
View File

@ -1,4 +1,4 @@
namespace java com.rbkmoney.bouncer.decisions
namespace java dev.vality.bouncer.decisions
namespace erlang bdcs
include "context.thrift"

2
proto/restriction.thrift
View File

@ -1,4 +1,4 @@
namespace java com.rbkmoney.bouncer.rstn
namespace java dev.vality.bouncer.rstn
namespace erlang brstn
include "base.thrift"

2
rebar.config
View File

@ -49,7 +49,7 @@
{plugins, [
{rebar3_thrift_compiler,
{git, "https://github.com/rbkmoney/rebar3_thrift_compiler.git", {branch, "master"}}}
{git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
]}.
{provider_hooks, [