refactor(api): move pb/ under api/

pb/vpn.proto → api/pb/vpn.proto

@@ -28,8 +28,8 @@ message VPNUpdateRequest {
 service VPNService {
   rpc Status (VPNStatusRequest) returns (VPNStatusResponse) {
     option (google.api.http) = {
-      post: "/v1/vpn/status"
-      body: "*"
+      get: "/v1/vpn/status"
+      //body: "*"
     };}
   rpc Init (VPNInitRequest) returns (VPNInitResponse) {
     option (google.api.http) = {

api/rest.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/cad/ovpm/pb"
+	"github.com/cad/ovpm/api/pb"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"

api/rpc.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/cad/ovpm"
-	"github.com/cad/ovpm/pb"
+	"github.com/cad/ovpm/api/pb"
 	"golang.org/x/net/context"
 )
 

cmd/ovpm/net.go

@@ -8,7 +8,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/asaskevich/govalidator"
 	"github.com/cad/ovpm"
-	"github.com/cad/ovpm/pb"
+	"github.com/cad/ovpm/api/pb"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli"
 )

cmd/ovpm/user.go

@@ -9,7 +9,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/asaskevich/govalidator"
 	"github.com/cad/ovpm"
-	"github.com/cad/ovpm/pb"
+	"github.com/cad/ovpm/api/pb"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli"
 )

cmd/ovpm/vpn.go

@@ -8,7 +8,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/asaskevich/govalidator"
 	"github.com/cad/ovpm"
-	"github.com/cad/ovpm/pb"
+	"github.com/cad/ovpm/api/pb"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli"
 )

generate.go

@@ -1,6 +1,6 @@
 //go:generate go-bindata -pkg bindata -o bindata/bindata.go template/
-//go:generate protoc -I pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis pb/user.proto pb/vpn.proto pb/network.proto --go_out=plugins=grpc:pb
-//go:generate protoc -I pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis pb/user.proto pb/vpn.proto pb/network.proto --grpc-gateway_out=logtostderr=true:pb
-//go:generate protoc -I pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis pb/user.proto pb/vpn.proto pb/network.proto --swagger_out=logtostderr=true:pb
+//go:generate protoc -I api/pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis api/pb/user.proto api/pb/vpn.proto api/pb/network.proto --go_out=plugins=grpc:api/pb
+//go:generate protoc -I api/pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis api/pb/user.proto api/pb/vpn.proto api/pb/network.proto --grpc-gateway_out=logtostderr=true:api/pb
+//go:generate protoc -I api/pb/ -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis api/pb/user.proto api/pb/vpn.proto api/pb/network.proto --swagger_out=logtostderr=true:api/pb
 
 package ovpm