diff --git a/.golangci.yml b/.golangci.yml index a79fdb22c6..707f7e6839 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -105,7 +105,6 @@ linters: - staticcheck - stylecheck - tagalign - - tenv - thelper - tparallel - typecheck diff --git a/go.mod b/go.mod index 34a8b52842..fdfcdeb4bc 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,11 @@ module github.com/nginx/nginx-gateway-fabric -go 1.23.0 +go 1.24.0 require ( github.com/go-kit/log v0.2.1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 - github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 github.com/nginx/telemetry-exporter v0.1.3 github.com/nginxinc/nginx-plus-go-client v1.3.0 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 @@ -57,6 +56,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect github.com/mailru/easyjson v0.7.7 // indirect + github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect @@ -94,3 +94,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +tool github.com/maxbrunsfeld/counterfeiter/v6 diff --git a/internal/framework/controller/fakes.go b/internal/framework/controller/fakes.go index 9babcf0e26..b039e8e502 100644 --- a/internal/framework/controller/fakes.go +++ b/internal/framework/controller/fakes.go @@ -5,7 +5,7 @@ import ( _ "sigs.k8s.io/controller-runtime/pkg/manager" // used below to generate a fake ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate sigs.k8s.io/controller-runtime/pkg/manager.Manager diff --git a/internal/framework/events/handler.go b/internal/framework/events/handler.go index f66fa06440..673a6f37fa 100644 --- a/internal/framework/events/handler.go +++ b/internal/framework/events/handler.go @@ -6,7 +6,7 @@ import ( "github.com/go-logr/logr" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . EventHandler // EventHandler handles events. diff --git a/internal/framework/kubernetes/client.go b/internal/framework/kubernetes/client.go index e10df946aa..0dac5588a1 100644 --- a/internal/framework/kubernetes/client.go +++ b/internal/framework/kubernetes/client.go @@ -2,7 +2,7 @@ package kubernetes import "sigs.k8s.io/controller-runtime/pkg/client" -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . Reader diff --git a/internal/framework/status/k8s_updater.go b/internal/framework/status/k8s_updater.go index 3840b7d744..8b54e19042 100644 --- a/internal/framework/status/k8s_updater.go +++ b/internal/framework/status/k8s_updater.go @@ -9,7 +9,7 @@ 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 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . K8sUpdater type K8sUpdater interface { // Update is from client.StatusClient.SubResourceWriter. diff --git a/internal/mode/static/licensing/collector.go b/internal/mode/static/licensing/collector.go index 0e28a47634..0babb3bd6a 100644 --- a/internal/mode/static/licensing/collector.go +++ b/internal/mode/static/licensing/collector.go @@ -11,7 +11,7 @@ import ( "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . Collector diff --git a/internal/mode/static/nginx/config/generator.go b/internal/mode/static/nginx/config/generator.go index 00b9500aea..49be7696d2 100644 --- a/internal/mode/static/nginx/config/generator.go +++ b/internal/mode/static/nginx/config/generator.go @@ -17,7 +17,7 @@ import ( "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . Generator // Volumes here also need to be added to our crossplane ephemeral test container. diff --git a/internal/mode/static/nginx/config/policies/policy.go b/internal/mode/static/nginx/config/policies/policy.go index b818f5a216..d65a375db8 100644 --- a/internal/mode/static/nginx/config/policies/policy.go +++ b/internal/mode/static/nginx/config/policies/policy.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate // Policy is an extension of client.Object. It adds methods that are common among all NGF Policies. // diff --git a/internal/mode/static/nginx/config/policies/validator.go b/internal/mode/static/nginx/config/policies/validator.go index 7ab88667e2..0bb7b58924 100644 --- a/internal/mode/static/nginx/config/policies/validator.go +++ b/internal/mode/static/nginx/config/policies/validator.go @@ -1,6 +1,6 @@ package policies -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate import ( "fmt" diff --git a/internal/mode/static/nginx/file/manager.go b/internal/mode/static/nginx/file/manager.go index 6c535ddfc4..52c64216f1 100644 --- a/internal/mode/static/nginx/file/manager.go +++ b/internal/mode/static/nginx/file/manager.go @@ -10,7 +10,7 @@ import ( "github.com/go-logr/logr" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate const ( // regularFileMode defines the default file mode for regular files. diff --git a/internal/mode/static/nginx/runtime/manager.go b/internal/mode/static/nginx/runtime/manager.go index afa641645f..8c378f1e99 100644 --- a/internal/mode/static/nginx/runtime/manager.go +++ b/internal/mode/static/nginx/runtime/manager.go @@ -16,7 +16,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate const ( // PidFile specifies the location of the PID file for the Nginx process. diff --git a/internal/mode/static/nginx/runtime/verify.go b/internal/mode/static/nginx/runtime/verify.go index 9dc64d4e34..e5d7e64b33 100644 --- a/internal/mode/static/nginx/runtime/verify.go +++ b/internal/mode/static/nginx/runtime/verify.go @@ -19,7 +19,7 @@ const configVersionURI = "/var/run/nginx/nginx-config-version.sock" var noNewWorkersErrFmt = "reload unsuccessful: no new NGINX worker processes started for config version %d." + " Please check the NGINX container logs for possible configuration issues: %w" -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . nginxConfigVerifier +//go:generate go tool counterfeiter . nginxConfigVerifier type nginxConfigVerifier interface { GetConfigVersion() (int, error) diff --git a/internal/mode/static/state/change_processor.go b/internal/mode/static/state/change_processor.go index 61d6475d9f..3f5122df5a 100644 --- a/internal/mode/static/state/change_processor.go +++ b/internal/mode/static/state/change_processor.go @@ -26,7 +26,7 @@ import ( "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate // ChangeType is the type of change that occurred based on a k8s object event. type ChangeType int diff --git a/internal/mode/static/state/resolver/resolver.go b/internal/mode/static/state/resolver/resolver.go index 151c59173d..5162ddd510 100644 --- a/internal/mode/static/state/resolver/resolver.go +++ b/internal/mode/static/state/resolver/resolver.go @@ -14,7 +14,7 @@ import ( "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . ServiceResolver // ServiceResolver resolves a Service's NamespacedName and ServicePort to a list of Endpoints. diff --git a/internal/mode/static/state/validation/validator.go b/internal/mode/static/state/validation/validator.go index eba86b0e57..dd48573902 100644 --- a/internal/mode/static/state/validation/validator.go +++ b/internal/mode/static/state/validation/validator.go @@ -1,6 +1,6 @@ package validation -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate import ( "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" diff --git a/internal/mode/static/telemetry/exporter.go b/internal/mode/static/telemetry/exporter.go index 21c7c99c38..1cd70f127c 100644 --- a/internal/mode/static/telemetry/exporter.go +++ b/internal/mode/static/telemetry/exporter.go @@ -9,7 +9,7 @@ import ( // Exporter exports telemetry data to some destination. // -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate //counterfeiter:generate . Exporter type Exporter interface { Export(ctx context.Context, data tel.Exportable) error diff --git a/tests/framework/crossplane/go.mod b/tests/framework/crossplane/go.mod index 67ea352cb9..0a349992fa 100644 --- a/tests/framework/crossplane/go.mod +++ b/tests/framework/crossplane/go.mod @@ -1,6 +1,6 @@ module github.com/nginx/nginx-gateway-fabric/tests/framework/crossplane -go 1.23.1 +go 1.24.0 require github.com/nginxinc/nginx-go-crossplane v0.4.73 diff --git a/tests/go.mod b/tests/go.mod index bfd30caa98..dacde36550 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,6 @@ module github.com/nginx/nginx-gateway-fabric/tests -go 1.23.0 +go 1.24.0 replace github.com/nginx/nginx-gateway-fabric => ../ diff --git a/tools.go b/tools.go deleted file mode 100644 index 97875e7239..0000000000 --- a/tools.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build tools -// +build tools - -// This file just exists to ensure we download the tools we need for building -// See https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module - -package tools - -import ( - _ "github.com/maxbrunsfeld/counterfeiter/v6" -)