vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix go builds after deleting pkg internal

Browse source 
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
This commit is contained in:
Ahmet Alp Balkan 2018-07-10 20:11:30 -07:00
parent dff246a3d7
commit 61cf05844d
13 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/checkoutservice/Dockerfile
View file

@ -6,7 +6,8 @@ WORKDIR /go/src/checkoutservice
RUN go get -d github.com/google/uuid \
google.golang.org/grpc \
google.golang.org/grpc/codes \
google.golang.org/grpc/status
google.golang.org/grpc/status \
go.opencensus.io/plugin/ocgrpc
COPY . .
# get remaining dependencies
RUN go get -d ./...

23
src/checkoutservice/main.go
View file

@ -7,9 +7,8 @@ import (
"net"
"os"
"microservices-demo/src/internal"
"github.com/google/uuid"
"go.opencensus.io/plugin/ocgrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@ -52,7 +51,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
srv := grpc.NewServer(internal.DefaultServerOptions()...)
srv := grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
pb.RegisterCheckoutServiceServer(srv, svc)
log.Printf("starting to listen on tcp: %q", lis.Addr().String())
log.Fatal(srv.Serve(lis))
@ -149,7 +148,9 @@ func (cs *checkoutService) prepareOrderItemsAndShippingQuoteFromCart(ctx context
}
func (cs *checkoutService) quoteShipping(ctx context.Context, address *pb.Address, items []*pb.CartItem) (*pb.Money, error) {
conn, err := grpc.DialContext(ctx, cs.shippingSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.shippingSvcAddr,
grpc.WithInsecure(),
grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return nil, fmt.Errorf("could not connect shipping service: %+v", err)
}
@ -166,7 +167,7 @@ func (cs *checkoutService) quoteShipping(ctx context.Context, address *pb.Addres
}
func (cs *checkoutService) getUserCart(ctx context.Context, userID string) ([]*pb.CartItem, error) {
conn, err := grpc.DialContext(ctx, cs.cartSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.cartSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return nil, fmt.Errorf("could not connect cart service: %+v", err)
}
@ -180,7 +181,7 @@ func (cs *checkoutService) getUserCart(ctx context.Context, userID string) ([]*p
}
func (cs *checkoutService) emptyUserCart(ctx context.Context, userID string) error {
conn, err := grpc.DialContext(ctx, cs.cartSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.cartSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return fmt.Errorf("could not connect cart service: %+v", err)
}
@ -195,7 +196,7 @@ func (cs *checkoutService) emptyUserCart(ctx context.Context, userID string) err
func (cs *checkoutService) prepOrderItems(ctx context.Context, items []*pb.CartItem, userCurrency string) ([]*pb.OrderItem, error) {
out := make([]*pb.OrderItem, len(items))
conn, err := grpc.DialContext(ctx, cs.productCatalogSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.productCatalogSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return nil, fmt.Errorf("could not connect product catalog service: %+v", err)
}
@ -219,7 +220,7 @@ func (cs *checkoutService) prepOrderItems(ctx context.Context, items []*pb.CartI
}
func (cs *checkoutService) convertCurrency(ctx context.Context, from *pb.Money, toCurrency string) (*pb.Money, error) {
conn, err := grpc.DialContext(ctx, cs.currencySvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.currencySvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return nil, fmt.Errorf("could not connect currency service: %+v", err)
}
@ -234,7 +235,7 @@ func (cs *checkoutService) convertCurrency(ctx context.Context, from *pb.Money,
}
func (cs *checkoutService) chargeCard(ctx context.Context, amount *pb.Money, paymentInfo *pb.CreditCardInfo) (string, error) {
conn, err := grpc.DialContext(ctx, cs.paymentSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.paymentSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return "", fmt.Errorf("failed to connect payment service: %+v", err)
}
@ -250,7 +251,7 @@ func (cs *checkoutService) chargeCard(ctx context.Context, amount *pb.Money, pay
}
func (cs *checkoutService) sendOrderConfirmation(ctx context.Context, email string, order *pb.OrderResult) error {
conn, err := grpc.DialContext(ctx, cs.emailSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.emailSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return fmt.Errorf("failed to connect email service: %+v", err)
}
@ -262,7 +263,7 @@ func (cs *checkoutService) sendOrderConfirmation(ctx context.Context, email stri
}
func (cs *checkoutService) shipOrder(ctx context.Context, address *pb.Address, items []*pb.CartItem) (string, error) {
conn, err := grpc.DialContext(ctx, cs.shippingSvcAddr, internal.DefaultDialOptions()...)
conn, err := grpc.DialContext(ctx, cs.shippingSvcAddr, grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
return "", fmt.Errorf("failed to connect email service: %+v", err)
}