From 293796051444b51b2f2b07a2b2c3d89bc3cc34c6 Mon Sep 17 00:00:00 2001
From: Ahmet Alp Balkan <ahmetb@google.com>
Date: Tue, 21 Aug 2018 09:57:59 -0700
Subject: [PATCH] node services: fix & run genproto.sh

this gets currencyservice to work but paymentservice is still crashing
in the docker container.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
---
 src/currencyservice/genproto.sh               |  5 +--
 .../proto/grpc/health/v1/health.proto         | 43 +++++++++++++++++++
 src/paymentservice/genproto.sh                |  5 +--
 .../proto/grpc/health/v1/health.proto         | 43 +++++++++++++++++++
 4 files changed, 90 insertions(+), 6 deletions(-)
 create mode 100644 src/currencyservice/proto/grpc/health/v1/health.proto
 create mode 100644 src/paymentservice/proto/grpc/health/v1/health.proto

diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh
index 362e7c8..a9609fd 100755
--- a/src/currencyservice/genproto.sh
+++ b/src/currencyservice/genproto.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash -e
 # protos are loaded dynamically for node, simply copies over the proto.
-mkdir -p proto && \
-cp -r ../../pb/ proto/
+mkdir -p proto
+cp -r ../../pb/* ./proto
diff --git a/src/currencyservice/proto/grpc/health/v1/health.proto b/src/currencyservice/proto/grpc/health/v1/health.proto
new file mode 100644
index 0000000..4b4677b
--- /dev/null
+++ b/src/currencyservice/proto/grpc/health/v1/health.proto
@@ -0,0 +1,43 @@
+// Copyright 2015 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The canonical version of this proto can be found at
+// https://github.com/grpc/grpc-proto/blob/master/grpc/health/v1/health.proto
+
+syntax = "proto3";
+
+package grpc.health.v1;
+
+option csharp_namespace = "Grpc.Health.V1";
+option go_package = "google.golang.org/grpc/health/grpc_health_v1";
+option java_multiple_files = true;
+option java_outer_classname = "HealthProto";
+option java_package = "io.grpc.health.v1";
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+}
diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh
index 362e7c8..a9609fd 100755
--- a/src/paymentservice/genproto.sh
+++ b/src/paymentservice/genproto.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash -e
 # protos are loaded dynamically for node, simply copies over the proto.
-mkdir -p proto && \
-cp -r ../../pb/ proto/
+mkdir -p proto
+cp -r ../../pb/* ./proto
diff --git a/src/paymentservice/proto/grpc/health/v1/health.proto b/src/paymentservice/proto/grpc/health/v1/health.proto
new file mode 100644
index 0000000..4b4677b
--- /dev/null
+++ b/src/paymentservice/proto/grpc/health/v1/health.proto
@@ -0,0 +1,43 @@
+// Copyright 2015 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The canonical version of this proto can be found at
+// https://github.com/grpc/grpc-proto/blob/master/grpc/health/v1/health.proto
+
+syntax = "proto3";
+
+package grpc.health.v1;
+
+option csharp_namespace = "Grpc.Health.V1";
+option go_package = "google.golang.org/grpc/health/grpc_health_v1";
+option java_multiple_files = true;
+option java_outer_classname = "HealthProto";
+option java_package = "io.grpc.health.v1";
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+}