diff --git a/.gitignore b/.gitignore index 5e608ae4..d654bc9f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ **/target **/gen vendor +**/node_modules \ No newline at end of file diff --git a/common.mk b/common.mk index fc045142..4d2cb054 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ -export IMAGE_TAG := v11.1 +export IMAGE_TAG := v11.1-fixed .PHONY: package protoc test diff --git a/emojivoto-voting-svc/api/api.go b/emojivoto-voting-svc/api/api.go index 8ec65610..11252094 100644 --- a/emojivoto-voting-svc/api/api.go +++ b/emojivoto-voting-svc/api/api.go @@ -2,7 +2,6 @@ package api import ( "context" - "fmt" pb "github.com/buoyantio/emojivoto/emojivoto-voting-svc/gen/proto" "github.com/buoyantio/emojivoto/emojivoto-voting-svc/voting" @@ -19,7 +18,7 @@ func (pS *PollServiceServer) vote(shortcode string) (*pb.VoteResponse, error) { } func (pS *PollServiceServer) VoteDoughnut(_ context.Context, _ *pb.VoteRequest) (*pb.VoteResponse, error) { - return nil, fmt.Errorf("ERROR") + return pS.vote(":doughnut:") } func (pS *PollServiceServer) VotePoop(_ context.Context, _ *pb.VoteRequest) (*pb.VoteResponse, error) { diff --git a/go.mod b/go.mod index 57818417..3e155b95 100644 --- a/go.mod +++ b/go.mod @@ -16,5 +16,5 @@ require ( google.golang.org/api v0.22.0 // indirect google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84 // indirect google.golang.org/grpc v1.29.1 - google.golang.org/protobuf v1.26.0 // indirect + google.golang.org/protobuf v1.28.0 // indirect ) diff --git a/go.sum b/go.sum index ac1b1a92..4da883f3 100644 --- a/go.sum +++ b/go.sum @@ -240,6 +240,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=