Version control and vendor mockgen (#1802)

Explicitly track `github.com/golang/mock/mockgen` as a go dependency.
(There is no change in our go.mod or go.sum, since the package is
already being used by the generated code and elsewhere).

Add `//go:generate` directives to create the mocked files and ensure the
results are always up to date.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 61e0112)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

internal/computeagent/doc.go

@@ -3,8 +3,6 @@
 //
 // A mock service under `mock` is used for unit testing the various services
 // used for ncproxy.
-//
-// The mock service is compiled using the following command:
-//
-// mockgen -source="computeagent.pb.go" -package="computeagent_mock" > mock\computeagent_mock.pb.go
 package computeagent
+
+//go:generate go run github.com/golang/mock/mockgen -source=computeagent.pb.go -package=computeagent_mock -destination=mock\computeagent_mock.pb.go

pkg/ncproxy/nodenetsvc/v1/doc.go

@@ -3,9 +3,6 @@
 //
 // A mock service under `mock` is used for unit testing the various services
 // used for ncproxy.
-//
-// The mock service is compiled using the following command:
-//
-// mockgen -source="nodenetsvc.pb.go" -package="nodenetsvc_mock" > mock\nodenetsvc_mock.pb.go
-
 package v1
+
+//go:generate go run github.com/golang/mock/mockgen -source=nodenetsvc.pb.go -package=nodenetsvc_v1_mock -destination=mock\nodenetsvc_mock.pb.go

test/go.mod

@@ -52,6 +52,7 @@ require (
 	github.com/godbus/dbus/v5 v5.0.6 // indirect
 	github.com/gogo/googleapis v1.4.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect

test/go.sum

@@ -504,6 +504,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

tools.go

@@ -2,4 +2,12 @@
 
 package hcsshim
 
-import _ "github.com/Microsoft/go-winio/tools/mkwinsyscall"
+import (
+	// for go generate directives
+
+	// generate Win32 API code
+	_ "github.com/Microsoft/go-winio/tools/mkwinsyscall"
+
+	// mock gRPC client and servers
+	_ "github.com/golang/mock/mockgen"
+)