Speed up generation (#1990)

Author: lucacome

internal/framework/controller/fakes.go

@@ -5,6 +5,8 @@ import (
 	_ "sigs.k8s.io/controller-runtime/pkg/manager" // used below to generate a fake
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6  sigs.k8s.io/controller-runtime/pkg/manager.Manager
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6  sigs.k8s.io/controller-runtime/pkg/client.FieldIndexer
+//counterfeiter:generate  sigs.k8s.io/controller-runtime/pkg/manager.Manager
+
+//counterfeiter:generate  sigs.k8s.io/controller-runtime/pkg/client.FieldIndexer

internal/framework/controller/getter.go

@@ -6,7 +6,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Getter
+//counterfeiter:generate . Getter
 
 // Getter gets a resource from the k8s API.
 // It allows us to mock the client.Reader.Get method.

internal/framework/events/first_eventbatch_preparer.go

@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . FirstEventBatchPreparer
+//counterfeiter:generate . FirstEventBatchPreparer
 
 // FirstEventBatchPreparer prepares the first batch of events to be processed by the EventHandler.
 // The first batch includes the UpsertEvents for all relevant resources in the cluster.
@@ -20,7 +20,7 @@ type FirstEventBatchPreparer interface {
 	Prepare(ctx context.Context) (EventBatch, error)
 }
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Reader
+//counterfeiter:generate . Reader
 
 // Reader allows getting and listing resources from a cache.
 // This interface is introduced for testing to mock the methods from

internal/framework/events/handler.go

@@ -6,7 +6,8 @@ import (
 	"github.com/go-logr/logr"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . EventHandler
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+//counterfeiter:generate . EventHandler
 
 // EventHandler handles events.
 type EventHandler interface {

internal/framework/status/k8s_updater.go

@@ -9,7 +9,8 @@ import (
 // K8sUpdater updates a resource from the k8s API.
 // It allows us to mock the client.Reader.Status.Update method.
 //
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . K8sUpdater
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+//counterfeiter:generate . K8sUpdater
 type K8sUpdater interface {
 	// Update is from client.StatusClient.SubResourceWriter.
 	Update(ctx context.Context, obj client.Object, opts ...client.SubResourceUpdateOption) error

internal/framework/status/leader_aware_group_updater.go

@@ -11,7 +11,7 @@ import (
 // Note: this interface is created so that it that we can create a fake from it and use it
 // in mode/static/handler_test.go (to avoid import cycles).
 //
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . GroupUpdater
+//counterfeiter:generate . GroupUpdater
 type GroupUpdater interface {
 	UpdateGroup(ctx context.Context, name string, reqs ...UpdateRequest)
 }

internal/mode/static/handler.go

@@ -36,7 +36,8 @@ type handlerMetricsCollector interface {
 	ObserveLastEventBatchProcessTime(time.Duration)
 }
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . secretStorer
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+//counterfeiter:generate . secretStorer
 
 // secretStorer should store the usage Secret that contains the credentials for NGINX Plus usage reporting.
 type secretStorer interface {

internal/mode/static/log_level_setters.go

@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . logLevelSetter
+//counterfeiter:generate . logLevelSetter
 
 // logLevelSetter defines an interface for setting the logging level of a logger.
 type logLevelSetter interface {

internal/mode/static/nginx/config/generator.go

@@ -7,7 +7,8 @@ import (
 	"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Generator
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+//counterfeiter:generate . Generator
 
 const (
 	// configFolder is the folder where NGINX configuration files are stored.

internal/mode/static/nginx/file/folders.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 )
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io/fs.DirEntry
+//counterfeiter:generate io/fs.DirEntry
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ClearFoldersOSFileManager
+//counterfeiter:generate . ClearFoldersOSFileManager
 
 // ClearFoldersOSFileManager is an interface that exposes File I/O operations for ClearFolders.
 // Used for unit testing.