chore(mocks): move inside their specific packages (#1446)

Makefile

@@ -27,6 +27,10 @@ post-test: do-test
 
 test: post-test
 
+
+# go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+# go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+# go install github.com/bufbuild/buf/cmd/buf@latest
 generate:
 	buf generate --path ./protos/imageservice/imageservice.proto
 	buf generate --path ./protos/instanceservice/instanceservice.proto
@@ -49,10 +53,11 @@ run:
 deps:
 	@GO111MODULE=on go mod download
 
+# go install github.com/golang/mock/mockgen@latest
 update-mocks:
-	mockgen --source=network/setup_network_interfaces.go > mock_network/setup_network_interfaces.go
-	mockgen --source=provider/upcloud/upcloud.go > mock_provider/mock_upcloud/upcloud.go
-	mockgen --source=provider/oci/oci.go > mock_provider/mock_oci/oci.go
+	go generate network/setup_network_interfaces.go
+	go generate provider/upcloud/upcloud.go
+	go generate provider/oci/oci.go
 
 .PHONY: all build test clean run deps
 .PHONY: pre-build do-build post-build

network/setup_network_interfaces.go

@@ -1,3 +1,5 @@
+//go:generate mockgen -source=$GOFILE -destination=$PWD/mocks/${GOFILE} -package=mocks
+
 package network
 
 import (

network/setup_network_interfaces_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/nanovms/ops/mock_network"
 	"github.com/nanovms/ops/network"
+	mock_network "github.com/nanovms/ops/network/mocks"
 )
 
 func TestSetupNetworkInterfaces(t *testing.T) {

provider/oci/oci.go

@@ -1,3 +1,5 @@
+//go:generate mockgen -source=$GOFILE -destination=$PWD/mocks/${GOFILE} -package=mocks
+
 package oci
 
 import (

provider/oci/oci_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/nanovms/ops/mock_provider/mock_oci"
 	"github.com/nanovms/ops/provider/oci"
+	mock_oci "github.com/nanovms/ops/provider/oci/mocks"
 	"github.com/spf13/afero"
 )
 

provider/upcloud/upcloud.go

@@ -1,3 +1,5 @@
+//go:generate mockgen -source=$GOFILE -destination=$PWD/mocks/${GOFILE} -package=mocks
+
 package upcloud
 
 import (

provider/upcloud/upcloud_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/nanovms/ops/lepton"
-	"github.com/nanovms/ops/mock_provider/mock_upcloud"
 	"github.com/nanovms/ops/provider/upcloud"
+	mock_upcloud "github.com/nanovms/ops/provider/upcloud/mocks"
 	"github.com/stretchr/testify/assert"
 )