Skip to content

Commit

Permalink
Updates go services to google-cloud-go 0.40.0 (GoogleCloudPlatform#234)
Browse files Browse the repository at this point in the history
* Updates go services to google cloud go 0.40.0

* Revert kubernetes manifests, remove custom images

* Remove binary file, replace nil error with unimplemented

* Shippingservice needed status import

* Remove shippingservice binary
  • Loading branch information
askmeegs authored Jul 9, 2019
1 parent f575b76 commit 754d22a
Show file tree
Hide file tree
Showing 12 changed files with 290 additions and 277 deletions.
8 changes: 4 additions & 4 deletions release/kubernetes-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,9 @@ spec:
initContainers:
- name: wait-frontend
image: alpine:3.6
command: ['sh', '-c', 'set -x; apk add --no-cache curl &&
until timeout -t 2 curl -f "http://${FRONTEND_ADDR}"; do
echo "waiting for http://${FRONTEND_ADDR}";
command: ['sh', '-c', 'set -x; apk add --no-cache curl &&
until timeout -t 2 curl -f "http://${FRONTEND_ADDR}"; do
echo "waiting for http://${FRONTEND_ADDR}";
sleep 2;
done;']
env:
Expand Down Expand Up @@ -683,4 +683,4 @@ spec:
- name: grpc
port: 9555
targetPort: 9555
---
---
130 changes: 68 additions & 62 deletions src/checkoutservice/Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions src/checkoutservice/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

[[constraint]]
name = "cloud.google.com/go"
version = "0.27.0"
version = "0.40.0"

[[constraint]]
name = "contrib.go.opencensus.io/exporter/stackdriver"
Expand All @@ -53,10 +53,6 @@
branch = "master"
name = "golang.org/x/net"

[[constraint]]
name = "google.golang.org/grpc"
version = "=1.14.0"

[prune]
go-tests = true
unused-packages = true
4 changes: 4 additions & 0 deletions src/checkoutservice/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ func (cs *checkoutService) Check(ctx context.Context, req *healthpb.HealthCheckR
return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVING}, nil
}

func (cs *checkoutService) Watch(req *healthpb.HealthCheckRequest, ws healthpb.Health_WatchServer) error {
return status.Errorf(codes.Unimplemented, "health check via Watch not implemented")
}

func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderRequest) (*pb.PlaceOrderResponse, error) {
log.Infof("[PlaceOrder] user_id=%q user_currency=%q", req.UserId, req.UserCurrency)

Expand Down
Loading

0 comments on commit 754d22a

Please sign in to comment.