Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8d17aa8
:sparkles: implemented basic grpc server with getallocation function
shravanshetty1 Mar 26, 2021
e8f7c80
:sparkles: added grpc-gateway
shravanshetty1 Mar 26, 2021
ff335cf
:sparkles: added openapi spec for browser clients
shravanshetty1 Mar 26, 2021
1371f2c
:art: changes usage of path prefix
shravanshetty1 Mar 29, 2021
c10c8c6
:green_heart: local deployment fixes
shravanshetty1 Mar 29, 2021
edaeeef
:construction: save commit
shravanshetty1 Mar 29, 2021
2aaf9db
Revert ":construction: save commit"
shravanshetty1 Mar 30, 2021
1facda2
:sparkles: added database transaction middleware
shravanshetty1 Mar 30, 2021
8c030bb
:green_heart: adding generated file check in ci
shravanshetty1 Apr 6, 2021
2d07fe1
:green_heart: attempting to fix ci with go module
shravanshetty1 Apr 6, 2021
e90cc9e
:green_heart: attempting to fix ci with go module
shravanshetty1 Apr 6, 2021
f4eae7b
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
39f0e38
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
5701a5a
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
c015810
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
ad7344e
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
0fec36a
:green_heart: attempting to fix ci and proto files
shravanshetty1 Apr 6, 2021
af9475a
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
95c9ce2
:green_heart: attempting to fix ci
shravanshetty1 Apr 6, 2021
ae5b442
resolving merge conflicts for grpc-migration
shravanshetty1 Apr 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,32 @@ jobs:
- name: Test
run: make test


generated-files-integrity:
runs-on: ubuntu-20.04
steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.14.x
- uses: actions/checkout@v2
- name: Install dependencies
run: |
cd code/go/0chain.net/blobbercore
sudo apt-get update
sudo apt-get install -y protobuf-compiler
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway \
github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 \
google.golang.org/protobuf/cmd/protoc-gen-go \
google.golang.org/grpc/cmd/protoc-gen-go-grpc
git reset --hard
- name: Generate Files
run: |
cd code/go/0chain.net/blobbercore
./scripts/generate-grpc.sh
- name: Fail if any file has changed
run: if output=$(git status --porcelain) && [ -z "$output" ]; then exit 0; else git status; exit 1; fi;

dockerize_blobber:
runs-on: ubuntu-20.04
needs: test
Expand Down
3 changes: 3 additions & 0 deletions code/go/0chain.net/blobber/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ require (
github.com/gorilla/mux v1.7.3
github.com/spf13/viper v1.7.0
go.uber.org/zap v1.15.0
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f // indirect
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa // indirect
google.golang.org/grpc v1.33.1
)

go 1.13
41 changes: 41 additions & 0 deletions code/go/0chain.net/blobber/go.sum

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions code/go/0chain.net/blobber/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"io"
"log"
"net"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -232,6 +233,7 @@ func main() {
metadataDB = flag.String("db_dir", "", "db_dir")
logDir := flag.String("log_dir", "", "log_dir")
portString := flag.String("port", "", "port")
grpcPortString := flag.String("grpc_port", "", "grpc_port")
hostname := flag.String("hostname", "", "hostname")

flag.Parse()
Expand Down Expand Up @@ -266,6 +268,10 @@ func main() {
panic("Please specify --port which is the port on which requests are accepted")
}

if *grpcPortString == "" {
panic("Please specify --grpc_port which is the grpc port on which requests are accepted")
}

reader, err := os.Open(*keysFile)
if err != nil {
panic(err)
Expand Down Expand Up @@ -346,6 +352,9 @@ func main() {
initHandlers(r)
initServer()

grpcServer := handler.NewServerWithMiddlewares()
handler.RegisterGRPCServices(r, grpcServer)

rHandler := handlers.CORS(originsOk, headersOk, methodsOk)(r)
if config.Development() {
// No WriteTimeout setup to enable pprof
Expand All @@ -370,6 +379,13 @@ func main() {

Logger.Info("Ready to listen to the requests")
startTime = time.Now().UTC()
go func(grpcPort string) {
lis, err := net.Listen("tcp", fmt.Sprintf(":%s", grpcPort))
if err != nil {
log.Fatalf("failed to listen: %v", err)
}
log.Fatal(grpcServer.Serve(lis))
}(*grpcPortString)
log.Fatal(server.ListenAndServe())
}

Expand Down
Loading