go: use dep in builds, remove relative imports

Fixes #11. Fixes #12. Fixes #13. Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
julianocosta89 · Aug 4, 2018 · 427f13f · 427f13f
1 parent c7dd0cb
commit 427f13f
Show file tree

Hide file tree

Showing 36 changed files with 737 additions and 125 deletions.
diff --git a/src/cartservice/Dockerfile b/src/cartservice/Dockerfile
@@ -1,8 +1,12 @@
 # cartservice_probe
 FROM golang:1.10 as builder
-WORKDIR /src/microservices-demo/cartservice/probe
-COPY probe/ .
-RUN go get -d ./...
+RUN wget -qO/go/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && \
+      chmod +x /go/bin/dep
+ENV PROJECT github.com/GoogleCloudPlatform/microservices-demo/src/cartservice/probe
+WORKDIR /go/src/$PROJECT
+COPY probe/Gopkg.* ./
+RUN dep ensure --vendor-only -v
+COPY ./probe ./
 RUN go build -o /cartservice_probe .
 
 # cartservice

diff --git a/src/cartservice/probe/.dockerignore b/src/cartservice/probe/.dockerignore
@@ -0,0 +1 @@
+vendor/
diff --git a/src/cartservice/probe/Gopkg.lock b/src/cartservice/probe/Gopkg.lock
diff --git a/src/cartservice/probe/Gopkg.toml b/src/cartservice/probe/Gopkg.toml
@@ -0,0 +1,42 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "1.1.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "1.14.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/src/cartservice/probe/main.go b/src/cartservice/probe/main.go
@@ -20,9 +20,8 @@ import (
 	"os"
 	"time"
 
-	pb "./genproto"
+	pb "github.com/GoogleCloudPlatform/microservices-demo/src/cartservice/probe/genproto"
 
-	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 )
 
@@ -38,7 +37,6 @@ func main() {
 		grpc.WithBlock(),
 		grpc.WithTimeout(time.Second*3),
 		grpc.WithInsecure(),
-		grpc.WithStatsHandler(&ocgrpc.ClientHandler{}),
 	)
 	if err != nil {
 		log.Fatalf("probe failed: failed to connect: %+v", err)

diff --git a/src/checkoutservice/.dockerignore b/src/checkoutservice/.dockerignore
@@ -0,0 +1 @@
+vendor/
diff --git a/src/checkoutservice/Dockerfile b/src/checkoutservice/Dockerfile
@@ -1,19 +1,16 @@
 FROM golang:1.10-alpine as builder
-RUN apk add --no-cache ca-certificates git
-WORKDIR /go/src/checkoutservice
+RUN apk add --no-cache ca-certificates git && \
+      wget -qO/go/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && \
+      chmod +x /go/bin/dep
+
+ENV PROJECT github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice
+WORKDIR /go/src/$PROJECT
+
+# restore dependencies
+COPY Gopkg.* ./
+RUN dep ensure --vendor-only -v
 
-# get known dependencies
-RUN go get -d github.com/google/uuid \
-    google.golang.org/grpc \
-    google.golang.org/grpc/codes \
-    google.golang.org/grpc/status \
-    go.opencensus.io/plugin/ocgrpc \
-    go.opencensus.io/exporter/stackdriver \
-	go.opencensus.io/trace \
-    cloud.google.com/go/profiler
 COPY . .
-# get remaining dependencies
-RUN go get -d ./...
 RUN go build -gcflags='-N -l' -o /checkoutservice .
 
 FROM alpine as release

diff --git a/src/checkoutservice/Gopkg.lock b/src/checkoutservice/Gopkg.lock
diff --git a/src/checkoutservice/Gopkg.toml b/src/checkoutservice/Gopkg.toml
@@ -29,6 +29,10 @@
   name = "cloud.google.com/go"
   version = "0.25.0"
 
+[[constraint]]
+  name = "contrib.go.opencensus.io/exporter/stackdriver"
+  version = "0.5.0"
+
 [[constraint]]
   name = "github.com/golang/protobuf"
   version = "1.1.0"
@@ -47,7 +51,7 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.13.0"
+  version = "1.14.0"
 
 [prune]
   go-tests = true

diff --git a/src/checkoutservice/README.md b/src/checkoutservice/README.md
@@ -0,0 +1,5 @@
+# checkoutservice
+
+Run the following command to restore dependencies to `vendor/` directory:
+
+    dep ensure --vendor-only
diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go
@@ -23,16 +23,16 @@ import (
 	"time"
 
 	"cloud.google.com/go/profiler"
+	"contrib.go.opencensus.io/exporter/stackdriver"
 	"github.com/google/uuid"
-	"go.opencensus.io/exporter/stackdriver"
 	"go.opencensus.io/plugin/ocgrpc"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	pb "checkoutservice/genproto"
-	money "checkoutservice/money"
+	pb "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/genproto"
+	money "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/money"
 )
 
 const (

diff --git a/src/checkoutservice/money/money.go b/src/checkoutservice/money/money.go
@@ -17,7 +17,7 @@ package money
 import (
 	"errors"
 
-	pb "checkoutservice/genproto"
+	pb "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/genproto"
 )
 
 const (

diff --git a/src/checkoutservice/money/money_test.go b/src/checkoutservice/money/money_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	pb "checkoutservice/genproto"
+	pb "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/genproto"
 )
 
 func mmc(u int64, n int32, c string) pb.Money { return pb.Money{Units: u, Nanos: n, CurrencyCode: c} }