diff --git a/go.mod b/go.mod index bd329a09e..ba5673401 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 - github.com/nginxinc/nginx-plus-go-client v1.3.0 + github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 github.com/nginxinc/telemetry-exporter v0.1.2 github.com/onsi/ginkgo/v2 v2.21.0 @@ -61,6 +61,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/nginxinc/nginx-plus-go-client v1.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect diff --git a/go.sum b/go.sum index bbe66ea3e..bdf29975c 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nginxinc/nginx-plus-go-client v1.3.0 h1:q/aeT4B5k0KLwWlefoBzfLfraBBvIKLuDg+lLFWAo4I= -github.com/nginxinc/nginx-plus-go-client v1.3.0/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4= +github.com/nginxinc/nginx-plus-go-client v1.2.2 h1:sl7HqNDDZq2EVu0eQQVoZ6PKYGa4h2dB/Qr5Ib0YKGw= +github.com/nginxinc/nginx-plus-go-client v1.2.2/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4= +github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o= +github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1/go.mod h1:He+1izxYxVVO5/C9ZTukwOpvkAx5eS19nRQgKXDhX5I= github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0= github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU= github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs= diff --git a/internal/mode/static/handler.go b/internal/mode/static/handler.go index 12b0384b5..129b202c9 100644 --- a/internal/mode/static/handler.go +++ b/internal/mode/static/handler.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/internal/mode/static/handler_test.go b/internal/mode/static/handler_test.go index a912168a2..fc385944d 100644 --- a/internal/mode/static/handler_test.go +++ b/internal/mode/static/handler_test.go @@ -4,7 +4,7 @@ import ( "context" "errors" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/zap" diff --git a/internal/mode/static/metrics/collectors/nginx.go b/internal/mode/static/metrics/collectors/nginx.go index f8ce60b26..d81e69eca 100644 --- a/internal/mode/static/metrics/collectors/nginx.go +++ b/internal/mode/static/metrics/collectors/nginx.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/nginxinc/nginx-plus-go-client/client" + "github.com/nginxinc/nginx-plus-go-client/v2/client" prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client" nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/mode/static/nginx/config/convert.go b/internal/mode/static/nginx/config/convert.go index ff20bf888..37aede366 100644 --- a/internal/mode/static/nginx/config/convert.go +++ b/internal/mode/static/nginx/config/convert.go @@ -3,7 +3,7 @@ package config import ( "fmt" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" ) diff --git a/internal/mode/static/nginx/config/convert_test.go b/internal/mode/static/nginx/config/convert_test.go index 6be41ccda..bb3fb72be 100644 --- a/internal/mode/static/nginx/config/convert_test.go +++ b/internal/mode/static/nginx/config/convert_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" . "github.com/onsi/gomega" "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" diff --git a/internal/mode/static/nginx/runtime/clients.go b/internal/mode/static/nginx/runtime/clients.go index a01a8ef09..3b5c67e7d 100644 --- a/internal/mode/static/nginx/runtime/clients.go +++ b/internal/mode/static/nginx/runtime/clients.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/nginxinc/nginx-plus-go-client/client" + "github.com/nginxinc/nginx-plus-go-client/v2/client" ) const ( diff --git a/internal/mode/static/nginx/runtime/manager.go b/internal/mode/static/nginx/runtime/manager.go index 45d24dbb7..f9c25efbc 100644 --- a/internal/mode/static/nginx/runtime/manager.go +++ b/internal/mode/static/nginx/runtime/manager.go @@ -12,7 +12,7 @@ import ( "time" "github.com/go-logr/logr" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/internal/mode/static/nginx/runtime/manager_test.go b/internal/mode/static/nginx/runtime/manager_test.go index 15eb498a7..12714b064 100644 --- a/internal/mode/static/nginx/runtime/manager_test.go +++ b/internal/mode/static/nginx/runtime/manager_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - ngxclient "github.com/nginxinc/nginx-plus-go-client/client" + ngxclient "github.com/nginxinc/nginx-plus-go-client/v2/client" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go index 2538e32de..89af264ac 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" - "github.com/nginxinc/nginx-plus-go-client/client" + "github.com/nginxinc/nginx-plus-go-client/v2/client" ) type FakeManager struct { diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go index 3ea431d29..116c17af2 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" - "github.com/nginxinc/nginx-plus-go-client/client" + "github.com/nginxinc/nginx-plus-go-client/v2/client" ) type FakeNginxPlusClient struct {