Skip to content

Commit ff6e074

Browse files
zhouzhuojiezhouzhuojie
committed
Add functional test
1 parent 409dd94 commit ff6e074

16 files changed

+216
-100
lines changed

‎.circleci/config.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
version: 2
22
jobs:
3-
unittest:
3+
unit_test:
44
docker:
55
- image: circleci/golang:1.14
66
steps:
77
- checkout
88
- run: make test
9+
functional_test:
10+
docker:
11+
- image: checkr/docker-docker-compose
12+
steps:
13+
- checkout
14+
- setup_remote_docker:
15+
version: 18.09.3
16+
- run: make docker_functional_test
917

1018
workflows:
1119
version: 2
1220
test:
1321
jobs:
14-
- unittest
22+
- unit_test
23+
- functional_test

‎.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ vendor/
1717
go.mod
1818
go.sum
1919
Makefile
20+
docker-compose.yaml
21+
/.circleci

‎Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ docker_build:
2020
docker_run:
2121
docker-compose up --remove-orphans --force-recreate
2222

23+
docker_functional_test:
24+
docker-compose down -v
25+
docker-compose build
26+
docker-compose up --no-start
27+
for f in ./mocks/openmock_templates/*.yaml; do docker cp $$f dsrhub_openmock:/data/templates/; done
28+
for f in ./sql/schema.sql; do docker cp $$f dsrhub_db:/docker-entrypoint-initdb.d/; done
29+
for f in ./templates/*.yaml; do docker cp $$f dsrhub_utask:/app/templates/; done
30+
for f in ./functional_test/*.yaml; do docker cp $$f dsrhub_functional_test:/var/local/; done
31+
docker-compose up -d
32+
docker-compose exec -w /var/local functional_test venom run --log info '*'
33+
2334
gen_proto:
2435
docker run --rm \
2536
-v $(PWD)/idl_dsrhub:/defs \

‎docker-compose.yaml

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
version: "3.8"
1+
version: "2.4"
22
services:
33
utask:
44
build: .
5+
container_name: dsrhub_utask
56
restart: on-failure
67
command: ["/wait-for-it.sh", "db:5432", "--", "/app/utask"]
78
environment:
@@ -15,20 +16,24 @@ services:
1516
ports:
1617
- "8081:8081"
1718
volumes:
18-
- "./templates:/app/templates:ro"
19+
- "./templates:/app/templates"
1920
depends_on:
2021
- db
22+
2123
db:
2224
image: postgres:9.5.3
25+
container_name: dsrhub_db
2326
restart: on-failure
2427
environment:
2528
POSTGRES_USER: user
2629
POSTGRES_PASSWORD: pass
2730
POSTGRES_DB: utask
2831
volumes:
2932
- "./sql:/docker-entrypoint-initdb.d"
33+
3034
openmock:
3135
build: ./mocks
36+
container_name: dsrhub_openmock
3237
restart: on-failure
3338
environment:
3439
OPENMOCK_TEMPLATES_DIR: '/data/templates'
@@ -39,3 +44,9 @@ services:
3944
ports:
4045
- "9999:9999"
4146
- "50051:50051"
47+
48+
functional_test:
49+
image: zhouzhuojie/docker-venom
50+
container_name: dsrhub_functional_test
51+
entrypoint: ''
52+
command: sh -c "tail -F /dev/null"

‎functional_test/dsrhub_openmock.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: TestSuite of dsrhub's openmock
2+
testcases:
3+
- name: Make sure openmock is ready to serve POST /:service/dsrhub/exchange_identity
4+
steps:
5+
- type: http
6+
method: POST
7+
url: http://openmock:9999/test_email_service/dsrhub/exchange_identity
8+
retry: 20
9+
delay: 5
10+
assertions:
11+
- result.statuscode ShouldEqual 200
12+
- result.body ShouldContainSubstring email
13+
14+
- name: Make sure openmock is ready to serve POST /:service_name/dsrhub/create_dsr_request
15+
steps:
16+
- type: http
17+
method: POST
18+
url: http://openmock:9999/test_email_service/dsrhub/create_dsr_request
19+
retry: 20
20+
delay: 5
21+
assertions:
22+
- result.statuscode ShouldEqual 200
23+
- result.body ShouldContainSubstring email

‎functional_test/dsrhub_utask.yaml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: TestSuite of dsrhub's utask
2+
testcases:
3+
- name: getUnsecuredStats
4+
steps:
5+
- type: http
6+
method: GET
7+
url: http://utask:8081/unsecured/stats
8+
retry: 20
9+
delay: 5
10+
headers:
11+
accept: application/json
12+
assertions:
13+
- result.statuscode ShouldEqual 200
14+
15+
- name: createTask
16+
steps:
17+
- type: http
18+
method: POST
19+
url: http://utask:8081/task
20+
retry: 10
21+
delay: 5
22+
headers:
23+
Content-Type: application/json
24+
Authorization: Basic YWRtaW46MTIzNA== # admin:1234
25+
body: >
26+
{
27+
"template_name": "example-complex-dsrhub-workflow",
28+
"input": {"email":"zzzz@example.com"}
29+
}
30+
assertions:
31+
- result.statuscode ShouldEqual 201
32+
- result.bodyjson.state ShouldEqual TODO
33+
34+
- name: getTaskState
35+
steps:
36+
- type: http
37+
method: GET
38+
url: http://utask:8081/task/{{.createTask.result.bodyjson.id}}
39+
retry: 60
40+
delay: 2
41+
headers:
42+
Content-Type: application/json
43+
Authorization: Basic YWRtaW46MTIzNA== # admin:1234
44+
assertions:
45+
- result.statuscode ShouldEqual 200
46+
- result.bodyjson.state ShouldEqual DONE

‎init/dsrhub_callback/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type inCallback struct {
3737
ResolutionID string `path:"resolution_id" validate:"required"`
3838
StepName string `path:"step_name" validate:"required"`
3939

40-
// opendsr related fields
40+
// dsrhub related fields
4141
Regulation string `json:"regulation" validate:"required"`
4242
ControllerID string `json:"controller_id" validate:"required"`
4343
RequestStatus string `json:"request_status" validate:"required"`

‎mocks/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/dsrhub/dsrhub/mocks
33
go 1.14
44

55
require (
6-
github.com/checkr/openmock v0.3.1
7-
github.com/dsrhub/dsrhub v0.0.3
6+
github.com/checkr/openmock v0.3.2
7+
github.com/dsrhub/dsrhub v0.0.4
88
github.com/go-openapi/loads v0.19.5
99
github.com/golang/protobuf v1.4.2
1010
github.com/jessevdk/go-flags v1.4.0

‎mocks/go.sum

+25-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2+
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
23
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
34
github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
45
github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
@@ -36,6 +37,7 @@ github.com/antchfx/xmlquery v0.0.0-20180726134140-2805f22c26c4 h1:ntzM+2QnQcuvKL
3637
github.com/antchfx/xmlquery v0.0.0-20180726134140-2805f22c26c4/go.mod h1:/+CnyD/DzHRnv2eRxrVbieRU/FIF6N0C+7oTtyUtCKk=
3738
github.com/antchfx/xpath v0.0.0-20180524052354-077bca4d2caa h1:UgmswLpr8R1msC4cA74MD6zt66QSQckaD5ph7XFyOfY=
3839
github.com/antchfx/xpath v0.0.0-20180524052354-077bca4d2caa/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
40+
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
3941
github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg=
4042
github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
4143
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -53,8 +55,8 @@ github.com/caarlos0/env v3.3.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2Uo
5355
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
5456
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
5557
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
56-
github.com/checkr/openmock v0.3.1 h1:8UhDY/F6MpXXhRG4BwBvzd03PoY9i4WlYiRNf0nWqsI=
57-
github.com/checkr/openmock v0.3.1/go.mod h1:SwtoCO+1c504mMZGlQLSEnayyML92lgFFVJSEobILeI=
58+
github.com/checkr/openmock v0.3.2 h1:INXTLPgQ36CQs+sHD9lMFvpD5rkQG2YY9h3RR9340EQ=
59+
github.com/checkr/openmock v0.3.2/go.mod h1:hH6vASAHIGi6UgiU8B2iIqDEzp1vqmcasimCF2IJxmM=
5860
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
5961
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
6062
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -74,8 +76,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
7476
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
7577
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
7678
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
77-
github.com/dsrhub/dsrhub v0.0.3 h1:lWBnMDBPZ5R5ntgDKaLViF0KN3n1SKjJVGD+L3knrz8=
78-
github.com/dsrhub/dsrhub v0.0.3/go.mod h1:baThsa2cvn6xHI0BRGMppU4JpzA5tJk28yf4JB7Pmsg=
79+
github.com/dsrhub/dsrhub v0.0.4 h1:TJBkUbiUTqEPDusxcv2SMOASZIoni6SuIyMiHDmPmtw=
80+
github.com/dsrhub/dsrhub v0.0.4/go.mod h1:5z/TMxnohVer6ePmQHlEmIBejEBUxnJUt966Pol9bT8=
7981
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
8082
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
8183
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
@@ -252,15 +254,18 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
252254
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
253255
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
254256
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
257+
github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o=
258+
github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=
255259
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
256260
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
257261
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
258262
github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
259263
github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
260264
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
261-
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
262265
github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
263266
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
267+
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
268+
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
264269
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
265270
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
266271
github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -395,6 +400,7 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhD
395400
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
396401
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
397402
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
403+
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
398404
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
399405
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
400406
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -441,8 +447,14 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
441447
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
442448
github.com/teamwork/reload v1.3.0 h1:ElBaBhtRwVRxsPRGK1wYugr2knciOXFMZT5ltPpEwAI=
443449
github.com/teamwork/reload v1.3.0/go.mod h1:kHdVPdfdmA+ygkBbigWUeerpy6EK4Kcukx1TNyePXHA=
450+
github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
451+
github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
452+
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
453+
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
444454
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
445455
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
456+
github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8=
457+
github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
446458
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
447459
github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
448460
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
@@ -496,6 +508,7 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r
496508
golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
497509
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
498510
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
511+
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
499512
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
500513
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
501514
golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -506,9 +519,11 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
506519
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
507520
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
508521
golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
522+
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
509523
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
510524
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
511525
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
526+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
512527
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
513528
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
514529
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -573,13 +588,17 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
573588
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
574589
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63 h1:YzfoEYWbODU5Fbt37+h7X16BWQbad7Q4S6gclTKFXM8=
575590
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
591+
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig=
592+
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
576593
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
577594
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
578595
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
579596
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
580597
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
581598
google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
582599
google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
600+
google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
601+
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
583602
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
584603
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
585604
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -612,6 +631,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
612631
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
613632
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
614633
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
634+
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
615635
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
616636
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
617637
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=

‎mocks/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func main() {
5050
om := &openmock.OpenMock{}
5151
om.ParseEnv()
5252
om.GRPCServiceMap = map[string]openmock.GRPCService{
53-
"idl.dsrhub.OpenDSRService": {
53+
"idl.dsrhub.DSRHubService": {
5454
"CreateDSR": openmock.GRPCRequestResponsePair{
5555
Request: proto.MessageV2(&idl_dsrhub.CreateDSRRequest{}),
5656
Response: proto.MessageV2(&idl_dsrhub.CreateDSRResponse{}),

‎mocks/openmock_templates/grpc.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
- key: opendsr_grpc
1+
- key: dsrhub_grpc
22
expect:
33
grpc:
4-
service: idl.dsrhub.OpenDSRService
4+
service: idl.dsrhub.DSRHubService
55
method: CreateDSR
66
actions:
77
- reply_grpc:
88
payload: >
99
{
10-
"api_version": "2.0",
1110
"regulation": "gdpr",
12-
"controller_id": "opendsr_grpc_mock",
11+
"controller_id": "dsrhub_grpc_mock",
1312
"request_status": "completed",
1413
"subject_request_id": "{{.GRPCPayload | jsonPath `subject_request_id`}}",
1514
"subject_request_type": "erasure",

‎mocks/openmock_templates/swagger.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
expect:
44
http:
55
method: POST
6-
path: /:service_name/opendsr/identity_resolution
6+
path: /:service_name/dsrhub/exchange_identity
77
condition: '{{.HTTPPath | contains `email`}}'
88
actions:
99
- reply_http:
@@ -20,7 +20,7 @@
2020
expect:
2121
http:
2222
method: POST
23-
path: /:service_name/opendsr/identity_resolution
23+
path: /:service_name/dsrhub/exchange_identity
2424
condition: '{{.HTTPPath | contains `candidate`}}'
2525
actions:
2626
- reply_http:
@@ -37,7 +37,7 @@
3737
expect:
3838
http:
3939
method: POST
40-
path: /:service_name/opendsr/identity_resolution
40+
path: /:service_name/dsrhub/exchange_identity
4141
condition: '{{.HTTPPath | contains `provider`}}'
4242
actions:
4343
- reply_http:
@@ -54,13 +54,12 @@
5454
expect:
5555
http:
5656
method: POST
57-
path: /:service_name/opendsr/requests
57+
path: /:service_name/dsrhub/create_dsr_request
5858
actions:
5959
- reply_http:
6060
status_code: 200
6161
body: >-
6262
{
63-
"api_version": "2.0",
6463
"regulation": "gdpr",
6564
"controller_id": "{{ .HTTPPath }}",
6665
"request_status": "completed",
@@ -78,7 +77,6 @@
7877
method: POST
7978
body: >-
8079
{
81-
"api_version": "2.0",
8280
"regulation": "gdpr",
8381
"controller_id": "{{ .HTTPPath }}",
8482
"request_status": "completed",

0 commit comments

Comments
 (0)