De-scope - remove swagger docs and http proxy

HTTP proxy was becoming annoying to maintain, and gRPC is easier to use anyway

swagger docs are just part of the fallout
This commit is contained in:
Marc Di Luzio 2020-07-10 00:12:35 +01:00
parent bffe539d77
commit 7d780d05bd
4 changed files with 3 additions and 38 deletions

View file

@ -8,7 +8,6 @@ RUN go mod download
# Build the executables # Build the executables
RUN go build -o rove -ldflags="-X 'github.com/mdiluz/rove/pkg/version.Version=$(git describe --always --long --dirty --tags)'" cmd/rove/main.go RUN go build -o rove -ldflags="-X 'github.com/mdiluz/rove/pkg/version.Version=$(git describe --always --long --dirty --tags)'" cmd/rove/main.go
RUN go build -o rove-server -ldflags="-X 'github.com/mdiluz/rove/pkg/version.Version=$(git describe --always --long --dirty --tags)'" cmd/rove-server/main.go RUN go build -o rove-server -ldflags="-X 'github.com/mdiluz/rove/pkg/version.Version=$(git describe --always --long --dirty --tags)'" cmd/rove-server/main.go
RUN go build -o rove-server-rest-proxy cmd/rove-server-rest-proxy/main.go
CMD [ "./rove-server" ] CMD [ "./rove-server" ]

View file

@ -20,8 +20,6 @@ gen:
@echo Generating rove server gRPC and gateway @echo Generating rove server gRPC and gateway
protoc --proto_path proto --go_out=plugins=grpc,paths=source_relative:pkg/ proto/rove/rove.proto protoc --proto_path proto --go_out=plugins=grpc,paths=source_relative:pkg/ proto/rove/rove.proto
protoc --proto_path proto --grpc-gateway_out=paths=source_relative:pkg/ proto/rove/rove.proto protoc --proto_path proto --grpc-gateway_out=paths=source_relative:pkg/ proto/rove/rove.proto
@echo Generating rove server swagger
protoc --proto_path proto --swagger_out=logtostderr=true:pkg/ proto/rove/rove.proto
test: test:
@echo Unit tests @echo Unit tests

View file

@ -4,16 +4,6 @@ volumes:
persistent-data: persistent-data:
services: services:
rove-docs:
build:
context: .
dockerfile: Dockerfile.docs
image: rove-docs:latest
ports:
- "80:80"
environment:
- PORT=80
rove-server: rove-server:
build: build:
context: . context: .
@ -30,29 +20,15 @@ services:
- persistent-data:/mnt/rove-server:rw - persistent-data:/mnt/rove-server:rw
command: [ "./rove-server"] command: [ "./rove-server"]
rove:
depends_on: [ rove-server, rove-docs ]
build:
context: .
dockerfile: Dockerfile
image: rove:latest
ports:
- "8080:8080"
environment:
- PORT=8080
- ROVE_GRPC=rove-server:9090
command: [ "./script/wait-for-it.sh", "rove-server:9090", "--", "./rove-server-rest-proxy" ]
rove-tests: rove-tests:
depends_on: [ rove ] depends_on: [ rove-server ]
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
image: rove:latest image: rove:latest
environment: environment:
- ROVE_HTTP=rove
- ROVE_GRPC=rove-server - ROVE_GRPC=rove-server
command: [ "./script/wait-for-it.sh", "rove:8080", "--", "go", "test", "-v", "./...", "--tags=integration", "-cover", "-coverprofile=/mnt/coverage-data/c.out", "-count", "1" ] command: [ "./script/wait-for-it.sh", "rove-server:9090", "--", "go", "test", "-v", "./...", "--tags=integration", "-cover", "-coverprofile=/mnt/coverage-data/c.out", "-count", "1" ]
volumes: volumes:
- /tmp/coverage-data:/mnt/coverage-data:rw - /tmp/coverage-data:/mnt/coverage-data:rw

View file

@ -28,14 +28,6 @@ apps:
WORDS_FILE : "$SNAP/data/words_alpha.txt" WORDS_FILE : "$SNAP/data/words_alpha.txt"
DATA_PATH : $SNAP_USER_DATA DATA_PATH : $SNAP_USER_DATA
rove-rest-server:
command: bin/rove-server-rest-proxy
plugs:
- network
- network-bind
environment:
DATA_PATH : $SNAP_USER_DATA
parts: parts:
go-rove: go-rove:
plugin: go plugin: go