diff --git a/.github/workflows/renovate-build.yml b/.github/workflows/renovate-build.yml index 45239ca617..f869b1cbe5 100644 --- a/.github/workflows/renovate-build.yml +++ b/.github/workflows/renovate-build.yml @@ -70,6 +70,4 @@ jobs: uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1 with: commit_message: "Update files for renovate" - commit_user_name: "renovate[bot]" - commit_user_email: "<29139614+renovate[bot]@users.noreply.github.com>" commit_author: "renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>" diff --git a/go.mod b/go.mod index 5457a3e3b3..fb6b0befe4 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/nginxinc/nginx-gateway-fabric -go 1.22.0 +go 1.23.0 require ( github.com/go-kit/log v0.2.1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 - github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 + github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 github.com/nginxinc/nginx-plus-go-client v1.3.0 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 github.com/nginxinc/telemetry-exporter v0.1.2 @@ -80,7 +80,7 @@ require ( golang.org/x/term v0.25.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.25.0 // indirect + golang.org/x/tools v0.26.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect diff --git a/go.sum b/go.sum index 9907c83909..c32d8dd70c 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 h1:ERhc+PJKEyqWQnKu7/K0frSVGFihYYImqNdqP5r0cN0= -github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0/go.mod h1:tU2wQdIyJ7fib/YXxFR0dgLlFz3yl4p275UfUKmDFjk= +github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 h1:9WsegDYiSKtZXru+NcOB4z7iqb00n4atjmQlyy5TRXI= +github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0/go.mod h1:TeVdzh+5QB5IpWDJAU/uviXA6kOg9yXzLrrjeLKJXqY= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -186,8 +186,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/framework/controller/controllerfakes/fake_getter.go b/internal/framework/controller/controllerfakes/fake_getter.go index 47a344cdef..a343bfe26a 100644 --- a/internal/framework/controller/controllerfakes/fake_getter.go +++ b/internal/framework/controller/controllerfakes/fake_getter.go @@ -6,16 +6,15 @@ import ( "sync" "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) type FakeGetter struct { - GetStub func(context.Context, types.NamespacedName, client.Object, ...client.GetOption) error + GetStub func(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error getMutex sync.RWMutex getArgsForCall []struct { arg1 context.Context - arg2 types.NamespacedName + arg2 client.ObjectKey arg3 client.Object arg4 []client.GetOption } @@ -29,12 +28,12 @@ type FakeGetter struct { invocationsMutex sync.RWMutex } -func (fake *FakeGetter) Get(arg1 context.Context, arg2 types.NamespacedName, arg3 client.Object, arg4 ...client.GetOption) error { +func (fake *FakeGetter) Get(arg1 context.Context, arg2 client.ObjectKey, arg3 client.Object, arg4 ...client.GetOption) error { fake.getMutex.Lock() ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { arg1 context.Context - arg2 types.NamespacedName + arg2 client.ObjectKey arg3 client.Object arg4 []client.GetOption }{arg1, arg2, arg3, arg4}) @@ -57,13 +56,13 @@ func (fake *FakeGetter) GetCallCount() int { return len(fake.getArgsForCall) } -func (fake *FakeGetter) GetCalls(stub func(context.Context, types.NamespacedName, client.Object, ...client.GetOption) error) { +func (fake *FakeGetter) GetCalls(stub func(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error) { fake.getMutex.Lock() defer fake.getMutex.Unlock() fake.GetStub = stub } -func (fake *FakeGetter) GetArgsForCall(i int) (context.Context, types.NamespacedName, client.Object, []client.GetOption) { +func (fake *FakeGetter) GetArgsForCall(i int) (context.Context, client.ObjectKey, client.Object, []client.GetOption) { fake.getMutex.RLock() defer fake.getMutex.RUnlock() argsForCall := fake.getArgsForCall[i] diff --git a/internal/framework/events/eventsfakes/fake_reader.go b/internal/framework/events/eventsfakes/fake_reader.go index 7e6c2d4fa2..0a66fee477 100644 --- a/internal/framework/events/eventsfakes/fake_reader.go +++ b/internal/framework/events/eventsfakes/fake_reader.go @@ -6,16 +6,15 @@ import ( "sync" "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) type FakeReader struct { - GetStub func(context.Context, types.NamespacedName, client.Object, ...client.GetOption) error + GetStub func(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error getMutex sync.RWMutex getArgsForCall []struct { arg1 context.Context - arg2 types.NamespacedName + arg2 client.ObjectKey arg3 client.Object arg4 []client.GetOption } @@ -42,12 +41,12 @@ type FakeReader struct { invocationsMutex sync.RWMutex } -func (fake *FakeReader) Get(arg1 context.Context, arg2 types.NamespacedName, arg3 client.Object, arg4 ...client.GetOption) error { +func (fake *FakeReader) Get(arg1 context.Context, arg2 client.ObjectKey, arg3 client.Object, arg4 ...client.GetOption) error { fake.getMutex.Lock() ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { arg1 context.Context - arg2 types.NamespacedName + arg2 client.ObjectKey arg3 client.Object arg4 []client.GetOption }{arg1, arg2, arg3, arg4}) @@ -70,13 +69,13 @@ func (fake *FakeReader) GetCallCount() int { return len(fake.getArgsForCall) } -func (fake *FakeReader) GetCalls(stub func(context.Context, types.NamespacedName, client.Object, ...client.GetOption) error) { +func (fake *FakeReader) GetCalls(stub func(context.Context, client.ObjectKey, client.Object, ...client.GetOption) error) { fake.getMutex.Lock() defer fake.getMutex.Unlock() fake.GetStub = stub } -func (fake *FakeReader) GetArgsForCall(i int) (context.Context, types.NamespacedName, client.Object, []client.GetOption) { +func (fake *FakeReader) GetArgsForCall(i int) (context.Context, client.ObjectKey, client.Object, []client.GetOption) { fake.getMutex.RLock() defer fake.getMutex.RUnlock() argsForCall := fake.getArgsForCall[i] diff --git a/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go b/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go index 49bd5658ee..15f57b79e3 100644 --- a/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go +++ b/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go @@ -2,24 +2,24 @@ package filefakes import ( - "io/fs" + "os" "sync" "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" ) type FakeClearFoldersOSFileManager struct { - ReadDirStub func(string) ([]fs.DirEntry, error) + ReadDirStub func(string) ([]os.DirEntry, error) readDirMutex sync.RWMutex readDirArgsForCall []struct { arg1 string } readDirReturns struct { - result1 []fs.DirEntry + result1 []os.DirEntry result2 error } readDirReturnsOnCall map[int]struct { - result1 []fs.DirEntry + result1 []os.DirEntry result2 error } RemoveStub func(string) error @@ -37,7 +37,7 @@ type FakeClearFoldersOSFileManager struct { invocationsMutex sync.RWMutex } -func (fake *FakeClearFoldersOSFileManager) ReadDir(arg1 string) ([]fs.DirEntry, error) { +func (fake *FakeClearFoldersOSFileManager) ReadDir(arg1 string) ([]os.DirEntry, error) { fake.readDirMutex.Lock() ret, specificReturn := fake.readDirReturnsOnCall[len(fake.readDirArgsForCall)] fake.readDirArgsForCall = append(fake.readDirArgsForCall, struct { @@ -62,7 +62,7 @@ func (fake *FakeClearFoldersOSFileManager) ReadDirCallCount() int { return len(fake.readDirArgsForCall) } -func (fake *FakeClearFoldersOSFileManager) ReadDirCalls(stub func(string) ([]fs.DirEntry, error)) { +func (fake *FakeClearFoldersOSFileManager) ReadDirCalls(stub func(string) ([]os.DirEntry, error)) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = stub @@ -75,28 +75,28 @@ func (fake *FakeClearFoldersOSFileManager) ReadDirArgsForCall(i int) string { return argsForCall.arg1 } -func (fake *FakeClearFoldersOSFileManager) ReadDirReturns(result1 []fs.DirEntry, result2 error) { +func (fake *FakeClearFoldersOSFileManager) ReadDirReturns(result1 []os.DirEntry, result2 error) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = nil fake.readDirReturns = struct { - result1 []fs.DirEntry + result1 []os.DirEntry result2 error }{result1, result2} } -func (fake *FakeClearFoldersOSFileManager) ReadDirReturnsOnCall(i int, result1 []fs.DirEntry, result2 error) { +func (fake *FakeClearFoldersOSFileManager) ReadDirReturnsOnCall(i int, result1 []os.DirEntry, result2 error) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = nil if fake.readDirReturnsOnCall == nil { fake.readDirReturnsOnCall = make(map[int]struct { - result1 []fs.DirEntry + result1 []os.DirEntry result2 error }) } fake.readDirReturnsOnCall[i] = struct { - result1 []fs.DirEntry + result1 []os.DirEntry result2 error }{result1, result2} } diff --git a/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go b/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go index d1e5128a33..7227cf8d4c 100644 --- a/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go +++ b/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go @@ -10,11 +10,11 @@ import ( ) type FakeOSFileManager struct { - ChmodStub func(*os.File, fs.FileMode) error + ChmodStub func(*os.File, os.FileMode) error chmodMutex sync.RWMutex chmodArgsForCall []struct { arg1 *os.File - arg2 fs.FileMode + arg2 os.FileMode } chmodReturns struct { result1 error @@ -75,12 +75,12 @@ type FakeOSFileManager struct { invocationsMutex sync.RWMutex } -func (fake *FakeOSFileManager) Chmod(arg1 *os.File, arg2 fs.FileMode) error { +func (fake *FakeOSFileManager) Chmod(arg1 *os.File, arg2 os.FileMode) error { fake.chmodMutex.Lock() ret, specificReturn := fake.chmodReturnsOnCall[len(fake.chmodArgsForCall)] fake.chmodArgsForCall = append(fake.chmodArgsForCall, struct { arg1 *os.File - arg2 fs.FileMode + arg2 os.FileMode }{arg1, arg2}) stub := fake.ChmodStub fakeReturns := fake.chmodReturns @@ -101,13 +101,13 @@ func (fake *FakeOSFileManager) ChmodCallCount() int { return len(fake.chmodArgsForCall) } -func (fake *FakeOSFileManager) ChmodCalls(stub func(*os.File, fs.FileMode) error) { +func (fake *FakeOSFileManager) ChmodCalls(stub func(*os.File, os.FileMode) error) { fake.chmodMutex.Lock() defer fake.chmodMutex.Unlock() fake.ChmodStub = stub } -func (fake *FakeOSFileManager) ChmodArgsForCall(i int) (*os.File, fs.FileMode) { +func (fake *FakeOSFileManager) ChmodArgsForCall(i int) (*os.File, os.FileMode) { fake.chmodMutex.RLock() defer fake.chmodMutex.RUnlock() argsForCall := fake.chmodArgsForCall[i] diff --git a/tests/go.mod b/tests/go.mod index 14485f751e..342ba60279 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,8 @@ module github.com/nginxinc/nginx-gateway-fabric/tests -go 1.22.2 +go 1.23.0 + +replace github.com/nginxinc/nginx-gateway-fabric => ../ require ( github.com/nginxinc/nginx-gateway-fabric v0.0.0 @@ -69,7 +71,7 @@ require ( golang.org/x/term v0.25.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.25.0 // indirect + golang.org/x/tools v0.26.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect google.golang.org/grpc v1.67.1 // indirect @@ -83,5 +85,3 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) - -replace github.com/nginxinc/nginx-gateway-fabric => ../ diff --git a/tests/go.sum b/tests/go.sum index ced7927be5..f0b9b64861 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -174,8 +174,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=