Draft: Update to protobuf APIv2

Makefile

@@ -25,16 +25,23 @@ export PATH := $(GOPATH)/bin:$(PATH)
 PKG_CONFIG ?= /usr/bin/pkg-config
 SERVICEDIR_SYSTEMD ?= $(shell $(PKG_CONFIG) systemd --variable=systemdsystemunitdir)
 
+# Version in line with what we have in go.mod
+PROTOC_GEN_GO_VERSION := $(shell grep -F 'google.golang.org/protobuf ' go.mod | head -1 | awk '{print $$2}')
+# Version not aligned with grpc-go versions, check the list at:
+# https://pkg.go.dev/google.golang.org/grpc/cmd/protoc-gen-go-grpc?tab=versions
+PROTOC_GEN_GO_GRPC_VERSION := v1.0.1
+
 all: build
 
 regen-proto: rpc/rpc.proto
 	@ if ! which protoc > /dev/null; then \
 		echo "error: protoc not installed" >&2; \
 		exit 1; \
 	fi
-	go install github.com/golang/protobuf/protoc-gen-go@v1.3.5 && \
-	rm -f rpc/rpc.pb.go && \
-	protoc -I rpc rpc/rpc.proto --go_out=plugins=grpc:rpc
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@$(PROTOC_GEN_GO_VERSION) && \
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@$(PROTOC_GEN_GO_GRPC_VERSION) && \
+	rm -f rpc/rpc.pb.go rpc/rpc_grpc.pb.go && \
+	protoc --go_out=. --go-grpc_out=. ./rpc/rpc.proto
 
 build:
 	GO111MODULE=on go build $(GOFLAGS) -o $(BINARY) .

cli/commands.go

@@ -25,13 +25,13 @@ import (
 	"github.com/etix/mirrorbits/mirrors"
 	"github.com/etix/mirrorbits/rpc"
 	"github.com/etix/mirrorbits/utils"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/op/go-logging"
 	"golang.org/x/term"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	"gopkg.in/yaml.v3"
 )
 
@@ -160,7 +160,7 @@ func (c *cli) CmdList(args ...string) error {
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
 	defer cancel()
-	list, err := client.List(ctx, &empty.Empty{})
+	list, err := client.List(ctx, &emptypb.Empty{})
 	if err != nil {
 		log.Fatal("list error:", err)
 	}
@@ -206,10 +206,10 @@ func (c *cli) CmdList(args ...string) error {
 				continue
 			}
 		}
-		stateSince, err := ptypes.Timestamp(mirror.StateSince)
-		if err != nil {
+		if err = mirror.StateSince.CheckValid(); err != nil {
 			log.Fatal("list error:", err)
 		}
+		stateSince := mirror.StateSince.AsTime()
 		fmt.Fprintf(w, "%s", mirror.Name)
 		if *score == true {
 			fmt.Fprintf(w, "\t%d", mirror.Score)
@@ -921,7 +921,7 @@ func (c *cli) CmdExport(args ...string) error {
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
 	defer cancel()
-	list, err := client.List(ctx, &empty.Empty{})
+	list, err := client.List(ctx, &emptypb.Empty{})
 	if err != nil {
 		log.Fatal("export error:", err)
 	}
@@ -1036,13 +1036,13 @@ func (c *cli) CmdStats(args ...string) error {
 	if err != nil {
 		start = time.Now()
 	}
-	startproto, _ := ptypes.TimestampProto(start)
+	startproto := timestamppb.New(start)
 
 	end, err := time.Parse("2006-1-2", *dateEnd)
 	if err != nil {
 		end = time.Now()
 	}
-	endproto, _ := ptypes.TimestampProto(end)
+	endproto := timestamppb.New(end)
 
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
@@ -1174,7 +1174,7 @@ func (c *cli) CmdReload(args ...string) error {
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
 	defer cancel()
-	_, err := client.Reload(ctx, &empty.Empty{})
+	_, err := client.Reload(ctx, &emptypb.Empty{})
 	if err != nil {
 		log.Fatal("reload error:", err)
 	}
@@ -1196,7 +1196,7 @@ func (c *cli) CmdUpgrade(args ...string) error {
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
 	defer cancel()
-	_, err := client.Upgrade(ctx, &empty.Empty{})
+	_, err := client.Upgrade(ctx, &emptypb.Empty{})
 	if err != nil {
 		log.Fatal("upgrade error:", err)
 	}
@@ -1222,7 +1222,7 @@ func (c *cli) CmdVersion(args ...string) error {
 	client := c.GetRPC()
 	ctx, cancel := context.WithTimeout(context.Background(), defaultRPCTimeout)
 	defer cancel()
-	reply, err := client.GetVersion(ctx, &empty.Empty{})
+	reply, err := client.GetVersion(ctx, &emptypb.Empty{})
 	if err != nil {
 		s := status.Convert(err)
 		return fmt.Errorf("version error: %w", s.Err())

cli/rpc.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/etix/mirrorbits/core"
 	"github.com/etix/mirrorbits/rpc"
-	"github.com/golang/protobuf/ptypes/empty"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 func (c *cli) GetRPC() rpc.CLIClient {
@@ -33,7 +33,7 @@ func (c *cli) GetRPC() rpc.CLIClient {
 		}
 		c.rpcconn = conn
 		client := rpc.NewCLIClient(c.rpcconn)
-		_, err = client.Ping(context.Background(), &empty.Empty{})
+		_, err = client.Ping(context.Background(), &emptypb.Empty{})
 		s := status.Convert(err)
 		if s.Code() == codes.Unauthenticated {
 			if len(c.creds.Password) == 0 {

go.mod

@@ -3,15 +3,16 @@ module github.com/etix/mirrorbits
 require (
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
 	github.com/etix/goftp v0.0.0-20170217140226-0c13163a1028
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.1
 	github.com/gomodule/redigo v0.0.0-20181026001555-e8fc0692a7e2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/oschwald/maxminddb-golang v1.5.0
 	github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1
 	github.com/youtube/vitess v0.0.0-20181105031612-54855ec7b369
 	golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2
 	golang.org/x/term v0.1.0
-	google.golang.org/grpc v1.27.1
+	google.golang.org/grpc v1.32.0
+	google.golang.org/protobuf v1.25.0
 	gopkg.in/tylerb/graceful.v1 v1.2.15
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -21,7 +22,7 @@ require (
 	github.com/stretchr/testify v1.4.0 // indirect
 	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
 	golang.org/x/text v0.3.2 // indirect
-	google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	vitess.io/vitess v2.1.1+incompatible // indirect
 )

go.sum

@@ -2,24 +2,37 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etix/goftp v0.0.0-20170217140226-0c13163a1028 h1:hO2NDwWjaY+FjWoZdMLapjkxt9Gpnmjb4ZdfOaQi9nI=
 github.com/etix/goftp v0.0.0-20170217140226-0c13163a1028/go.mod h1:broujVOEKwPL7fT3Xa1mJzV2aIqT1keOqSVEPqEO61Y=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/gomodule/redigo v0.0.0-20181026001555-e8fc0692a7e2 h1:Gzyurvlb8eehpl7l2YLkMddyOXWkdQN7wU5x5l/xM9s=
 github.com/gomodule/redigo v0.0.0-20181026001555-e8fc0692a7e2/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -68,16 +81,29 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 h1:Ex1mq5jaJof+kRnYi3SlYJ8KKa9Ao3NHyIT5XJ1gF6U=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

rpc/rpc.go

@@ -24,14 +24,13 @@ import (
 	"github.com/etix/mirrorbits/network"
 	"github.com/etix/mirrorbits/scan"
 	"github.com/etix/mirrorbits/utils"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/gomodule/redigo/redis"
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"gopkg.in/yaml.v3"
 )
 
@@ -42,6 +41,7 @@ var (
 
 // CLI object handles the server side RPC of the CLI
 type CLI struct {
+	UnimplementedCLIServer
 	listener net.Listener
 	server   *grpc.Server
 	sig      chan<- os.Signal
@@ -86,11 +86,11 @@ func (c *CLI) SetCache(cache *mirrors.Cache) {
 	c.cache = cache
 }
 
-func (c *CLI) Ping(context.Context, *empty.Empty) (*empty.Empty, error) {
-	return &empty.Empty{}, nil
+func (c *CLI) Ping(context.Context, *emptypb.Empty) (*emptypb.Empty, error) {
+	return &emptypb.Empty{}, nil
 }
 
-func (c *CLI) GetVersion(context.Context, *empty.Empty) (*VersionReply, error) {
+func (c *CLI) GetVersion(context.Context, *emptypb.Empty) (*VersionReply, error) {
 	return &VersionReply{
 		Version:    core.VERSION,
 		Build:      core.BUILD + core.DEV,
@@ -101,22 +101,22 @@ func (c *CLI) GetVersion(context.Context, *empty.Empty) (*VersionReply, error) {
 	}, nil
 }
 
-func (c *CLI) Upgrade(ctx context.Context, in *empty.Empty) (*empty.Empty, error) {
+func (c *CLI) Upgrade(ctx context.Context, in *emptypb.Empty) (*emptypb.Empty, error) {
 	select {
 	case c.sig <- syscall.SIGUSR2:
 	default:
 		return nil, status.Error(codes.Internal, "signal handler not ready")
 	}
-	return &empty.Empty{}, nil
+	return &emptypb.Empty{}, nil
 }
 
-func (c *CLI) Reload(ctx context.Context, in *empty.Empty) (*empty.Empty, error) {
+func (c *CLI) Reload(ctx context.Context, in *emptypb.Empty) (*emptypb.Empty, error) {
 	select {
 	case c.sig <- syscall.SIGHUP:
 	default:
 		return nil, status.Error(codes.Internal, "signal handler not ready")
 	}
-	return &empty.Empty{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (c *CLI) MatchMirror(ctx context.Context, in *MatchRequest) (*MatchReply, error) {
@@ -143,7 +143,7 @@ func (c *CLI) MatchMirror(ctx context.Context, in *MatchRequest) (*MatchReply, e
 	return reply, nil
 }
 
-func (c *CLI) ChangeStatus(ctx context.Context, in *ChangeStatusRequest) (*empty.Empty, error) {
+func (c *CLI) ChangeStatus(ctx context.Context, in *ChangeStatusRequest) (*emptypb.Empty, error) {
 	if in.ID <= 0 {
 		return nil, status.Error(codes.FailedPrecondition, "invalid mirror id")
 	}
@@ -157,10 +157,10 @@ func (c *CLI) ChangeStatus(ctx context.Context, in *ChangeStatusRequest) (*empty
 		err = mirrors.DisableMirror(c.redis, int(in.ID))
 	}
 
-	return &empty.Empty{}, err
+	return &emptypb.Empty{}, err
 }
 
-func (c *CLI) List(ctx context.Context, in *empty.Empty) (*MirrorListReply, error) {
+func (c *CLI) List(ctx context.Context, in *emptypb.Empty) (*MirrorListReply, error) {
 	conn, err := c.redis.Connect()
 	if err != nil {
 		return nil, err
@@ -522,7 +522,7 @@ func (c *CLI) setMirror(mirror *mirrors.Mirror) error {
 	return nil
 }
 
-func (c *CLI) RemoveMirror(ctx context.Context, in *MirrorIDRequest) (*empty.Empty, error) {
+func (c *CLI) RemoveMirror(ctx context.Context, in *MirrorIDRequest) (*emptypb.Empty, error) {
 	if in.ID <= 0 {
 		return nil, status.Error(codes.FailedPrecondition, "invalid mirror id")
 	}
@@ -574,11 +574,11 @@ func (c *CLI) RemoveMirror(ctx context.Context, in *MirrorIDRequest) (*empty.Emp
 	// Publish update
 	database.Publish(conn, database.MIRROR_UPDATE, strconv.Itoa(int(in.ID)))
 
-	return &empty.Empty{}, nil
+	return &emptypb.Empty{}, nil
 }
 
-func (c *CLI) RefreshRepository(ctx context.Context, in *RefreshRepositoryRequest) (*empty.Empty, error) {
-	return &empty.Empty{}, scan.ScanSource(c.redis, in.Rehash, nil)
+func (c *CLI) RefreshRepository(ctx context.Context, in *RefreshRepositoryRequest) (*emptypb.Empty, error) {
+	return &emptypb.Empty{}, scan.ScanSource(c.redis, in.Rehash, nil)
 }
 
 func (c *CLI) ScanMirror(ctx context.Context, in *ScanMirrorRequest) (*ScanMirrorReply, error) {
@@ -685,14 +685,14 @@ func (c *CLI) StatsFile(ctx context.Context, in *StatsFileRequest) (*StatsFileRe
 	defer conn.Close()
 
 	// Convert the timestamps
-	start, err := ptypes.Timestamp(in.DateStart)
-	if err != nil {
+	if err = in.DateStart.CheckValid(); err != nil {
 		return nil, err
 	}
-	end, err := ptypes.Timestamp(in.DateEnd)
-	if err != nil {
+	start := in.DateStart.AsTime()
+	if err = in.DateEnd.CheckValid(); err != nil {
 		return nil, err
 	}
+	end := in.DateEnd.AsTime()
 
 	// Compile the regex pattern
 	re, err := regexp.Compile(in.Pattern)
@@ -750,14 +750,14 @@ func (c *CLI) StatsMirror(ctx context.Context, in *StatsMirrorRequest) (*StatsMi
 	defer conn.Close()
 
 	// Convert the timestamps
-	start, err := ptypes.Timestamp(in.DateStart)
-	if err != nil {
+	if err = in.DateStart.CheckValid(); err != nil {
 		return nil, err
 	}
-	end, err := ptypes.Timestamp(in.DateEnd)
-	if err != nil {
+	start := in.DateStart.AsTime()
+	if err = in.DateEnd.CheckValid(); err != nil {
 		return nil, err
 	}
+	end := in.DateEnd.AsTime()
 
 	// Generate the list of redis key for the period
 	tkcoverage := utils.TimeKeyCoverage(start, end)