diff --git a/Makefile b/Makefile index e9493b075d..8b8da78d7c 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ generate-manifests: ## Generate manifests using Helm. ./scripts/generate-manifests.sh generate-api-docs: ## Generate API docs - go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/apis" + go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/v2/apis" .PHONY: generate-helm-docs generate-helm-docs: ## Generate the Helm chart documentation diff --git a/apis/v1alpha2/nginxproxy_types.go b/apis/v1alpha2/nginxproxy_types.go index 9ebffa7fac..a1dfd1632a 100644 --- a/apis/v1alpha2/nginxproxy_types.go +++ b/apis/v1alpha2/nginxproxy_types.go @@ -5,7 +5,7 @@ import ( apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" ) // +genclient diff --git a/apis/v1alpha2/observabilitypolicy_types.go b/apis/v1alpha2/observabilitypolicy_types.go index d46b64ddd3..27eb7e81d4 100644 --- a/apis/v1alpha2/observabilitypolicy_types.go +++ b/apis/v1alpha2/observabilitypolicy_types.go @@ -4,7 +4,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" ) // +genclient diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go index 1e4f5955c7..c220477cbf 100644 --- a/apis/v1alpha2/zz_generated.deepcopy.go +++ b/apis/v1alpha2/zz_generated.deepcopy.go @@ -5,7 +5,7 @@ package v1alpha2 import ( - "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/cmd/gateway/commands.go b/cmd/gateway/commands.go index a5b60b5085..37a3000631 100644 --- a/cmd/gateway/commands.go +++ b/cmd/gateway/commands.go @@ -20,11 +20,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginx/nginx-gateway-fabric/internal/controller" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + ngxConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" ) // These flags are shared by multiple commands. diff --git a/cmd/gateway/commands_test.go b/cmd/gateway/commands_test.go index 1f87dcb682..ba65d2fa49 100644 --- a/cmd/gateway/commands_test.go +++ b/cmd/gateway/commands_test.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" ) type flagTestCase struct { diff --git a/cmd/gateway/initialize.go b/cmd/gateway/initialize.go index c9cc63f1f9..5c604f2f65 100644 --- a/cmd/gateway/initialize.go +++ b/cmd/gateway/initialize.go @@ -9,9 +9,9 @@ import ( "github.com/go-logr/logr" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" ) const ( diff --git a/cmd/gateway/initialize_test.go b/cmd/gateway/initialize_test.go index 16e271a294..5d29aef1e1 100644 --- a/cmd/gateway/initialize_test.go +++ b/cmd/gateway/initialize_test.go @@ -11,12 +11,12 @@ import ( "github.com/go-logr/logr" . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing/licensingfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/configfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file/filefakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing/licensingfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/configfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestInitialize_OSS(t *testing.T) { diff --git a/go.mod b/go.mod index 664848d441..03a5b6281b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginx/nginx-gateway-fabric +module github.com/nginx/nginx-gateway-fabric/v2 go 1.24.2 diff --git a/internal/controller/config_updater.go b/internal/controller/config_updater.go index 2266ef0e7a..199134f522 100644 --- a/internal/controller/config_updater.go +++ b/internal/controller/config_updater.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/tools/record" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) // updateControlPlane updates the control plane configuration with the given user spec. diff --git a/internal/controller/config_updater_test.go b/internal/controller/config_updater_test.go index 7ab1f942fb..5c0fb854a0 100644 --- a/internal/controller/config_updater_test.go +++ b/internal/controller/config_updater_test.go @@ -10,9 +10,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/controllerfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestUpdateControlPlane(t *testing.T) { diff --git a/internal/controller/handler.go b/internal/controller/handler.go index e668b3f311..88b817fbaa 100644 --- a/internal/controller/handler.go +++ b/internal/controller/handler.go @@ -17,20 +17,20 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + ngxConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) type handlerMetricsCollector interface { diff --git a/internal/controller/handler_test.go b/internal/controller/handler_test.go index 021584350c..a9fa942c27 100644 --- a/internal/controller/handler_test.go +++ b/internal/controller/handler_test.go @@ -19,23 +19,23 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing/licensingfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/metrics/collectors" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/agentfakes" - agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/grpcfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/configfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner/provisionerfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/statefakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status/statusfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing/licensingfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics/collectors" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/agentfakes" + agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/grpcfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/configfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner/provisionerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/statefakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status/statusfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var _ = Describe("eventHandler", func() { diff --git a/internal/controller/licensing/collector.go b/internal/controller/licensing/collector.go index 564e807f46..f4d7b97203 100644 --- a/internal/controller/licensing/collector.go +++ b/internal/controller/licensing/collector.go @@ -7,8 +7,8 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" ) //go:generate go tool counterfeiter -generate diff --git a/internal/controller/licensing/collector_test.go b/internal/controller/licensing/collector_test.go index 114e088d09..66b06640ea 100644 --- a/internal/controller/licensing/collector_test.go +++ b/internal/controller/licensing/collector_test.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var _ = Describe("DeploymentContextCollector", func() { diff --git a/internal/controller/licensing/licensingfakes/fake_collector.go b/internal/controller/licensing/licensingfakes/fake_collector.go index b0ea9d426b..28c35f621c 100644 --- a/internal/controller/licensing/licensingfakes/fake_collector.go +++ b/internal/controller/licensing/licensingfakes/fake_collector.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) type FakeCollector struct { diff --git a/internal/controller/log_level_setters_test.go b/internal/controller/log_level_setters_test.go index cd1ee7e8b2..df2bac5c89 100644 --- a/internal/controller/log_level_setters_test.go +++ b/internal/controller/log_level_setters_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" "go.uber.org/zap" - "github.com/nginx/nginx-gateway-fabric/internal/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/controllerfakes" ) func TestMultiLogLevelSetter_SetLevel(t *testing.T) { diff --git a/internal/controller/manager.go b/internal/controller/manager.go index a8a1afe99b..bb95a3660f 100644 --- a/internal/controller/manager.go +++ b/internal/controller/manager.go @@ -36,35 +36,35 @@ import ( gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/licensing" - "github.com/nginx/nginx-gateway-fabric/internal/controller/metrics/collectors" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - ngxcfg "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/clientsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/observability" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings" - ngxvalidation "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/filter" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginx/nginx-gateway-fabric/internal/framework/runnables" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics/collectors" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + ngxcfg "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings" + ngxvalidation "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/filter" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/runnables" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) const ( diff --git a/internal/controller/manager_test.go b/internal/controller/manager_test.go index 75aecfe04a..60d7b0e5d5 100644 --- a/internal/controller/manager_test.go +++ b/internal/controller/manager_test.go @@ -19,10 +19,10 @@ import ( gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" ) func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) { diff --git a/internal/controller/metrics/collectors/controller.go b/internal/controller/metrics/collectors/controller.go index ea0eaa81a8..c17e52f718 100644 --- a/internal/controller/metrics/collectors/controller.go +++ b/internal/controller/metrics/collectors/controller.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/nginx/nginx-gateway-fabric/internal/controller/metrics" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics" ) // ControllerCollector collects metrics for the NGF controller. diff --git a/internal/controller/nginx/agent/agent.go b/internal/controller/nginx/agent/agent.go index 7aba3a8160..f30e8b2853 100644 --- a/internal/controller/nginx/agent/agent.go +++ b/internal/controller/nginx/agent/agent.go @@ -13,12 +13,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" ) const retryUpstreamTimeout = 5 * time.Second diff --git a/internal/controller/nginx/agent/agent_test.go b/internal/controller/nginx/agent/agent_test.go index 73031d0518..f67dfbc8a9 100644 --- a/internal/controller/nginx/agent/agent_test.go +++ b/internal/controller/nginx/agent/agent_test.go @@ -11,11 +11,11 @@ import ( "google.golang.org/protobuf/types/known/structpb" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast/broadcastfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast/broadcastfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" ) func TestUpdateConfig(t *testing.T) { diff --git a/internal/controller/nginx/agent/agentfakes/fake_deployment_storer.go b/internal/controller/nginx/agent/agentfakes/fake_deployment_storer.go index cacaf715ed..ba3b98c22f 100644 --- a/internal/controller/nginx/agent/agentfakes/fake_deployment_storer.go +++ b/internal/controller/nginx/agent/agentfakes/fake_deployment_storer.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" "k8s.io/apimachinery/pkg/types" ) diff --git a/internal/controller/nginx/agent/agentfakes/fake_nginx_updater.go b/internal/controller/nginx/agent/agentfakes/fake_nginx_updater.go index 466360d740..b838e07274 100644 --- a/internal/controller/nginx/agent/agentfakes/fake_nginx_updater.go +++ b/internal/controller/nginx/agent/agentfakes/fake_nginx_updater.go @@ -4,8 +4,8 @@ package agentfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) type FakeNginxUpdater struct { diff --git a/internal/controller/nginx/agent/broadcast/broadcast_test.go b/internal/controller/nginx/agent/broadcast/broadcast_test.go index 5a20622671..efbe728f40 100644 --- a/internal/controller/nginx/agent/broadcast/broadcast_test.go +++ b/internal/controller/nginx/agent/broadcast/broadcast_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" ) func TestSubscribe(t *testing.T) { diff --git a/internal/controller/nginx/agent/broadcast/broadcastfakes/fake_broadcaster.go b/internal/controller/nginx/agent/broadcast/broadcastfakes/fake_broadcaster.go index ba8f6aaf8e..43f11ee490 100644 --- a/internal/controller/nginx/agent/broadcast/broadcastfakes/fake_broadcaster.go +++ b/internal/controller/nginx/agent/broadcast/broadcastfakes/fake_broadcaster.go @@ -4,7 +4,7 @@ package broadcastfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" ) type FakeBroadcaster struct { diff --git a/internal/controller/nginx/agent/command.go b/internal/controller/nginx/agent/command.go index 41df07a055..046fb7f313 100644 --- a/internal/controller/nginx/agent/command.go +++ b/internal/controller/nginx/agent/command.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/messenger" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/messenger" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" ) const connectionWaitTimeout = 30 * time.Second diff --git a/internal/controller/nginx/agent/command_test.go b/internal/controller/nginx/agent/command_test.go index c23bbf02ae..7b8b763011 100644 --- a/internal/controller/nginx/agent/command_test.go +++ b/internal/controller/nginx/agent/command_test.go @@ -19,13 +19,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast/broadcastfakes" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" - agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/grpcfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/messenger/messengerfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast/broadcastfakes" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" + agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/grpcfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/messenger/messengerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" ) type mockSubscribeServer struct { diff --git a/internal/controller/nginx/agent/deployment.go b/internal/controller/nginx/agent/deployment.go index 1160bfab20..48cb69d5af 100644 --- a/internal/controller/nginx/agent/deployment.go +++ b/internal/controller/nginx/agent/deployment.go @@ -10,8 +10,8 @@ import ( filesHelper "github.com/nginx/agent/v3/pkg/files" "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" ) // ignoreFiles is a list of static or base files that live in the diff --git a/internal/controller/nginx/agent/deployment_test.go b/internal/controller/nginx/agent/deployment_test.go index e6f54614ae..b3f2744ee6 100644 --- a/internal/controller/nginx/agent/deployment_test.go +++ b/internal/controller/nginx/agent/deployment_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast/broadcastfakes" - agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/grpcfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast/broadcastfakes" + agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/grpcfakes" ) func TestNewDeployment(t *testing.T) { diff --git a/internal/controller/nginx/agent/file.go b/internal/controller/nginx/agent/file.go index be9852487f..ec2a5b1013 100644 --- a/internal/controller/nginx/agent/file.go +++ b/internal/controller/nginx/agent/file.go @@ -12,8 +12,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" ) const defaultChunkSize uint32 = 2097152 // 2MB diff --git a/internal/controller/nginx/agent/file_test.go b/internal/controller/nginx/agent/file_test.go index fcd893302d..3805d145c8 100644 --- a/internal/controller/nginx/agent/file_test.go +++ b/internal/controller/nginx/agent/file_test.go @@ -12,9 +12,9 @@ import ( "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" - agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/grpcfakes" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" + agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/grpcfakes" ) type mockServerStreamingServer struct { diff --git a/internal/controller/nginx/agent/grpc/connections_test.go b/internal/controller/nginx/agent/grpc/connections_test.go index f503cf2e37..24280d375f 100644 --- a/internal/controller/nginx/agent/grpc/connections_test.go +++ b/internal/controller/nginx/agent/grpc/connections_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" + agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" ) func TestGetConnection(t *testing.T) { diff --git a/internal/controller/nginx/agent/grpc/context/context_test.go b/internal/controller/nginx/agent/grpc/context/context_test.go index 195479a021..e649f29e19 100644 --- a/internal/controller/nginx/agent/grpc/context/context_test.go +++ b/internal/controller/nginx/agent/grpc/context/context_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" ) func TestGrpcInfoInContext(t *testing.T) { diff --git a/internal/controller/nginx/agent/grpc/grpc.go b/internal/controller/nginx/agent/grpc/grpc.go index ccc070dd22..2c997715b4 100644 --- a/internal/controller/nginx/agent/grpc/grpc.go +++ b/internal/controller/nginx/agent/grpc/grpc.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/filewatcher" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/interceptor" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/filewatcher" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/interceptor" ) const ( diff --git a/internal/controller/nginx/agent/grpc/grpcfakes/fake_connections_tracker.go b/internal/controller/nginx/agent/grpc/grpcfakes/fake_connections_tracker.go index b7f242f22f..cce207072d 100644 --- a/internal/controller/nginx/agent/grpc/grpcfakes/fake_connections_tracker.go +++ b/internal/controller/nginx/agent/grpc/grpcfakes/fake_connections_tracker.go @@ -4,7 +4,7 @@ package grpcfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc" ) type FakeConnectionsTracker struct { diff --git a/internal/controller/nginx/agent/grpc/interceptor/interceptor.go b/internal/controller/nginx/agent/grpc/interceptor/interceptor.go index 634b1502c0..0a32234400 100644 --- a/internal/controller/nginx/agent/grpc/interceptor/interceptor.go +++ b/internal/controller/nginx/agent/grpc/interceptor/interceptor.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/fields" "sigs.k8s.io/controller-runtime/pkg/client" - grpcContext "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/context" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + grpcContext "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/context" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" ) const ( diff --git a/internal/controller/nginx/agent/grpc/interceptor/interceptor_test.go b/internal/controller/nginx/agent/grpc/interceptor/interceptor_test.go index 04eda6ad50..d334c9a465 100644 --- a/internal/controller/nginx/agent/grpc/interceptor/interceptor_test.go +++ b/internal/controller/nginx/agent/grpc/interceptor/interceptor_test.go @@ -18,7 +18,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" ) type mockServerStream struct { diff --git a/internal/controller/nginx/agent/grpc/messenger/messenger_test.go b/internal/controller/nginx/agent/grpc/messenger/messenger_test.go index f7e5cc6962..aafe3b3f12 100644 --- a/internal/controller/nginx/agent/grpc/messenger/messenger_test.go +++ b/internal/controller/nginx/agent/grpc/messenger/messenger_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" "google.golang.org/grpc" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/messenger" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/messenger" ) type mockServer struct { diff --git a/internal/controller/nginx/agent/grpc/messenger/messengerfakes/fake_messenger.go b/internal/controller/nginx/agent/grpc/messenger/messengerfakes/fake_messenger.go index 183ab792ae..024f745d91 100644 --- a/internal/controller/nginx/agent/grpc/messenger/messengerfakes/fake_messenger.go +++ b/internal/controller/nginx/agent/grpc/messenger/messengerfakes/fake_messenger.go @@ -6,7 +6,7 @@ import ( "sync" v1 "github.com/nginx/agent/v3/api/grpc/mpi/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/messenger" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/messenger" ) type FakeMessenger struct { diff --git a/internal/controller/nginx/config/base_http_config.go b/internal/controller/nginx/config/base_http_config.go index e4722c1b55..ece5a30999 100644 --- a/internal/controller/nginx/config/base_http_config.go +++ b/internal/controller/nginx/config/base_http_config.go @@ -3,9 +3,9 @@ package config import ( gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var baseHTTPTemplate = gotemplate.Must(gotemplate.New("baseHttp").Parse(baseHTTPTemplateText)) diff --git a/internal/controller/nginx/config/base_http_config_test.go b/internal/controller/nginx/config/base_http_config_test.go index 4932fdad89..c93d5628b3 100644 --- a/internal/controller/nginx/config/base_http_config_test.go +++ b/internal/controller/nginx/config/base_http_config_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) func TestExecuteBaseHttp_HTTP2(t *testing.T) { diff --git a/internal/controller/nginx/config/configfakes/fake_generator.go b/internal/controller/nginx/config/configfakes/fake_generator.go index 7dbd771284..d7b57964a1 100644 --- a/internal/controller/nginx/config/configfakes/fake_generator.go +++ b/internal/controller/nginx/config/configfakes/fake_generator.go @@ -4,9 +4,9 @@ package configfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) type FakeGenerator struct { diff --git a/internal/controller/nginx/config/generator.go b/internal/controller/nginx/config/generator.go index 992db73067..290185c315 100644 --- a/internal/controller/nginx/config/generator.go +++ b/internal/controller/nginx/config/generator.go @@ -9,15 +9,15 @@ import ( pb "github.com/nginx/agent/v3/api/grpc/mpi/v1" filesHelper "github.com/nginx/agent/v3/pkg/files" - ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/clientsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/observability" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" + ngfConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" ) //go:generate go tool counterfeiter -generate diff --git a/internal/controller/nginx/config/generator_test.go b/internal/controller/nginx/config/generator_test.go index d7b935caee..1340834d03 100644 --- a/internal/controller/nginx/config/generator_test.go +++ b/internal/controller/nginx/config/generator_test.go @@ -10,14 +10,14 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestGenerate(t *testing.T) { diff --git a/internal/controller/nginx/config/http/config.go b/internal/controller/nginx/config/http/config.go index 2ae51a6bd6..8f06dee04d 100644 --- a/internal/controller/nginx/config/http/config.go +++ b/internal/controller/nginx/config/http/config.go @@ -1,7 +1,7 @@ package http import ( - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" ) const ( diff --git a/internal/controller/nginx/config/includes.go b/internal/controller/nginx/config/includes.go index 0bcd2f8ce2..911cc75185 100644 --- a/internal/controller/nginx/config/includes.go +++ b/internal/controller/nginx/config/includes.go @@ -1,10 +1,10 @@ package config import ( - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) // createIncludeExecuteResultsFromServers creates a list of executeResults -- or NGINX config files -- from all diff --git a/internal/controller/nginx/config/includes_test.go b/internal/controller/nginx/config/includes_test.go index b5a33de5cf..3566e8c8ee 100644 --- a/internal/controller/nginx/config/includes_test.go +++ b/internal/controller/nginx/config/includes_test.go @@ -5,10 +5,10 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) func TestCreateIncludeExecuteResultsFromServers(t *testing.T) { diff --git a/internal/controller/nginx/config/main_config.go b/internal/controller/nginx/config/main_config.go index 142dc9ce41..fa10606f22 100644 --- a/internal/controller/nginx/config/main_config.go +++ b/internal/controller/nginx/config/main_config.go @@ -6,12 +6,12 @@ import ( pb "github.com/nginx/agent/v3/api/grpc/mpi/v1" filesHelper "github.com/nginx/agent/v3/pkg/files" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/nginx/config/main_config_test.go b/internal/controller/nginx/config/main_config_test.go index 2d7270c8ad..dc8861da15 100644 --- a/internal/controller/nginx/config/main_config_test.go +++ b/internal/controller/nginx/config/main_config_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) func TestExecuteMainConfig_Telemetry(t *testing.T) { diff --git a/internal/controller/nginx/config/maps.go b/internal/controller/nginx/config/maps.go index 93d06995d5..5a5e5ff189 100644 --- a/internal/controller/nginx/config/maps.go +++ b/internal/controller/nginx/config/maps.go @@ -4,9 +4,9 @@ import ( "strings" gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var mapsTemplate = gotemplate.Must(gotemplate.New("maps").Parse(mapsTemplateText)) diff --git a/internal/controller/nginx/config/maps_test.go b/internal/controller/nginx/config/maps_test.go index bfa1fd9b57..d133882d7b 100644 --- a/internal/controller/nginx/config/maps_test.go +++ b/internal/controller/nginx/config/maps_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" ) func TestExecuteMaps(t *testing.T) { diff --git a/internal/controller/nginx/config/plus_api.go b/internal/controller/nginx/config/plus_api.go index 4d37bf52bc..1571d148be 100644 --- a/internal/controller/nginx/config/plus_api.go +++ b/internal/controller/nginx/config/plus_api.go @@ -3,8 +3,8 @@ package config import ( gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var plusAPITemplate = gotemplate.Must(gotemplate.New("plusAPI").Parse(plusAPITemplateText)) diff --git a/internal/controller/nginx/config/plus_api_test.go b/internal/controller/nginx/config/plus_api_test.go index 66dbb592f7..b4f654b78b 100644 --- a/internal/controller/nginx/config/plus_api_test.go +++ b/internal/controller/nginx/config/plus_api_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) func TestExecutePlusAPI(t *testing.T) { diff --git a/internal/controller/nginx/config/policies/clientsettings/generator.go b/internal/controller/nginx/config/policies/clientsettings/generator.go index 79bcd61fe8..b895f3104a 100644 --- a/internal/controller/nginx/config/policies/clientsettings/generator.go +++ b/internal/controller/nginx/config/policies/clientsettings/generator.go @@ -4,10 +4,10 @@ import ( "fmt" "text/template" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var tmpl = template.Must(template.New("client settings policy").Parse(clientSettingsTemplate)) diff --git a/internal/controller/nginx/config/policies/clientsettings/generator_test.go b/internal/controller/nginx/config/policies/clientsettings/generator_test.go index f07a4f1ae6..472a0a2d15 100644 --- a/internal/controller/nginx/config/policies/clientsettings/generator_test.go +++ b/internal/controller/nginx/config/policies/clientsettings/generator_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/gomega" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/clientsettings" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestGenerate(t *testing.T) { diff --git a/internal/controller/nginx/config/policies/clientsettings/validator.go b/internal/controller/nginx/config/policies/clientsettings/validator.go index e0bcaa849b..c4d83864e7 100644 --- a/internal/controller/nginx/config/policies/clientsettings/validator.go +++ b/internal/controller/nginx/config/policies/clientsettings/validator.go @@ -4,12 +4,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Validator validates a ClientSettingsPolicy. diff --git a/internal/controller/nginx/config/policies/clientsettings/validator_test.go b/internal/controller/nginx/config/policies/clientsettings/validator_test.go index 4a8a5348e7..3b154faf81 100644 --- a/internal/controller/nginx/config/policies/clientsettings/validator_test.go +++ b/internal/controller/nginx/config/policies/clientsettings/validator_test.go @@ -8,13 +8,13 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/clientsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) type policyModFunc func(policy *ngfAPI.ClientSettingsPolicy) *ngfAPI.ClientSettingsPolicy diff --git a/internal/controller/nginx/config/policies/generator.go b/internal/controller/nginx/config/policies/generator.go index e3b2c27419..5a25df37dc 100644 --- a/internal/controller/nginx/config/policies/generator.go +++ b/internal/controller/nginx/config/policies/generator.go @@ -1,7 +1,7 @@ package policies import ( - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" ) // Generator defines an interface for a policy to implement its appropriate generator functions. diff --git a/internal/controller/nginx/config/policies/generator_test.go b/internal/controller/nginx/config/policies/generator_test.go index 9f24e84661..492189dcb8 100644 --- a/internal/controller/nginx/config/policies/generator_test.go +++ b/internal/controller/nginx/config/policies/generator_test.go @@ -4,9 +4,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" ) var _ = Describe("Policy Generator", func() { diff --git a/internal/controller/nginx/config/policies/observability/generator.go b/internal/controller/nginx/config/policies/observability/generator.go index 625bd35d71..328dcb135f 100644 --- a/internal/controller/nginx/config/policies/observability/generator.go +++ b/internal/controller/nginx/config/policies/observability/generator.go @@ -4,11 +4,11 @@ import ( "fmt" "text/template" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/nginx/config/policies/observability/generator_test.go b/internal/controller/nginx/config/policies/observability/generator_test.go index dc68039ab9..ab3acad08b 100644 --- a/internal/controller/nginx/config/policies/observability/generator_test.go +++ b/internal/controller/nginx/config/policies/observability/generator_test.go @@ -6,13 +6,13 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/observability" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestGenerate(t *testing.T) { diff --git a/internal/controller/nginx/config/policies/observability/validator.go b/internal/controller/nginx/config/policies/observability/validator.go index 4f2b4daacf..43d47dce3e 100644 --- a/internal/controller/nginx/config/policies/observability/validator.go +++ b/internal/controller/nginx/config/policies/observability/validator.go @@ -4,12 +4,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Validator validates an ObservabilityPolicy. diff --git a/internal/controller/nginx/config/policies/observability/validator_test.go b/internal/controller/nginx/config/policies/observability/validator_test.go index 2a9ba07d84..7cc283df3c 100644 --- a/internal/controller/nginx/config/policies/observability/validator_test.go +++ b/internal/controller/nginx/config/policies/observability/validator_test.go @@ -8,15 +8,15 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/observability" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) type policyModFunc func(policy *ngfAPIv1alpha2.ObservabilityPolicy) *ngfAPIv1alpha2.ObservabilityPolicy diff --git a/internal/controller/nginx/config/policies/policiesfakes/fake_generator.go b/internal/controller/nginx/config/policies/policiesfakes/fake_generator.go index 12dd9f5ac3..e9e1689f3d 100644 --- a/internal/controller/nginx/config/policies/policiesfakes/fake_generator.go +++ b/internal/controller/nginx/config/policies/policiesfakes/fake_generator.go @@ -4,8 +4,8 @@ package policiesfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" ) type FakeGenerator struct { diff --git a/internal/controller/nginx/config/policies/policiesfakes/fake_policy.go b/internal/controller/nginx/config/policies/policiesfakes/fake_policy.go index c02aa764b3..5aa0c8dda9 100644 --- a/internal/controller/nginx/config/policies/policiesfakes/fake_policy.go +++ b/internal/controller/nginx/config/policies/policiesfakes/fake_policy.go @@ -4,7 +4,7 @@ package policiesfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/controller/nginx/config/policies/policiesfakes/fake_validator.go b/internal/controller/nginx/config/policies/policiesfakes/fake_validator.go index 165c94474e..9389e6ccff 100644 --- a/internal/controller/nginx/config/policies/policiesfakes/fake_validator.go +++ b/internal/controller/nginx/config/policies/policiesfakes/fake_validator.go @@ -4,8 +4,8 @@ package policiesfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" ) type FakeValidator struct { diff --git a/internal/controller/nginx/config/policies/upstreamsettings/processor.go b/internal/controller/nginx/config/policies/upstreamsettings/processor.go index 61d69924e5..1a646a45e1 100644 --- a/internal/controller/nginx/config/policies/upstreamsettings/processor.go +++ b/internal/controller/nginx/config/policies/upstreamsettings/processor.go @@ -1,9 +1,9 @@ package upstreamsettings import ( - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" ) // Processor processes UpstreamSettingsPolicies. diff --git a/internal/controller/nginx/config/policies/upstreamsettings/processor_test.go b/internal/controller/nginx/config/policies/upstreamsettings/processor_test.go index 2b568ae7cf..a67c1df186 100644 --- a/internal/controller/nginx/config/policies/upstreamsettings/processor_test.go +++ b/internal/controller/nginx/config/policies/upstreamsettings/processor_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestProcess(t *testing.T) { diff --git a/internal/controller/nginx/config/policies/upstreamsettings/validator.go b/internal/controller/nginx/config/policies/upstreamsettings/validator.go index f490135448..9b54fb48e2 100644 --- a/internal/controller/nginx/config/policies/upstreamsettings/validator.go +++ b/internal/controller/nginx/config/policies/upstreamsettings/validator.go @@ -4,12 +4,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Validator validates an UpstreamSettingsPolicy. diff --git a/internal/controller/nginx/config/policies/upstreamsettings/validator_test.go b/internal/controller/nginx/config/policies/upstreamsettings/validator_test.go index c8ba95d75b..6ad3d72ca7 100644 --- a/internal/controller/nginx/config/policies/upstreamsettings/validator_test.go +++ b/internal/controller/nginx/config/policies/upstreamsettings/validator_test.go @@ -7,13 +7,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) type policyModFunc func(policy *ngfAPI.UpstreamSettingsPolicy) *ngfAPI.UpstreamSettingsPolicy diff --git a/internal/controller/nginx/config/policies/validator.go b/internal/controller/nginx/config/policies/validator.go index d7597e67b9..5182c9781a 100644 --- a/internal/controller/nginx/config/policies/validator.go +++ b/internal/controller/nginx/config/policies/validator.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Validator validates an NGF Policy. diff --git a/internal/controller/nginx/config/policies/validator_test.go b/internal/controller/nginx/config/policies/validator_test.go index d32df91666..f30b7e7790 100644 --- a/internal/controller/nginx/config/policies/validator_test.go +++ b/internal/controller/nginx/config/policies/validator_test.go @@ -6,9 +6,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - policies "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - policiesfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" + policies "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + policiesfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" ) var _ = Describe("Policy CompositeValidator", func() { diff --git a/internal/controller/nginx/config/servers.go b/internal/controller/nginx/config/servers.go index ec37ed764e..0ae71691a1 100644 --- a/internal/controller/nginx/config/servers.go +++ b/internal/controller/nginx/config/servers.go @@ -9,11 +9,11 @@ import ( "strings" gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var serversTemplate = gotemplate.Must(gotemplate.New("servers").Parse(serversTemplateText)) diff --git a/internal/controller/nginx/config/servers_test.go b/internal/controller/nginx/config/servers_test.go index b1313338ca..6cb90a9415 100644 --- a/internal/controller/nginx/config/servers_test.go +++ b/internal/controller/nginx/config/servers_test.go @@ -10,12 +10,12 @@ import ( "github.com/onsi/gomega/format" "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/nginx/config/split_clients.go b/internal/controller/nginx/config/split_clients.go index 983ddc71d5..2c9febf6bc 100644 --- a/internal/controller/nginx/config/split_clients.go +++ b/internal/controller/nginx/config/split_clients.go @@ -6,9 +6,9 @@ import ( "strings" gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var splitClientsTemplate = gotemplate.Must(gotemplate.New("split_clients").Parse(splitClientsTemplateText)) diff --git a/internal/controller/nginx/config/split_clients_test.go b/internal/controller/nginx/config/split_clients_test.go index 63bbbc2896..29f54986f2 100644 --- a/internal/controller/nginx/config/split_clients_test.go +++ b/internal/controller/nginx/config/split_clients_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestExecuteSplitClients(t *testing.T) { diff --git a/internal/controller/nginx/config/stream/config.go b/internal/controller/nginx/config/stream/config.go index 2f9ce82e1c..21a42c505d 100644 --- a/internal/controller/nginx/config/stream/config.go +++ b/internal/controller/nginx/config/stream/config.go @@ -1,6 +1,6 @@ package stream -import "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" +import "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" // Server holds all configuration for a stream server. type Server struct { diff --git a/internal/controller/nginx/config/stream_servers.go b/internal/controller/nginx/config/stream_servers.go index 61f7027ba4..52c32e19f6 100644 --- a/internal/controller/nginx/config/stream_servers.go +++ b/internal/controller/nginx/config/stream_servers.go @@ -4,10 +4,10 @@ import ( "fmt" gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/shared" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/stream" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var streamServersTemplate = gotemplate.Must(gotemplate.New("streamServers").Parse(streamServersTemplateText)) diff --git a/internal/controller/nginx/config/stream_servers_test.go b/internal/controller/nginx/config/stream_servers_test.go index 4ceb264d36..a195cc2007 100644 --- a/internal/controller/nginx/config/stream_servers_test.go +++ b/internal/controller/nginx/config/stream_servers_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/stream" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" ) func TestExecuteStreamServers(t *testing.T) { diff --git a/internal/controller/nginx/config/telemetry.go b/internal/controller/nginx/config/telemetry.go index 9cd19b52ec..43657feea9 100644 --- a/internal/controller/nginx/config/telemetry.go +++ b/internal/controller/nginx/config/telemetry.go @@ -3,8 +3,8 @@ package config import ( gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var otelTemplate = gotemplate.Must(gotemplate.New("otel").Parse(otelTemplateText)) diff --git a/internal/controller/nginx/config/telemetry_test.go b/internal/controller/nginx/config/telemetry_test.go index 6338ad15c1..92fd211924 100644 --- a/internal/controller/nginx/config/telemetry_test.go +++ b/internal/controller/nginx/config/telemetry_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" ) func TestExecuteTelemetry(t *testing.T) { diff --git a/internal/controller/nginx/config/upstreams.go b/internal/controller/nginx/config/upstreams.go index c87eb0a8c1..5a792606bb 100644 --- a/internal/controller/nginx/config/upstreams.go +++ b/internal/controller/nginx/config/upstreams.go @@ -4,12 +4,12 @@ import ( "fmt" gotemplate "text/template" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/stream" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/nginx/config/upstreams_test.go b/internal/controller/nginx/config/upstreams_test.go index dbd00aad53..2dd94cb4ea 100644 --- a/internal/controller/nginx/config/upstreams_test.go +++ b/internal/controller/nginx/config/upstreams_test.go @@ -6,15 +6,15 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/stream" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestExecuteUpstreams(t *testing.T) { diff --git a/internal/controller/nginx/config/validation/http_njs_match.go b/internal/controller/nginx/config/validation/http_njs_match.go index 2c1a2b0ce0..12674081c2 100644 --- a/internal/controller/nginx/config/validation/http_njs_match.go +++ b/internal/controller/nginx/config/validation/http_njs_match.go @@ -7,7 +7,7 @@ import ( k8svalidation "k8s.io/apimachinery/pkg/util/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config" ) // HTTPNJSMatchValidator validates values used for matching a request. diff --git a/internal/controller/nginx/config/validation/http_validator.go b/internal/controller/nginx/config/validation/http_validator.go index 1d1bc84e44..4837113458 100644 --- a/internal/controller/nginx/config/validation/http_validator.go +++ b/internal/controller/nginx/config/validation/http_validator.go @@ -1,7 +1,7 @@ package validation import ( - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" ) // HTTPValidator validates values that will propagate into the NGINX configuration http context. diff --git a/internal/controller/provisioner/eventloop.go b/internal/controller/provisioner/eventloop.go index 7b85a47780..7e076e21db 100644 --- a/internal/controller/provisioner/eventloop.go +++ b/internal/controller/provisioner/eventloop.go @@ -15,11 +15,11 @@ import ( k8spredicate "sigs.k8s.io/controller-runtime/pkg/predicate" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) func newEventLoop( diff --git a/internal/controller/provisioner/handler.go b/internal/controller/provisioner/handler.go index c5f3f2f4a9..037954575f 100644 --- a/internal/controller/provisioner/handler.go +++ b/internal/controller/provisioner/handler.go @@ -17,9 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) // eventHandler ensures each Gateway for the specific GatewayClass has a corresponding Deployment diff --git a/internal/controller/provisioner/handler_test.go b/internal/controller/provisioner/handler_test.go index 4a14008a41..45fd0cc435 100644 --- a/internal/controller/provisioner/handler_test.go +++ b/internal/controller/provisioner/handler_test.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) func TestHandleEventBatch_Upsert(t *testing.T) { diff --git a/internal/controller/provisioner/objects.go b/internal/controller/provisioner/objects.go index 8a9d39c079..47cd221256 100644 --- a/internal/controller/provisioner/objects.go +++ b/internal/controller/provisioner/objects.go @@ -21,12 +21,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) const ( diff --git a/internal/controller/provisioner/objects_test.go b/internal/controller/provisioner/objects_test.go index c32310b474..247e20ba0d 100644 --- a/internal/controller/provisioner/objects_test.go +++ b/internal/controller/provisioner/objects_test.go @@ -17,12 +17,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestBuildNginxResourceObjects(t *testing.T) { diff --git a/internal/controller/provisioner/openshift/openshiftfakes/fake_apichecker.go b/internal/controller/provisioner/openshift/openshiftfakes/fake_apichecker.go index 84f73ed3b9..6d18d23ca8 100644 --- a/internal/controller/provisioner/openshift/openshiftfakes/fake_apichecker.go +++ b/internal/controller/provisioner/openshift/openshiftfakes/fake_apichecker.go @@ -4,7 +4,7 @@ package openshiftfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner/openshift" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner/openshift" "k8s.io/client-go/rest" ) diff --git a/internal/controller/provisioner/provisioner.go b/internal/controller/provisioner/provisioner.go index 6c60cf1384..7cfb91f355 100644 --- a/internal/controller/provisioner/provisioner.go +++ b/internal/controller/provisioner/provisioner.go @@ -23,13 +23,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner/openshift" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner/openshift" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) //go:generate go tool counterfeiter -generate diff --git a/internal/controller/provisioner/provisioner_test.go b/internal/controller/provisioner/provisioner_test.go index 9102a8193f..07de8ff56c 100644 --- a/internal/controller/provisioner/provisioner_test.go +++ b/internal/controller/provisioner/provisioner_test.go @@ -19,13 +19,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/agentfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner/openshift/openshiftfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/agentfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner/openshift/openshiftfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) const ( diff --git a/internal/controller/provisioner/provisionerfakes/fake_provisioner.go b/internal/controller/provisioner/provisionerfakes/fake_provisioner.go index a02dfb04c2..b6ea1a727b 100644 --- a/internal/controller/provisioner/provisionerfakes/fake_provisioner.go +++ b/internal/controller/provisioner/provisionerfakes/fake_provisioner.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" ) type FakeProvisioner struct { diff --git a/internal/controller/provisioner/store.go b/internal/controller/provisioner/store.go index d089a38f9b..2eb0d154cf 100644 --- a/internal/controller/provisioner/store.go +++ b/internal/controller/provisioner/store.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" ) // NginxResources are all of the NGINX resources deployed in relation to a Gateway. diff --git a/internal/controller/provisioner/store_test.go b/internal/controller/provisioner/store_test.go index a7ed469e98..06b1a33c50 100644 --- a/internal/controller/provisioner/store_test.go +++ b/internal/controller/provisioner/store_test.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestNewStore(t *testing.T) { diff --git a/internal/controller/state/change_processor.go b/internal/controller/state/change_processor.go index a3b43979c5..a89d956198 100644 --- a/internal/controller/state/change_processor.go +++ b/internal/controller/state/change_processor.go @@ -16,13 +16,13 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) //go:generate go tool counterfeiter -generate diff --git a/internal/controller/state/change_processor_test.go b/internal/controller/state/change_processor_test.go index ca5979324a..2d17e6f6e9 100644 --- a/internal/controller/state/change_processor_test.go +++ b/internal/controller/state/change_processor_test.go @@ -19,17 +19,17 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) const ( diff --git a/internal/controller/state/changed_predicate.go b/internal/controller/state/changed_predicate.go index 461cc6ff80..5fcfa3842f 100644 --- a/internal/controller/state/changed_predicate.go +++ b/internal/controller/state/changed_predicate.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // stateChangedPredicate determines whether upsert and delete events constitute a change in state. diff --git a/internal/controller/state/changed_predicate_test.go b/internal/controller/state/changed_predicate_test.go index 27aae1bfac..392e8eb478 100644 --- a/internal/controller/state/changed_predicate_test.go +++ b/internal/controller/state/changed_predicate_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) func TestFuncPredicate(t *testing.T) { diff --git a/internal/controller/state/conditions/conditions.go b/internal/controller/state/conditions/conditions.go index 5098f0522d..bdebb678da 100644 --- a/internal/controller/state/conditions/conditions.go +++ b/internal/controller/state/conditions/conditions.go @@ -7,7 +7,7 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" ) const ( diff --git a/internal/controller/state/dataplane/configuration.go b/internal/controller/state/dataplane/configuration.go index 24ff197e55..b2f24e2aac 100644 --- a/internal/controller/state/dataplane/configuration.go +++ b/internal/controller/state/dataplane/configuration.go @@ -13,12 +13,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) const ( diff --git a/internal/controller/state/dataplane/configuration_test.go b/internal/controller/state/dataplane/configuration_test.go index b374493710..a95ef8f515 100644 --- a/internal/controller/state/dataplane/configuration_test.go +++ b/internal/controller/state/dataplane/configuration_test.go @@ -19,16 +19,16 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver/resolverfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver/resolverfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) var defaultBaseHTTPConfig = BaseHTTPConfig{ diff --git a/internal/controller/state/dataplane/convert.go b/internal/controller/state/dataplane/convert.go index bff41f1b6c..eb0a10c7da 100644 --- a/internal/controller/state/dataplane/convert.go +++ b/internal/controller/state/dataplane/convert.go @@ -7,10 +7,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/mirror" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/mirror" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func convertMatch(m v1.HTTPRouteMatch) Match { diff --git a/internal/controller/state/dataplane/convert_test.go b/internal/controller/state/dataplane/convert_test.go index 3b5ebcfa9b..80ab70b2fe 100644 --- a/internal/controller/state/dataplane/convert_test.go +++ b/internal/controller/state/dataplane/convert_test.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestConvertMatch(t *testing.T) { diff --git a/internal/controller/state/dataplane/sort.go b/internal/controller/state/dataplane/sort.go index baad2e800d..fbc788e835 100644 --- a/internal/controller/state/dataplane/sort.go +++ b/internal/controller/state/dataplane/sort.go @@ -3,7 +3,7 @@ package dataplane import ( "sort" - ngfsort "github.com/nginx/nginx-gateway-fabric/internal/controller/sort" + ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort" ) func sortMatchRules(matchRules []MatchRule) { diff --git a/internal/controller/state/dataplane/sort_test.go b/internal/controller/state/dataplane/sort_test.go index dd578df703..6c58ac0238 100644 --- a/internal/controller/state/dataplane/sort_test.go +++ b/internal/controller/state/dataplane/sort_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestSort(t *testing.T) { diff --git a/internal/controller/state/dataplane/types.go b/internal/controller/state/dataplane/types.go index 646eaa924c..79b3f42d6f 100644 --- a/internal/controller/state/dataplane/types.go +++ b/internal/controller/state/dataplane/types.go @@ -6,9 +6,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" ) // PathType is the type of the path in a PathRule. diff --git a/internal/controller/state/graph/backend_refs.go b/internal/controller/state/graph/backend_refs.go index 1f7fce6c37..8ae81bcfee 100644 --- a/internal/controller/state/graph/backend_refs.go +++ b/internal/controller/state/graph/backend_refs.go @@ -11,10 +11,10 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/sort" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) const ( diff --git a/internal/controller/state/graph/backend_refs_test.go b/internal/controller/state/graph/backend_refs_test.go index 751e8a5ddd..b71f997c5d 100644 --- a/internal/controller/state/graph/backend_refs_test.go +++ b/internal/controller/state/graph/backend_refs_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func getNormalRef() gatewayv1.BackendRef { diff --git a/internal/controller/state/graph/backend_tls_policy.go b/internal/controller/state/graph/backend_tls_policy.go index 2d8155c7e9..a0e4eb67d3 100644 --- a/internal/controller/state/graph/backend_tls_policy.go +++ b/internal/controller/state/graph/backend_tls_policy.go @@ -9,8 +9,8 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) type BackendTLSPolicy struct { diff --git a/internal/controller/state/graph/backend_tls_policy_test.go b/internal/controller/state/graph/backend_tls_policy_test.go index 12f0d7264f..0adca7ba67 100644 --- a/internal/controller/state/graph/backend_tls_policy_test.go +++ b/internal/controller/state/graph/backend_tls_policy_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestProcessBackendTLSPoliciesEmpty(t *testing.T) { diff --git a/internal/controller/state/graph/common_filter.go b/internal/controller/state/graph/common_filter.go index e1fe43a372..ac5a25efe6 100644 --- a/internal/controller/state/graph/common_filter.go +++ b/internal/controller/state/graph/common_filter.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" ) // RouteRuleFilters holds the Filters for a RouteRule. diff --git a/internal/controller/state/graph/common_filter_test.go b/internal/controller/state/graph/common_filter_test.go index 33c28e029a..522ba03f51 100644 --- a/internal/controller/state/graph/common_filter_test.go +++ b/internal/controller/state/graph/common_filter_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestValidateFilter(t *testing.T) { diff --git a/internal/controller/state/graph/extension_ref_filter.go b/internal/controller/state/graph/extension_ref_filter.go index b758542465..d9857b848a 100644 --- a/internal/controller/state/graph/extension_ref_filter.go +++ b/internal/controller/state/graph/extension_ref_filter.go @@ -4,8 +4,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // ExtensionRefFilter are NGF-specific extensions to the "filter" behavior. diff --git a/internal/controller/state/graph/extension_ref_filter_test.go b/internal/controller/state/graph/extension_ref_filter_test.go index ae485a664f..88364f22a5 100644 --- a/internal/controller/state/graph/extension_ref_filter_test.go +++ b/internal/controller/state/graph/extension_ref_filter_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestValidateExtensionRefFilter(t *testing.T) { diff --git a/internal/controller/state/graph/gateway.go b/internal/controller/state/graph/gateway.go index e7129da55c..f9e955371c 100644 --- a/internal/controller/state/graph/gateway.go +++ b/internal/controller/state/graph/gateway.go @@ -6,10 +6,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Gateway represents a Gateway resource. diff --git a/internal/controller/state/graph/gateway_listener.go b/internal/controller/state/graph/gateway_listener.go index 1536503392..d8524c93a8 100644 --- a/internal/controller/state/graph/gateway_listener.go +++ b/internal/controller/state/graph/gateway_listener.go @@ -12,9 +12,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Listener represents a Listener of the Gateway resource. diff --git a/internal/controller/state/graph/gateway_listener_test.go b/internal/controller/state/graph/gateway_listener_test.go index 4d0d83def1..0b75ddb7c0 100644 --- a/internal/controller/state/graph/gateway_listener_test.go +++ b/internal/controller/state/graph/gateway_listener_test.go @@ -8,9 +8,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestValidateHTTPListener(t *testing.T) { diff --git a/internal/controller/state/graph/gateway_test.go b/internal/controller/state/graph/gateway_test.go index f37349bee1..fe048193fd 100644 --- a/internal/controller/state/graph/gateway_test.go +++ b/internal/controller/state/graph/gateway_test.go @@ -13,12 +13,12 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestProcessGateways(t *testing.T) { diff --git a/internal/controller/state/graph/gatewayclass.go b/internal/controller/state/graph/gatewayclass.go index b464825a2e..e396395441 100644 --- a/internal/controller/state/graph/gatewayclass.go +++ b/internal/controller/state/graph/gatewayclass.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) const ( diff --git a/internal/controller/state/graph/gatewayclass_test.go b/internal/controller/state/graph/gatewayclass_test.go index 131bc51ea9..b7b01f9d15 100644 --- a/internal/controller/state/graph/gatewayclass_test.go +++ b/internal/controller/state/graph/gatewayclass_test.go @@ -11,10 +11,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestProcessGatewayClasses(t *testing.T) { diff --git a/internal/controller/state/graph/graph.go b/internal/controller/state/graph/graph.go index a20615259e..52cb047ae2 100644 --- a/internal/controller/state/graph/graph.go +++ b/internal/controller/state/graph/graph.go @@ -13,13 +13,13 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // ClusterState includes cluster resources necessary to build the Graph. diff --git a/internal/controller/state/graph/graph_test.go b/internal/controller/state/graph/graph_test.go index e871b3c4ae..8d51926a26 100644 --- a/internal/controller/state/graph/graph_test.go +++ b/internal/controller/state/graph/graph_test.go @@ -17,16 +17,16 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestBuildGraph(t *testing.T) { diff --git a/internal/controller/state/graph/grpcroute.go b/internal/controller/state/graph/grpcroute.go index c8ae71f38e..68b3a6ed06 100644 --- a/internal/controller/state/graph/grpcroute.go +++ b/internal/controller/state/graph/grpcroute.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/mirror" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/mirror" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func buildGRPCRoute( diff --git a/internal/controller/state/graph/grpcroute_test.go b/internal/controller/state/graph/grpcroute_test.go index 698c3faa9a..d5e2fa16de 100644 --- a/internal/controller/state/graph/grpcroute_test.go +++ b/internal/controller/state/graph/grpcroute_test.go @@ -10,12 +10,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/mirror" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/mirror" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func createGRPCMethodMatch(serviceName, methodName, methodType string) v1.GRPCRouteRule { diff --git a/internal/controller/state/graph/httproute.go b/internal/controller/state/graph/httproute.go index dc96830c20..48415d0573 100644 --- a/internal/controller/state/graph/httproute.go +++ b/internal/controller/state/graph/httproute.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/mirror" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/mirror" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/state/graph/httproute_test.go b/internal/controller/state/graph/httproute_test.go index d069980026..307df225fc 100644 --- a/internal/controller/state/graph/httproute_test.go +++ b/internal/controller/state/graph/httproute_test.go @@ -11,12 +11,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/mirror" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/mirror" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) const ( diff --git a/internal/controller/state/graph/multiple_gateways_test.go b/internal/controller/state/graph/multiple_gateways_test.go index 415a5851ab..a17f5c95da 100644 --- a/internal/controller/state/graph/multiple_gateways_test.go +++ b/internal/controller/state/graph/multiple_gateways_test.go @@ -12,12 +12,12 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) const ( diff --git a/internal/controller/state/graph/nginxproxy.go b/internal/controller/state/graph/nginxproxy.go index 77c50934ef..1e4afbc9dd 100644 --- a/internal/controller/state/graph/nginxproxy.go +++ b/internal/controller/state/graph/nginxproxy.go @@ -11,10 +11,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // NginxProxy represents the NginxProxy resource. diff --git a/internal/controller/state/graph/nginxproxy_test.go b/internal/controller/state/graph/nginxproxy_test.go index c8713ea116..d868b9960d 100644 --- a/internal/controller/state/graph/nginxproxy_test.go +++ b/internal/controller/state/graph/nginxproxy_test.go @@ -10,12 +10,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation/validationfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation/validationfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func createValidValidator() *validationfakes.FakeGenericValidator { diff --git a/internal/controller/state/graph/policies.go b/internal/controller/state/graph/policies.go index 509e41f2a1..b5fbc0834b 100644 --- a/internal/controller/state/graph/policies.go +++ b/internal/controller/state/graph/policies.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - ngfsort "github.com/nginx/nginx-gateway-fabric/internal/controller/sort" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // Policy represents an NGF Policy. diff --git a/internal/controller/state/graph/policies_test.go b/internal/controller/state/graph/policies_test.go index 18be2262e8..6108420042 100644 --- a/internal/controller/state/graph/policies_test.go +++ b/internal/controller/state/graph/policies_test.go @@ -11,13 +11,13 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) var testNs = "test" diff --git a/internal/controller/state/graph/policy_ancestor.go b/internal/controller/state/graph/policy_ancestor.go index 0e0b1f49b1..698b887511 100644 --- a/internal/controller/state/graph/policy_ancestor.go +++ b/internal/controller/state/graph/policy_ancestor.go @@ -5,7 +5,7 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) const maxAncestors = 16 diff --git a/internal/controller/state/graph/policy_ancestor_test.go b/internal/controller/state/graph/policy_ancestor_test.go index d3a1905b0b..49903cf0df 100644 --- a/internal/controller/state/graph/policy_ancestor_test.go +++ b/internal/controller/state/graph/policy_ancestor_test.go @@ -8,8 +8,8 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestBackendTLSPolicyAncestorsFull(t *testing.T) { diff --git a/internal/controller/state/graph/reference_grant.go b/internal/controller/state/graph/reference_grant.go index 084e06fa27..b827d47024 100644 --- a/internal/controller/state/graph/reference_grant.go +++ b/internal/controller/state/graph/reference_grant.go @@ -5,7 +5,7 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // referenceGrantResolver resolves references from one resource to another. diff --git a/internal/controller/state/graph/reference_grant_test.go b/internal/controller/state/graph/reference_grant_test.go index b3f5b7ec8f..21fee614e1 100644 --- a/internal/controller/state/graph/reference_grant_test.go +++ b/internal/controller/state/graph/reference_grant_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestReferenceGrantResolver(t *testing.T) { diff --git a/internal/controller/state/graph/route_common.go b/internal/controller/state/graph/route_common.go index 0e5f760be1..d097e72cbb 100644 --- a/internal/controller/state/graph/route_common.go +++ b/internal/controller/state/graph/route_common.go @@ -13,10 +13,10 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" v1alpha "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfSort "github.com/nginx/nginx-gateway-fabric/internal/controller/sort" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfSort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) const wildcardHostname = "~^" diff --git a/internal/controller/state/graph/route_common_test.go b/internal/controller/state/graph/route_common_test.go index 1f8152fb06..0e5d28f0e4 100644 --- a/internal/controller/state/graph/route_common_test.go +++ b/internal/controller/state/graph/route_common_test.go @@ -14,9 +14,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestBuildSectionNameRefs(t *testing.T) { diff --git a/internal/controller/state/graph/snippets_filter.go b/internal/controller/state/graph/snippets_filter.go index e9d7c927d6..dd5727a77e 100644 --- a/internal/controller/state/graph/snippets_filter.go +++ b/internal/controller/state/graph/snippets_filter.go @@ -5,9 +5,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // SnippetsFilter represents a ngfAPI.SnippetsFilter. diff --git a/internal/controller/state/graph/snippets_filter_test.go b/internal/controller/state/graph/snippets_filter_test.go index a37ec8db99..dcfdd62159 100644 --- a/internal/controller/state/graph/snippets_filter_test.go +++ b/internal/controller/state/graph/snippets_filter_test.go @@ -8,9 +8,9 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestProcessSnippetsFilters(t *testing.T) { diff --git a/internal/controller/state/graph/tlsroute.go b/internal/controller/state/graph/tlsroute.go index 8d4589ffbd..db0b87e11e 100644 --- a/internal/controller/state/graph/tlsroute.go +++ b/internal/controller/state/graph/tlsroute.go @@ -6,7 +6,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" ) func buildTLSRoute( diff --git a/internal/controller/state/graph/tlsroute_test.go b/internal/controller/state/graph/tlsroute_test.go index 4a3e7b450e..29fac01b1e 100644 --- a/internal/controller/state/graph/tlsroute_test.go +++ b/internal/controller/state/graph/tlsroute_test.go @@ -11,9 +11,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func createTLSRoute( diff --git a/internal/controller/state/mirror/mirror.go b/internal/controller/state/mirror/mirror.go index 9067908570..d3ea1ae084 100644 --- a/internal/controller/state/mirror/mirror.go +++ b/internal/controller/state/mirror/mirror.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/http" ) // RouteName builds the name for the internal mirror route, using the user route name, diff --git a/internal/controller/state/mirror/mirror_test.go b/internal/controller/state/mirror/mirror_test.go index 3a4ba5bc36..3ccc6cafbf 100644 --- a/internal/controller/state/mirror/mirror_test.go +++ b/internal/controller/state/mirror/mirror_test.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestRouteName(t *testing.T) { diff --git a/internal/controller/state/resolver/resolver.go b/internal/controller/state/resolver/resolver.go index 5162ddd510..fb8ae1d77b 100644 --- a/internal/controller/state/resolver/resolver.go +++ b/internal/controller/state/resolver/resolver.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" ) //go:generate go tool counterfeiter -generate diff --git a/internal/controller/state/resolver/resolver_test.go b/internal/controller/state/resolver/resolver_test.go index 6949358819..65d068dab5 100644 --- a/internal/controller/state/resolver/resolver_test.go +++ b/internal/controller/state/resolver/resolver_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) var ( diff --git a/internal/controller/state/resolver/resolverfakes/fake_service_resolver.go b/internal/controller/state/resolver/resolverfakes/fake_service_resolver.go index d4feb1bd9c..41e84b5d5b 100644 --- a/internal/controller/state/resolver/resolverfakes/fake_service_resolver.go +++ b/internal/controller/state/resolver/resolverfakes/fake_service_resolver.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" v1 "k8s.io/api/core/v1" v1a "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" diff --git a/internal/controller/state/resolver/service_resolver_test.go b/internal/controller/state/resolver/service_resolver_test.go index ffe85e246d..bee832957e 100644 --- a/internal/controller/state/resolver/service_resolver_test.go +++ b/internal/controller/state/resolver/service_resolver_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func createSlice( diff --git a/internal/controller/state/statefakes/fake_change_processor.go b/internal/controller/state/statefakes/fake_change_processor.go index c4f2049c31..d3b7dc8823 100644 --- a/internal/controller/state/statefakes/fake_change_processor.go +++ b/internal/controller/state/statefakes/fake_change_processor.go @@ -4,9 +4,9 @@ package statefakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" typesa "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/controller/state/store.go b/internal/controller/state/store.go index 9408efc494..e64bdfba7d 100644 --- a/internal/controller/state/store.go +++ b/internal/controller/state/store.go @@ -7,10 +7,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // Updater updates the cluster state. diff --git a/internal/controller/state/validation/validationfakes/fake_generic_validator.go b/internal/controller/state/validation/validationfakes/fake_generic_validator.go index a9facdc1ed..8c83a4ff9a 100644 --- a/internal/controller/state/validation/validationfakes/fake_generic_validator.go +++ b/internal/controller/state/validation/validationfakes/fake_generic_validator.go @@ -4,7 +4,7 @@ package validationfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" ) type FakeGenericValidator struct { diff --git a/internal/controller/state/validation/validationfakes/fake_httpfields_validator.go b/internal/controller/state/validation/validationfakes/fake_httpfields_validator.go index 6b8e94ad9c..06b5bf1915 100644 --- a/internal/controller/state/validation/validationfakes/fake_httpfields_validator.go +++ b/internal/controller/state/validation/validationfakes/fake_httpfields_validator.go @@ -4,7 +4,7 @@ package validationfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" ) type FakeHTTPFieldsValidator struct { diff --git a/internal/controller/state/validation/validationfakes/fake_policy_validator.go b/internal/controller/state/validation/validationfakes/fake_policy_validator.go index a4a422293b..0cb8b7f232 100644 --- a/internal/controller/state/validation/validationfakes/fake_policy_validator.go +++ b/internal/controller/state/validation/validationfakes/fake_policy_validator.go @@ -4,9 +4,9 @@ package validationfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation" ) type FakePolicyValidator struct { diff --git a/internal/controller/state/validation/validator.go b/internal/controller/state/validation/validator.go index 29ac3809ea..d01a907e7f 100644 --- a/internal/controller/state/validation/validator.go +++ b/internal/controller/state/validation/validator.go @@ -3,8 +3,8 @@ package validation //go:generate go tool counterfeiter -generate import ( - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" ) // Validators include validators for API resources from the perspective of a data-plane. diff --git a/internal/controller/status/prepare_requests.go b/internal/controller/status/prepare_requests.go index f1909c1570..d2f39a7a3a 100644 --- a/internal/controller/status/prepare_requests.go +++ b/internal/controller/status/prepare_requests.go @@ -10,11 +10,11 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) // PrepareRouteRequests prepares status UpdateRequests for the given Routes. diff --git a/internal/controller/status/prepare_requests_test.go b/internal/controller/status/prepare_requests_test.go index f813f18335..7e08a7cb59 100644 --- a/internal/controller/status/prepare_requests_test.go +++ b/internal/controller/status/prepare_requests_test.go @@ -19,12 +19,12 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) func createK8sClientFor(resourceType ngftypes.ObjectType) client.Client { diff --git a/internal/controller/status/status_setters.go b/internal/controller/status/status_setters.go index 5f973a5f07..c4fcc7c128 100644 --- a/internal/controller/status/status_setters.go +++ b/internal/controller/status/status_setters.go @@ -8,9 +8,9 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func newNginxGatewayStatusSetter(status ngfAPI.NginxGatewayStatus) Setter { diff --git a/internal/controller/status/status_setters_test.go b/internal/controller/status/status_setters_test.go index 145dc48540..61a34a4e9f 100644 --- a/internal/controller/status/status_setters_test.go +++ b/internal/controller/status/status_setters_test.go @@ -9,10 +9,10 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/policiesfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func TestNewNginxGatewayStatusSetter(t *testing.T) { diff --git a/internal/controller/status/statusfakes/fake_group_updater.go b/internal/controller/status/statusfakes/fake_group_updater.go index 482abfd8e3..1f9a67d57b 100644 --- a/internal/controller/status/statusfakes/fake_group_updater.go +++ b/internal/controller/status/statusfakes/fake_group_updater.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" ) type FakeGroupUpdater struct { diff --git a/internal/controller/status/statusfakes/fake_k8s_updater.go b/internal/controller/status/statusfakes/fake_k8s_updater.go index f68c3ea768..813a687a3a 100644 --- a/internal/controller/status/statusfakes/fake_k8s_updater.go +++ b/internal/controller/status/statusfakes/fake_k8s_updater.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/controller/status/updater.go b/internal/controller/status/updater.go index cf4fc6b084..eee01fae00 100644 --- a/internal/controller/status/updater.go +++ b/internal/controller/status/updater.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // UpdateRequest is a request to update the status of a resource. diff --git a/internal/controller/status/updater_retry_test.go b/internal/controller/status/updater_retry_test.go index b2a578908f..6f4de9a7b4 100644 --- a/internal/controller/status/updater_retry_test.go +++ b/internal/controller/status/updater_retry_test.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status" - "github.com/nginx/nginx-gateway-fabric/internal/controller/status/statusfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status/statusfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/controllerfakes" ) func TestNewRetryUpdateFunc(t *testing.T) { diff --git a/internal/controller/status/updater_test.go b/internal/controller/status/updater_test.go index b72faf4b3d..94936e1454 100644 --- a/internal/controller/status/updater_test.go +++ b/internal/controller/status/updater_test.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) func createGC(name string) *v1.GatewayClass { diff --git a/internal/controller/telemetry/collector.go b/internal/controller/telemetry/collector.go index 9655b5ce35..2ea076f792 100644 --- a/internal/controller/telemetry/collector.go +++ b/internal/controller/telemetry/collector.go @@ -16,11 +16,11 @@ import ( k8sversion "k8s.io/apimachinery/pkg/util/version" "sigs.k8s.io/controller-runtime/pkg/client" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" ) //counterfeiter:generate . GraphGetter diff --git a/internal/controller/telemetry/collector_test.go b/internal/controller/telemetry/collector_test.go index 105f2da68a..850b5756be 100644 --- a/internal/controller/telemetry/collector_test.go +++ b/internal/controller/telemetry/collector_test.go @@ -17,17 +17,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/config" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry/telemetryfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kubernetes/kubernetesfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry/telemetryfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kubernetes/kubernetesfakes" ) type listCallsFunc = func( diff --git a/internal/controller/telemetry/job_worker_test.go b/internal/controller/telemetry/job_worker_test.go index 283814d9d3..1ce5bc2397 100644 --- a/internal/controller/telemetry/job_worker_test.go +++ b/internal/controller/telemetry/job_worker_test.go @@ -10,8 +10,8 @@ import ( tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry/telemetryfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry/telemetryfakes" ) func TestCreateTelemetryJobWorker_Succeeds(t *testing.T) { diff --git a/internal/controller/telemetry/telemetryfakes/fake_configuration_getter.go b/internal/controller/telemetry/telemetryfakes/fake_configuration_getter.go index 2a9213e8ed..9eeadaab9d 100644 --- a/internal/controller/telemetry/telemetryfakes/fake_configuration_getter.go +++ b/internal/controller/telemetry/telemetryfakes/fake_configuration_getter.go @@ -4,8 +4,8 @@ package telemetryfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" ) type FakeConfigurationGetter struct { diff --git a/internal/controller/telemetry/telemetryfakes/fake_data_collector.go b/internal/controller/telemetry/telemetryfakes/fake_data_collector.go index ae3bfb4753..080437c866 100644 --- a/internal/controller/telemetry/telemetryfakes/fake_data_collector.go +++ b/internal/controller/telemetry/telemetryfakes/fake_data_collector.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" ) type FakeDataCollector struct { diff --git a/internal/controller/telemetry/telemetryfakes/fake_exporter.go b/internal/controller/telemetry/telemetryfakes/fake_exporter.go index 27360594f6..9f159eb39e 100644 --- a/internal/controller/telemetry/telemetryfakes/fake_exporter.go +++ b/internal/controller/telemetry/telemetryfakes/fake_exporter.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" telemetrya "github.com/nginx/telemetry-exporter/pkg/telemetry" ) diff --git a/internal/controller/telemetry/telemetryfakes/fake_graph_getter.go b/internal/controller/telemetry/telemetryfakes/fake_graph_getter.go index 045f60447f..6eb5ffb017 100644 --- a/internal/controller/telemetry/telemetryfakes/fake_graph_getter.go +++ b/internal/controller/telemetry/telemetryfakes/fake_graph_getter.go @@ -4,8 +4,8 @@ package telemetryfakes import ( "sync" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph" - "github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry" ) type FakeGraphGetter struct { diff --git a/internal/framework/controller/controllerfakes/fake_getter.go b/internal/framework/controller/controllerfakes/fake_getter.go index 429397e5a0..a3bddc6850 100644 --- a/internal/framework/controller/controllerfakes/fake_getter.go +++ b/internal/framework/controller/controllerfakes/fake_getter.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/framework/controller/filter/filter.go b/internal/framework/controller/filter/filter.go index 36cd51836b..42e2afabe6 100644 --- a/internal/framework/controller/filter/filter.go +++ b/internal/framework/controller/filter/filter.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" ) // CreateSingleResourceFilter creates a filter function that filters out all resources except the one diff --git a/internal/framework/controller/predicate/annotation.go b/internal/framework/controller/predicate/annotation.go index c6c34585f6..34e07c7447 100644 --- a/internal/framework/controller/predicate/annotation.go +++ b/internal/framework/controller/predicate/annotation.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" ) // AnnotationPredicate implements a predicate function based on the Annotation. diff --git a/internal/framework/controller/predicate/annotation_test.go b/internal/framework/controller/predicate/annotation_test.go index 4ecc448b4d..06c6920381 100644 --- a/internal/framework/controller/predicate/annotation_test.go +++ b/internal/framework/controller/predicate/annotation_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" ) func TestAnnotationPredicate_Create(t *testing.T) { diff --git a/internal/framework/controller/predicate/service_test.go b/internal/framework/controller/predicate/service_test.go index abb07c27c5..0ade4b5016 100644 --- a/internal/framework/controller/predicate/service_test.go +++ b/internal/framework/controller/predicate/service_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestServiceChangedPredicate_Update(t *testing.T) { diff --git a/internal/framework/controller/reconciler.go b/internal/framework/controller/reconciler.go index 54fdec7e0b..d5f3d53742 100644 --- a/internal/framework/controller/reconciler.go +++ b/internal/framework/controller/reconciler.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // NamespacedNameFilterFunc is a function that returns true if the resource should be processed by the reconciler. diff --git a/internal/framework/controller/reconciler_test.go b/internal/framework/controller/reconciler_test.go index 10038b5e8c..5ea2c7bf91 100644 --- a/internal/framework/controller/reconciler_test.go +++ b/internal/framework/controller/reconciler_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) type getFunc func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error diff --git a/internal/framework/controller/register.go b/internal/framework/controller/register.go index 557438da98..de3d4e38a3 100644 --- a/internal/framework/controller/register.go +++ b/internal/framework/controller/register.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) const ( diff --git a/internal/framework/controller/register_test.go b/internal/framework/controller/register_test.go index e8a20efe3c..a5280616de 100644 --- a/internal/framework/controller/register_test.go +++ b/internal/framework/controller/register_test.go @@ -18,12 +18,12 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) func TestRegister(t *testing.T) { diff --git a/internal/framework/events/event.go b/internal/framework/events/event.go index 2200c8023f..5540ea546c 100644 --- a/internal/framework/events/event.go +++ b/internal/framework/events/event.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types" ) // EventBatch is a batch of events to be handled at once. diff --git a/internal/framework/events/eventsfakes/fake_event_handler.go b/internal/framework/events/eventsfakes/fake_event_handler.go index b3dcadf8e6..f836976f6d 100644 --- a/internal/framework/events/eventsfakes/fake_event_handler.go +++ b/internal/framework/events/eventsfakes/fake_event_handler.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/go-logr/logr" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) type FakeEventHandler struct { diff --git a/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go b/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go index 47a69e5a08..4b82a97aac 100644 --- a/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go +++ b/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" ) type FakeFirstEventBatchPreparer struct { diff --git a/internal/framework/events/first_eventbatch_preparer.go b/internal/framework/events/first_eventbatch_preparer.go index 155f120b32..eef996bb73 100644 --- a/internal/framework/events/first_eventbatch_preparer.go +++ b/internal/framework/events/first_eventbatch_preparer.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kubernetes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kubernetes" ) //counterfeiter:generate . FirstEventBatchPreparer diff --git a/internal/framework/events/first_eventbatch_preparer_test.go b/internal/framework/events/first_eventbatch_preparer_test.go index 8828974cfd..bd77df1eea 100644 --- a/internal/framework/events/first_eventbatch_preparer_test.go +++ b/internal/framework/events/first_eventbatch_preparer_test.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kubernetes/kubernetesfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kubernetes/kubernetesfakes" ) var _ = Describe("FirstEventBatchPreparer", func() { diff --git a/internal/framework/events/loop_test.go b/internal/framework/events/loop_test.go index 02f5a00b04..a4f632fc96 100644 --- a/internal/framework/events/loop_test.go +++ b/internal/framework/events/loop_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events" - "github.com/nginx/nginx-gateway-fabric/internal/framework/events/eventsfakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events/eventsfakes" ) var _ = Describe("EventLoop", func() { diff --git a/internal/framework/file/file.go b/internal/framework/file/file.go index 8b090d3fa9..8fd4780691 100644 --- a/internal/framework/file/file.go +++ b/internal/framework/file/file.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" ) //go:generate go tool counterfeiter -generate diff --git a/internal/framework/file/file_test.go b/internal/framework/file/file_test.go index 555fdedf5c..fcb41bbee1 100644 --- a/internal/framework/file/file_test.go +++ b/internal/framework/file/file_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file/filefakes" ) var _ = Describe("Write files", Ordered, func() { diff --git a/internal/framework/file/filefakes/fake_osfile_manager.go b/internal/framework/file/filefakes/fake_osfile_manager.go index d66888ac44..ff55862cc1 100644 --- a/internal/framework/file/filefakes/fake_osfile_manager.go +++ b/internal/framework/file/filefakes/fake_osfile_manager.go @@ -6,7 +6,7 @@ import ( "os" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/framework/file" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file" ) type FakeOSFileManager struct { diff --git a/internal/framework/helpers/helpers_test.go b/internal/framework/helpers/helpers_test.go index bb7574b295..f7365f3865 100644 --- a/internal/framework/helpers/helpers_test.go +++ b/internal/framework/helpers/helpers_test.go @@ -9,7 +9,7 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" ) func TestMustCastObject(t *testing.T) { diff --git a/internal/framework/kubernetes/kubernetesfakes/fake_reader.go b/internal/framework/kubernetes/kubernetesfakes/fake_reader.go index 618dd0cab5..57ffdd9372 100644 --- a/internal/framework/kubernetes/kubernetesfakes/fake_reader.go +++ b/internal/framework/kubernetes/kubernetesfakes/fake_reader.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginx/nginx-gateway-fabric/internal/framework/kubernetes" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/tests/framework/resourcemanager.go b/tests/framework/resourcemanager.go index c48c4d40e0..8b71b644f6 100644 --- a/tests/framework/resourcemanager.go +++ b/tests/framework/resourcemanager.go @@ -48,7 +48,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" ) // ResourceManager handles creating/updating/deleting Kubernetes resources. diff --git a/tests/go.mod b/tests/go.mod index 2570f05b23..ae6165ac7c 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,11 +1,11 @@ -module github.com/nginx/nginx-gateway-fabric/tests +module github.com/nginx/nginx-gateway-fabric/v2/tests go 1.24.2 -replace github.com/nginx/nginx-gateway-fabric => ../ +replace github.com/nginx/nginx-gateway-fabric/v2 => ../ require ( - github.com/nginx/nginx-gateway-fabric v0.0.0 + github.com/nginx/nginx-gateway-fabric/v2 v2.0.0 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.38.0 github.com/prometheus/client_golang v1.22.0 diff --git a/tests/suite/advanced_routing_test.go b/tests/suite/advanced_routing_test.go index cffc5bad5b..465654246f 100644 --- a/tests/suite/advanced_routing_test.go +++ b/tests/suite/advanced_routing_test.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), func() { diff --git a/tests/suite/client_settings_test.go b/tests/suite/client_settings_test.go index 1f6293e6b5..557146b789 100644 --- a/tests/suite/client_settings_test.go +++ b/tests/suite/client_settings_test.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("ClientSettingsPolicy", Ordered, Label("functional", "cspolicy"), func() { diff --git a/tests/suite/dataplane_perf_test.go b/tests/suite/dataplane_perf_test.go index adedebf05f..cce009ab03 100644 --- a/tests/suite/dataplane_perf_test.go +++ b/tests/suite/dataplane_perf_test.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"), func() { diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index 71c37d9e68..ca50c2f6c3 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) const ( diff --git a/tests/suite/longevity_test.go b/tests/suite/longevity_test.go index 182c0fd676..8734ffa5bc 100644 --- a/tests/suite/longevity_test.go +++ b/tests/suite/longevity_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) // Longevity test is an NFR test, but does not include the "nfr" label. It needs to run on its own, diff --git a/tests/suite/nginxgateway_test.go b/tests/suite/nginxgateway_test.go index 90e1edb76c..9c3497d891 100644 --- a/tests/suite/nginxgateway_test.go +++ b/tests/suite/nginxgateway_test.go @@ -12,8 +12,8 @@ import ( core "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("NginxGateway", Ordered, Label("functional", "nginxGateway"), func() { diff --git a/tests/suite/reconfig_test.go b/tests/suite/reconfig_test.go index b2f0fee0f2..ab990e1808 100644 --- a/tests/suite/reconfig_test.go +++ b/tests/suite/reconfig_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) // Cluster node size must be greater than or equal to 4 for test to perform correctly. diff --git a/tests/suite/sample_test.go b/tests/suite/sample_test.go index 191d20134d..a79dda5a7d 100644 --- a/tests/suite/sample_test.go +++ b/tests/suite/sample_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("Basic test example", Label("functional"), func() { diff --git a/tests/suite/scale_test.go b/tests/suite/scale_test.go index 8a04a088e7..482740b726 100644 --- a/tests/suite/scale_test.go +++ b/tests/suite/scale_test.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() { diff --git a/tests/suite/snippets_filter_test.go b/tests/suite/snippets_filter_test.go index 8c2a8ca80b..8a45d2277b 100644 --- a/tests/suite/snippets_filter_test.go +++ b/tests/suite/snippets_filter_test.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter"), func() { diff --git a/tests/suite/system_suite_test.go b/tests/suite/system_suite_test.go index e57c9fc75a..f404f13e55 100644 --- a/tests/suite/system_suite_test.go +++ b/tests/suite/system_suite_test.go @@ -31,9 +31,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) func TestNGF(t *testing.T) { diff --git a/tests/suite/telemetry_test.go b/tests/suite/telemetry_test.go index 7c81b74342..a4d5f502ca 100644 --- a/tests/suite/telemetry_test.go +++ b/tests/suite/telemetry_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" core "k8s.io/api/core/v1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("Telemetry test with OTel collector", Label("telemetry"), func() { diff --git a/tests/suite/tracing_test.go b/tests/suite/tracing_test.go index 448205a6ce..2837a01cb3 100644 --- a/tests/suite/tracing_test.go +++ b/tests/suite/tracing_test.go @@ -17,11 +17,11 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2" - "github.com/nginx/nginx-gateway-fabric/internal/controller/state/conditions" - "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2" + "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions" + "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) // This test can be flaky when waiting to see traces show up in the collector logs. diff --git a/tests/suite/upgrade_test.go b/tests/suite/upgrade_test.go index 332574b87b..cc864ff990 100644 --- a/tests/suite/upgrade_test.go +++ b/tests/suite/upgrade_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) // This test installs the latest released version of NGF, then upgrades to the edge version (or dev version). diff --git a/tests/suite/upstream_settings_test.go b/tests/suite/upstream_settings_test.go index f2b02b1059..2f5c2bb408 100644 --- a/tests/suite/upstream_settings_test.go +++ b/tests/suite/upstream_settings_test.go @@ -16,8 +16,8 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginx/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/v2/tests/framework" ) var _ = Describe("UpstreamSettingsPolicy", Ordered, Label("functional", "uspolicy"), func() {