Move utils to tools folder (recommended name)

Signed-off-by: Marcos G. Yedro <[email protected]>

Makefile

@@ -31,7 +31,8 @@ utils = github.com/golang/protobuf/protoc-gen-go \
 		github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger \
 		github.com/jteeuwen/go-bindata/go-bindata \
 		github.com/AlekSi/gocoverutil \
-		github.com/mattn/goveralls
+		github.com/mattn/goveralls \
+		github.com/spiffe/spire/tools/protoc-gen-spireplugin
 
 # Help message settings
 cyan := $(shell tput setaf 6)
@@ -92,7 +93,7 @@ cmd: ## Opens a shell in docker container
 utils: $(utils) ## Go-get SPIRE utils
 
 $(utils): noop
-	$(docker) /bin/sh -c "cd utils; go install $@"
+	$(docker) /bin/sh -c "cd tools; go install $@"
 
 # Vendor is not needed for building. It is just kept for compatibility with IDEs that does not support modules yet.
 vendor: ## Make vendored copy of dependencies.

build.sh

@@ -95,8 +95,6 @@ build_protobuf() {
 	local _n _d _dir _prefix="$1"
 	eval $(build_env)
 
-	go install github.com/spiffe/spire/tools/protoc-gen-spireplugin
-
 	for _n in ${PROTO_FILES}; do
 		_dir="$(dirname ${_n})"
 		if [[ -n ${_prefix} ]]; then

utils/go.mod → tools/go.mod

@@ -1,4 +1,4 @@
-module github.com/spiffe/spire/utils
+module github.com/spiffe/spire/tools
 
 require (
 	github.com/AlekSi/gocoverutil v0.2.0 // indirect

utils/utils.go → tools/tools.go

@@ -1,6 +1,6 @@
 // +build tools
 
-package utils
+package tools
 
 import (
 	_ "github.com/AlekSi/gocoverutil"