From 6bb1680964209e398a536605d8a1d160d1a037d1 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Tue, 13 Aug 2019 17:22:32 -0700 Subject: [PATCH] Change makefile in v2 scaffolding to use ./... Previously, we had some spots where we were using `./api/...` and `./controllers/...` specifically. Using `./...` instead allows us to handle cases where we're lacking `api/`, and should otherwise be fine since we don't have a vendor directory. --- pkg/scaffold/v2/makefile.go | 4 ++-- testdata/project-v2/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/scaffold/v2/makefile.go b/pkg/scaffold/v2/makefile.go index 9f2895813e9..2bcfdd39cc8 100644 --- a/pkg/scaffold/v2/makefile.go +++ b/pkg/scaffold/v2/makefile.go @@ -59,7 +59,7 @@ all: manager # Run tests test: generate fmt vet manifests - go test ./api/... ./controllers/... -coverprofile cover.out + go test ./... -coverprofile cover.out # Build manager binary manager: generate fmt vet @@ -92,7 +92,7 @@ vet: # Generate code generate: controller-gen - $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/... + $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..." # Build the docker image docker-build: test diff --git a/testdata/project-v2/Makefile b/testdata/project-v2/Makefile index 3d0b87db8f0..4ec783908db 100644 --- a/testdata/project-v2/Makefile +++ b/testdata/project-v2/Makefile @@ -15,7 +15,7 @@ all: manager # Run tests test: generate fmt vet manifests - go test ./api/... ./controllers/... -coverprofile cover.out + go test ./... -coverprofile cover.out # Build manager binary manager: generate fmt vet @@ -48,7 +48,7 @@ vet: # Generate code generate: controller-gen - $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/... + $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..." # Build the docker image docker-build: test