diff --git a/Dockerfile b/Dockerfile index ed47cc4e..ee028f63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.1-alpine3.20 AS builder +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.2-alpine3.20 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 33549130..61ea1a07 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.2 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/stretchr/testify v1.9.0 github.com/vektra/mockery/v2 v2.46.3 go.uber.org/atomic v1.11.0 @@ -28,10 +28,10 @@ require ( golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 istio.io/api v1.23.2 istio.io/client-go v1.23.2 - k8s.io/api v0.31.1 + k8s.io/api v0.31.2 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.2 - k8s.io/client-go v0.31.1 + k8s.io/client-go v0.31.2 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.19.1 ) diff --git a/go.sum b/go.sum index a2cf439b..81ee43cf 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= @@ -703,14 +703,14 @@ istio.io/api v1.23.2 h1:FvWi7GC+rWD60/ZFPuulX/h3k+f2Q9qot3dP8CIL8Ss= istio.io/api v1.23.2/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= istio.io/client-go v1.23.2 h1:BIt6A+KaUOFin3SzXiDq2Fr/TMBev1+c836R0BfUfhU= istio.io/client-go v1.23.2/go.mod h1:E08wpMtUulJk2tlWOCUVakjy1bKFxUNm22tM1R1QY0Y= -k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= -k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= -k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= diff --git a/internal/connection/nats/mocks/connection.go b/internal/connection/nats/mocks/connection.go index ca9010f9..9c5e8eb3 100644 --- a/internal/connection/nats/mocks/connection.go +++ b/internal/connection/nats/mocks/connection.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/internal/controller/eventing/subscription/validator/mocks/SubscriptionValidator.go b/internal/controller/eventing/subscription/validator/mocks/SubscriptionValidator.go index 694be215..feb9bc48 100644 --- a/internal/controller/eventing/subscription/validator/mocks/SubscriptionValidator.go +++ b/internal/controller/eventing/subscription/validator/mocks/SubscriptionValidator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/internal/controller/operator/eventing/mocks/manager.go b/internal/controller/operator/eventing/mocks/manager.go index 5fc48c22..22cbd7a3 100644 --- a/internal/controller/operator/eventing/mocks/manager.go +++ b/internal/controller/operator/eventing/mocks/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/internal/controller/operator/eventing/mocks/nats_config_handler.go b/internal/controller/operator/eventing/mocks/nats_config_handler.go index 81421d69..00665e70 100644 --- a/internal/controller/operator/eventing/mocks/nats_config_handler.go +++ b/internal/controller/operator/eventing/mocks/nats_config_handler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/internal/controller/operator/eventing/mocks/typed_controller.go b/internal/controller/operator/eventing/mocks/typed_controller.go index 8edc03ee..bd64c041 100644 --- a/internal/controller/operator/eventing/mocks/typed_controller.go +++ b/internal/controller/operator/eventing/mocks/typed_controller.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/backend/jetstream/mocks/Backend.go b/pkg/backend/jetstream/mocks/Backend.go index d12389c5..b42cb9af 100644 --- a/pkg/backend/jetstream/mocks/Backend.go +++ b/pkg/backend/jetstream/mocks/Backend.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/backend/jetstream/mocks/JetStreamContext.go b/pkg/backend/jetstream/mocks/JetStreamContext.go index c830b57a..276a95bf 100644 --- a/pkg/backend/jetstream/mocks/JetStreamContext.go +++ b/pkg/backend/jetstream/mocks/JetStreamContext.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/ems/api/events/client/mocks/PublisherManager.go b/pkg/ems/api/events/client/mocks/PublisherManager.go index 4ba90e7d..7cc3b66d 100644 --- a/pkg/ems/api/events/client/mocks/PublisherManager.go +++ b/pkg/ems/api/events/client/mocks/PublisherManager.go @@ -1,12 +1,11 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks import ( - event "github.com/cloudevents/sdk-go/v2/event" - mock "github.com/stretchr/testify/mock" - + v2 "github.com/cloudevents/sdk-go/v2" types "github.com/kyma-project/eventing-manager/pkg/ems/api/events/types" + mock "github.com/stretchr/testify/mock" ) // PublisherManager is an autogenerated mock type for the PublisherManager type @@ -272,7 +271,7 @@ func (_c *PublisherManager_List_Call) RunAndReturn(run func() (*types.Subscripti } // Publish provides a mock function with given fields: cloudEvent, qos -func (_m *PublisherManager) Publish(cloudEvent event.Event, qos types.Qos) (*types.PublishResponse, error) { +func (_m *PublisherManager) Publish(cloudEvent v2.Event, qos types.Qos) (*types.PublishResponse, error) { ret := _m.Called(cloudEvent, qos) if len(ret) == 0 { @@ -281,10 +280,10 @@ func (_m *PublisherManager) Publish(cloudEvent event.Event, qos types.Qos) (*typ var r0 *types.PublishResponse var r1 error - if rf, ok := ret.Get(0).(func(event.Event, types.Qos) (*types.PublishResponse, error)); ok { + if rf, ok := ret.Get(0).(func(v2.Event, types.Qos) (*types.PublishResponse, error)); ok { return rf(cloudEvent, qos) } - if rf, ok := ret.Get(0).(func(event.Event, types.Qos) *types.PublishResponse); ok { + if rf, ok := ret.Get(0).(func(v2.Event, types.Qos) *types.PublishResponse); ok { r0 = rf(cloudEvent, qos) } else { if ret.Get(0) != nil { @@ -292,7 +291,7 @@ func (_m *PublisherManager) Publish(cloudEvent event.Event, qos types.Qos) (*typ } } - if rf, ok := ret.Get(1).(func(event.Event, types.Qos) error); ok { + if rf, ok := ret.Get(1).(func(v2.Event, types.Qos) error); ok { r1 = rf(cloudEvent, qos) } else { r1 = ret.Error(1) @@ -307,15 +306,15 @@ type PublisherManager_Publish_Call struct { } // Publish is a helper method to define mock.On call -// - cloudEvent event.Event +// - cloudEvent v2.Event // - qos types.Qos func (_e *PublisherManager_Expecter) Publish(cloudEvent interface{}, qos interface{}) *PublisherManager_Publish_Call { return &PublisherManager_Publish_Call{Call: _e.mock.On("Publish", cloudEvent, qos)} } -func (_c *PublisherManager_Publish_Call) Run(run func(cloudEvent event.Event, qos types.Qos)) *PublisherManager_Publish_Call { +func (_c *PublisherManager_Publish_Call) Run(run func(cloudEvent v2.Event, qos types.Qos)) *PublisherManager_Publish_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(event.Event), args[1].(types.Qos)) + run(args[0].(v2.Event), args[1].(types.Qos)) }) return _c } @@ -325,7 +324,7 @@ func (_c *PublisherManager_Publish_Call) Return(_a0 *types.PublishResponse, _a1 return _c } -func (_c *PublisherManager_Publish_Call) RunAndReturn(run func(event.Event, types.Qos) (*types.PublishResponse, error)) *PublisherManager_Publish_Call { +func (_c *PublisherManager_Publish_Call) RunAndReturn(run func(v2.Event, types.Qos) (*types.PublishResponse, error)) *PublisherManager_Publish_Call { _c.Call.Return(run) return _c } diff --git a/pkg/eventing/mocks/manager.go b/pkg/eventing/mocks/manager.go index 5bd320d9..5c7f05fc 100644 --- a/pkg/eventing/mocks/manager.go +++ b/pkg/eventing/mocks/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/k8s/mocks/client.go b/pkg/k8s/mocks/client.go index c2334778..70a3cce8 100644 --- a/pkg/k8s/mocks/client.go +++ b/pkg/k8s/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/subscriptionmanager/manager/mocks/manager.go b/pkg/subscriptionmanager/manager/mocks/manager.go index ba94d03c..08ed2d5e 100644 --- a/pkg/subscriptionmanager/manager/mocks/manager.go +++ b/pkg/subscriptionmanager/manager/mocks/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/subscriptionmanager/mocks/manager_factory.go b/pkg/subscriptionmanager/mocks/manager_factory.go index 7ae411f8..2e40124d 100644 --- a/pkg/subscriptionmanager/mocks/manager_factory.go +++ b/pkg/subscriptionmanager/mocks/manager_factory.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks diff --git a/pkg/watcher/mocks/watcher.go b/pkg/watcher/mocks/watcher.go index 3ae1d6d2..0321f236 100644 --- a/pkg/watcher/mocks/watcher.go +++ b/pkg/watcher/mocks/watcher.go @@ -1,12 +1,10 @@ -// Code generated by mockery v2.45.0. DO NOT EDIT. +// Code generated by mockery v2.46.3. DO NOT EDIT. package mocks import ( - client "sigs.k8s.io/controller-runtime/pkg/client" - event "sigs.k8s.io/controller-runtime/pkg/event" - mock "github.com/stretchr/testify/mock" + event "sigs.k8s.io/controller-runtime/pkg/event" ) // Watcher is an autogenerated mock type for the Watcher type @@ -23,19 +21,19 @@ func (_m *Watcher) EXPECT() *Watcher_Expecter { } // GetEventsChannel provides a mock function with given fields: -func (_m *Watcher) GetEventsChannel() <-chan event.TypedGenericEvent[client.Object] { +func (_m *Watcher) GetEventsChannel() <-chan event.GenericEvent { ret := _m.Called() if len(ret) == 0 { panic("no return value specified for GetEventsChannel") } - var r0 <-chan event.TypedGenericEvent[client.Object] - if rf, ok := ret.Get(0).(func() <-chan event.TypedGenericEvent[client.Object]); ok { + var r0 <-chan event.GenericEvent + if rf, ok := ret.Get(0).(func() <-chan event.GenericEvent); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan event.TypedGenericEvent[client.Object]) + r0 = ret.Get(0).(<-chan event.GenericEvent) } } @@ -59,12 +57,12 @@ func (_c *Watcher_GetEventsChannel_Call) Run(run func()) *Watcher_GetEventsChann return _c } -func (_c *Watcher_GetEventsChannel_Call) Return(_a0 <-chan event.TypedGenericEvent[client.Object]) *Watcher_GetEventsChannel_Call { +func (_c *Watcher_GetEventsChannel_Call) Return(_a0 <-chan event.GenericEvent) *Watcher_GetEventsChannel_Call { _c.Call.Return(_a0) return _c } -func (_c *Watcher_GetEventsChannel_Call) RunAndReturn(run func() <-chan event.TypedGenericEvent[client.Object]) *Watcher_GetEventsChannel_Call { +func (_c *Watcher_GetEventsChannel_Call) RunAndReturn(run func() <-chan event.GenericEvent) *Watcher_GetEventsChannel_Call { _c.Call.Return(run) return _c }