changes in proto file

added server tests
added client tests
added dockerfile for building services
added docker-compose file
changes in db schema
added makefile

Author: ivch

.gitignore

@@ -15,4 +15,7 @@
 .data
 
 server/vendor
-client/vendor
+server/coverage.html
+
+client/vendor
+client/coverage.html

Makefile

@@ -0,0 +1,13 @@
+all: srv cli
+
+srv:
+	cd server && \
+	docker build -t ivchms:server .
+
+cli:
+	cd client && \
+	docker build -t ivchms:client .
+
+clean:
+	docker rmi ivchms:server
+	docker rmi ivchms:client

api/v1/testms.pb.go

@@ -14,23 +14,25 @@ message Coordinates {
 }
 
 message SaveRequest {
-    string name = 1;
-    string city = 2;
-    string country = 3;
-    Coordinates coords = 4;
+    string id = 1;
+    string name = 2;
+    string city = 3;
+    string country = 4;
+    Coordinates coords = 5;
 }
 
 message SaveResponse {
     string name = 1;
 }
 
 message GetRequest {
-    string name = 1;
+    string id = 1;
 }
 
 message GetResponse {
-    string name = 1;
-    string city = 2;
-    string country = 3;
-    Coordinates coords = 4;
+    string id = 1;
+    string name = 2;
+    string city = 3;
+    string country = 4;
+    Coordinates coords = 5;
 }

api/v1/testms.proto

@@ -0,0 +1,23 @@
+# Build app in a stock Go builder container
+FROM golang:1.11.4-alpine3.8 as builder
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git
+
+COPY . /go/src/testms
+WORKDIR /go/src/testms
+
+RUN go get github.com/tools/godep && godep restore
+RUN go test ./...
+RUN cd cmd && go build -o testapp
+
+## Pull binaries into a second stage deploy alpine container
+FROM alpine:latest
+RUN apk add --no-cache ca-certificates
+
+COPY --from=builder /go/src/testms/cmd/testapp /testms/
+
+WORKDIR /testms
+
+RUN chmod +x testapp
+
+CMD ["./testapp"]

client/Dockerfile

@@ -1,4 +1,4 @@
-GRPC_PORT=8081
+GRPC_HOST=server
 HTTP_PORT=8080
 CLIENT_TIMEOUT=5 #in seconds
-FILEPATH=../../ports.json
+FILEPATH=/testms/data.json

client/cmd/.env

@@ -0,0 +1,5 @@
+GRPC_HOST=localhost
+GRPC_PORT=8081
+HTTP_PORT=8080
+CLIENT_TIMEOUT=5 #in seconds
+FILEPATH=../../data.json

client/cmd/.env.dist

@@ -19,15 +19,18 @@ import (
 )
 
 const (
+	defaultGRPCHost      = "localhost"
 	defaultGRPCPort      = "8081"
 	defaultHTTPPort      = "8080"
 	defaultClientTimeout = "15"
 	defaultFilePath      = "../../ports.json"
 )
 
 func init() {
-	if err := godotenv.Load(".env"); err != nil {
-		log.Fatal("unable to load env file")
+	if err := godotenv.Load("/run/secrets/client_env"); err != nil {
+		if err := godotenv.Load(".env.dist"); err != nil {
+			log.Fatal("unable to load env file")
+		}
 	}
 }
 
@@ -84,7 +87,10 @@ func initDeps() (api.PortDomainServiceClient, time.Duration, chan api.SaveReques
 
 	timeout := time.Duration(int64(intT)) * time.Second
 
-	conn, err := grpc.Dial(":"+getenv("GRPC_POPRT", defaultGRPCPort), grpc.WithInsecure())
+	conn, err := grpc.Dial(fmt.Sprintf("%s:%s",
+		getenv("GRPC_HOST", defaultGRPCHost),
+		getenv("GRPC_PORT", defaultGRPCPort)),
+		grpc.WithInsecure())
 	if err != nil {
 		return nil, 0, nil, "", err
 	}