diff --git a/Dockerfile_generator b/Dockerfile_generator index ad2ff1d87f..934f42f32a 100644 --- a/Dockerfile_generator +++ b/Dockerfile_generator @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE FROM ${BUILDER_IMAGE} as builder # Install tools -RUN go install github.com/vektra/mockery/v2@v2.13.0 && \ +RUN go install github.com/vektra/mockery/v2@v2.20.0 && \ go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 && \ git clone https://github.com/kubernetes/code-generator -b v0.24.3 --depth 1 && \ go install k8s.io/code-generator/cmd/...@v0.24.3 && \ diff --git a/hack/generate.sh b/hack/generate.sh index 0d5c165d61..e851a5d5c6 100755 --- a/hack/generate.sh +++ b/hack/generate.sh @@ -3,6 +3,9 @@ set -o pipefail # Default path for code-generator repo K8S_CODE_GENERATOR=${K8S_CODE_GENERATOR:-../code-generator} +# Omit version control information (buildvcs) +export GOENV="/go/env" +go env -w GOFLAGS="-buildvcs=false" go mod vendor diff --git a/pkg/apihelper/mock_APIHelpers.go b/pkg/apihelper/mock_APIHelpers.go index 7e677339f5..bd136f04ab 100644 --- a/pkg/apihelper/mock_APIHelpers.go +++ b/pkg/apihelper/mock_APIHelpers.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.13.0. DO NOT EDIT. +// Code generated by mockery v2.20.0. DO NOT EDIT. package apihelper @@ -21,6 +21,10 @@ func (_m *MockAPIHelpers) GetClient() (*kubernetes.Clientset, error) { ret := _m.Called() var r0 *kubernetes.Clientset + var r1 error + if rf, ok := ret.Get(0).(func() (*kubernetes.Clientset, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() *kubernetes.Clientset); ok { r0 = rf() } else { @@ -29,7 +33,6 @@ func (_m *MockAPIHelpers) GetClient() (*kubernetes.Clientset, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -44,6 +47,10 @@ func (_m *MockAPIHelpers) GetNode(_a0 *kubernetes.Clientset, _a1 string) (*v1.No ret := _m.Called(_a0, _a1) var r0 *v1.Node + var r1 error + if rf, ok := ret.Get(0).(func(*kubernetes.Clientset, string) (*v1.Node, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(*kubernetes.Clientset, string) *v1.Node); ok { r0 = rf(_a0, _a1) } else { @@ -52,7 +59,6 @@ func (_m *MockAPIHelpers) GetNode(_a0 *kubernetes.Clientset, _a1 string) (*v1.No } } - var r1 error if rf, ok := ret.Get(1).(func(*kubernetes.Clientset, string) error); ok { r1 = rf(_a0, _a1) } else { @@ -67,6 +73,10 @@ func (_m *MockAPIHelpers) GetNodes(_a0 *kubernetes.Clientset) (*v1.NodeList, err ret := _m.Called(_a0) var r0 *v1.NodeList + var r1 error + if rf, ok := ret.Get(0).(func(*kubernetes.Clientset) (*v1.NodeList, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(*kubernetes.Clientset) *v1.NodeList); ok { r0 = rf(_a0) } else { @@ -75,7 +85,6 @@ func (_m *MockAPIHelpers) GetNodes(_a0 *kubernetes.Clientset) (*v1.NodeList, err } } - var r1 error if rf, ok := ret.Get(1).(func(*kubernetes.Clientset) error); ok { r1 = rf(_a0) } else { @@ -90,6 +99,10 @@ func (_m *MockAPIHelpers) GetPod(_a0 *kubernetes.Clientset, _a1 string, _a2 stri ret := _m.Called(_a0, _a1, _a2) var r0 *v1.Pod + var r1 error + if rf, ok := ret.Get(0).(func(*kubernetes.Clientset, string, string) (*v1.Pod, error)); ok { + return rf(_a0, _a1, _a2) + } if rf, ok := ret.Get(0).(func(*kubernetes.Clientset, string, string) *v1.Pod); ok { r0 = rf(_a0, _a1, _a2) } else { @@ -98,7 +111,6 @@ func (_m *MockAPIHelpers) GetPod(_a0 *kubernetes.Clientset, _a1 string, _a2 stri } } - var r1 error if rf, ok := ret.Get(1).(func(*kubernetes.Clientset, string, string) error); ok { r1 = rf(_a0, _a1, _a2) } else { @@ -113,6 +125,10 @@ func (_m *MockAPIHelpers) GetTopologyClient() (*versioned.Clientset, error) { ret := _m.Called() var r0 *versioned.Clientset + var r1 error + if rf, ok := ret.Get(0).(func() (*versioned.Clientset, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() *versioned.Clientset); ok { r0 = rf() } else { @@ -121,7 +137,6 @@ func (_m *MockAPIHelpers) GetTopologyClient() (*versioned.Clientset, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -173,13 +188,13 @@ func (_m *MockAPIHelpers) UpdateNode(_a0 *kubernetes.Clientset, _a1 *v1.Node) er return r0 } -type NewMockAPIHelpersT interface { +type mockConstructorTestingTNewMockAPIHelpers interface { mock.TestingT Cleanup(func()) } // NewMockAPIHelpers creates a new instance of MockAPIHelpers. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockAPIHelpers(t NewMockAPIHelpersT) *MockAPIHelpers { +func NewMockAPIHelpers(t mockConstructorTestingTNewMockAPIHelpers) *MockAPIHelpers { mock := &MockAPIHelpers{} mock.Mock.Test(t) diff --git a/pkg/apis/nfd/v1alpha1/generated.pb.go b/pkg/apis/nfd/v1alpha1/generated.pb.go index 4593b92693..cd242d98df 100644 --- a/pkg/apis/nfd/v1alpha1/generated.pb.go +++ b/pkg/apis/nfd/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/nfd/v1alpha1/generated.proto b/pkg/apis/nfd/v1alpha1/generated.proto index e3d26de3d3..278356ed54 100644 --- a/pkg/apis/nfd/v1alpha1/generated.proto +++ b/pkg/apis/nfd/v1alpha1/generated.proto @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index e61b0938b3..b798df4e8b 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go index ab7539cb9f..d1411fc84b 100644 --- a/pkg/generated/clientset/versioned/doc.go +++ b/pkg/generated/clientset/versioned/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index 9ba9e83904..5571110915 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go index 7d98eabcc8..50d0812d7f 100644 --- a/pkg/generated/clientset/versioned/fake/doc.go +++ b/pkg/generated/clientset/versioned/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index 3e4c4829fb..b48e81565b 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go index 288d3794dc..6aa6c1e434 100644 --- a/pkg/generated/clientset/versioned/scheme/doc.go +++ b/pkg/generated/clientset/versioned/scheme/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index cd74092030..89297224c6 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go index 5362dda2ff..a022e3e2c6 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go index dd9e9e4c8f..1672f9cfa1 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go index 4022cd3691..bc748c80e3 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go index 1986bf6181..bac98b488b 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go index 158ff71a1d..b5dce863eb 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go index cf392dd100..30853f1cac 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go index 8ecaf1998d..5a0a853cfd 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go index bf6d9b1759..d058d0ed7b 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go index d7d4428adf..606ae14f93 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go +++ b/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index e64a77d356..01caa99ee6 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index 5c2b9eda3b..8139775712 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 0b862ce98d..1f76cb3785 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/nfd/interface.go b/pkg/generated/informers/externalversions/nfd/interface.go index 8130adf7d8..60209f4167 100644 --- a/pkg/generated/informers/externalversions/nfd/interface.go +++ b/pkg/generated/informers/externalversions/nfd/interface.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go b/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go index 1cae0cfc24..5292d87ae3 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go +++ b/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go b/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go index 20ea65f561..870ba01ac7 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go +++ b/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go b/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go index 6879a711d9..10ca5b3e03 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go +++ b/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/listers/nfd/v1alpha1/expansion_generated.go b/pkg/generated/listers/nfd/v1alpha1/expansion_generated.go index 5e6fc01e4d..b12e45a004 100644 --- a/pkg/generated/listers/nfd/v1alpha1/expansion_generated.go +++ b/pkg/generated/listers/nfd/v1alpha1/expansion_generated.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/listers/nfd/v1alpha1/nodefeature.go b/pkg/generated/listers/nfd/v1alpha1/nodefeature.go index 011dffd559..f06a33ef93 100644 --- a/pkg/generated/listers/nfd/v1alpha1/nodefeature.go +++ b/pkg/generated/listers/nfd/v1alpha1/nodefeature.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go b/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go index e214509134..5bd836646e 100644 --- a/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go +++ b/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/labeler/mock_LabelerClient.go b/pkg/labeler/mock_LabelerClient.go index 3d16340628..1615a68d72 100644 --- a/pkg/labeler/mock_LabelerClient.go +++ b/pkg/labeler/mock_LabelerClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.13.0. DO NOT EDIT. +// Code generated by mockery v2.20.0. DO NOT EDIT. package labeler @@ -27,6 +27,10 @@ func (_m *MockLabelerClient) SetLabels(ctx context.Context, in *SetLabelsRequest ret := _m.Called(_ca...) var r0 *SetLabelsReply + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *SetLabelsRequest, ...grpc.CallOption) (*SetLabelsReply, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *SetLabelsRequest, ...grpc.CallOption) *SetLabelsReply); ok { r0 = rf(ctx, in, opts...) } else { @@ -35,7 +39,6 @@ func (_m *MockLabelerClient) SetLabels(ctx context.Context, in *SetLabelsRequest } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *SetLabelsRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -45,13 +48,13 @@ func (_m *MockLabelerClient) SetLabels(ctx context.Context, in *SetLabelsRequest return r0, r1 } -type NewMockLabelerClientT interface { +type mockConstructorTestingTNewMockLabelerClient interface { mock.TestingT Cleanup(func()) } // NewMockLabelerClient creates a new instance of MockLabelerClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockLabelerClient(t NewMockLabelerClientT) *MockLabelerClient { +func NewMockLabelerClient(t mockConstructorTestingTNewMockLabelerClient) *MockLabelerClient { mock := &MockLabelerClient{} mock.Mock.Test(t) diff --git a/source/mock_LabelSource.go b/source/mock_LabelSource.go index 1c9606279e..2e2d2ba70c 100644 --- a/source/mock_LabelSource.go +++ b/source/mock_LabelSource.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.13.0. DO NOT EDIT. +// Code generated by mockery v2.20.0. DO NOT EDIT. package source @@ -14,6 +14,10 @@ func (_m *MockLabelSource) GetLabels() (FeatureLabels, error) { ret := _m.Called() var r0 FeatureLabels + var r1 error + if rf, ok := ret.Get(0).(func() (FeatureLabels, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() FeatureLabels); ok { r0 = rf() } else { @@ -22,7 +26,6 @@ func (_m *MockLabelSource) GetLabels() (FeatureLabels, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -60,13 +63,13 @@ func (_m *MockLabelSource) Priority() int { return r0 } -type NewMockLabelSourceT interface { +type mockConstructorTestingTNewMockLabelSource interface { mock.TestingT Cleanup(func()) } // NewMockLabelSource creates a new instance of MockLabelSource. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockLabelSource(t NewMockLabelSourceT) *MockLabelSource { +func NewMockLabelSource(t mockConstructorTestingTNewMockLabelSource) *MockLabelSource { mock := &MockLabelSource{} mock.Mock.Test(t)