Switch from golang/mock to uber-go/mock

See https://github.com/golang/mock#gomock: golang/mock is no longer
maintained, and should be replaced by go.uber.org/mock.

This allows golang/mock to be dropped from the status and vendored
fields in unwanted-dependencies.json.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
This commit is contained in:
Stephen Kitt
2023-10-02 18:01:56 +02:00
parent 2ec63e0d28
commit 6bf667af06
49 changed files with 630 additions and 351 deletions

View File

@@ -16,6 +16,11 @@ limitations under the License.
// Code generated by MockGen. DO NOT EDIT.
// Source: runtime.go
//
// Generated by this command:
//
// mockgen -source=runtime.go -destination=testing/runtime_mock.go -package=testing Runtime
//
// Package testing is a generated GoMock package.
package testing
@@ -27,7 +32,7 @@ import (
reflect "reflect"
time "time"
gomock "github.com/golang/mock/gomock"
gomock "go.uber.org/mock/gomock"
v1 "k8s.io/api/core/v1"
types "k8s.io/apimachinery/pkg/types"
remotecommand "k8s.io/client-go/tools/remotecommand"
@@ -69,7 +74,7 @@ func (m *MockVersion) Compare(other string) (int, error) {
}
// Compare indicates an expected call of Compare.
func (mr *MockVersionMockRecorder) Compare(other interface{}) *gomock.Call {
func (mr *MockVersionMockRecorder) Compare(other any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Compare", reflect.TypeOf((*MockVersion)(nil).Compare), other)
}
@@ -135,7 +140,7 @@ func (m *MockRuntime) CheckpointContainer(ctx context.Context, options *v10.Chec
}
// CheckpointContainer indicates an expected call of CheckpointContainer.
func (mr *MockRuntimeMockRecorder) CheckpointContainer(ctx, options interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) CheckpointContainer(ctx, options any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckpointContainer", reflect.TypeOf((*MockRuntime)(nil).CheckpointContainer), ctx, options)
}
@@ -149,7 +154,7 @@ func (m *MockRuntime) DeleteContainer(ctx context.Context, containerID container
}
// DeleteContainer indicates an expected call of DeleteContainer.
func (mr *MockRuntimeMockRecorder) DeleteContainer(ctx, containerID interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) DeleteContainer(ctx, containerID any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteContainer", reflect.TypeOf((*MockRuntime)(nil).DeleteContainer), ctx, containerID)
}
@@ -163,7 +168,7 @@ func (m *MockRuntime) GarbageCollect(ctx context.Context, gcPolicy container.GCP
}
// GarbageCollect indicates an expected call of GarbageCollect.
func (mr *MockRuntimeMockRecorder) GarbageCollect(ctx, gcPolicy, allSourcesReady, evictNonDeletedPods interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GarbageCollect(ctx, gcPolicy, allSourcesReady, evictNonDeletedPods any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GarbageCollect", reflect.TypeOf((*MockRuntime)(nil).GarbageCollect), ctx, gcPolicy, allSourcesReady, evictNonDeletedPods)
}
@@ -178,7 +183,7 @@ func (m *MockRuntime) GeneratePodStatus(event *v10.ContainerEventResponse) (*con
}
// GeneratePodStatus indicates an expected call of GeneratePodStatus.
func (mr *MockRuntimeMockRecorder) GeneratePodStatus(event interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GeneratePodStatus(event any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GeneratePodStatus", reflect.TypeOf((*MockRuntime)(nil).GeneratePodStatus), event)
}
@@ -192,7 +197,7 @@ func (m *MockRuntime) GetContainerLogs(ctx context.Context, pod *v1.Pod, contain
}
// GetContainerLogs indicates an expected call of GetContainerLogs.
func (mr *MockRuntimeMockRecorder) GetContainerLogs(ctx, pod, containerID, logOptions, stdout, stderr interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GetContainerLogs(ctx, pod, containerID, logOptions, stdout, stderr any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetContainerLogs", reflect.TypeOf((*MockRuntime)(nil).GetContainerLogs), ctx, pod, containerID, logOptions, stdout, stderr)
}
@@ -207,7 +212,7 @@ func (m *MockRuntime) GetImageRef(ctx context.Context, image container.ImageSpec
}
// GetImageRef indicates an expected call of GetImageRef.
func (mr *MockRuntimeMockRecorder) GetImageRef(ctx, image interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GetImageRef(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImageRef", reflect.TypeOf((*MockRuntime)(nil).GetImageRef), ctx, image)
}
@@ -222,7 +227,7 @@ func (m *MockRuntime) GetImageSize(ctx context.Context, image container.ImageSpe
}
// GetImageSize indicates an expected call of GetImageSize.
func (mr *MockRuntimeMockRecorder) GetImageSize(ctx, image interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GetImageSize(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImageSize", reflect.TypeOf((*MockRuntime)(nil).GetImageSize), ctx, image)
}
@@ -237,7 +242,7 @@ func (m *MockRuntime) GetPodStatus(ctx context.Context, uid types.UID, name, nam
}
// GetPodStatus indicates an expected call of GetPodStatus.
func (mr *MockRuntimeMockRecorder) GetPodStatus(ctx, uid, name, namespace interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GetPodStatus(ctx, uid, name, namespace any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPodStatus", reflect.TypeOf((*MockRuntime)(nil).GetPodStatus), ctx, uid, name, namespace)
}
@@ -252,7 +257,7 @@ func (m *MockRuntime) GetPods(ctx context.Context, all bool) ([]*container.Pod,
}
// GetPods indicates an expected call of GetPods.
func (mr *MockRuntimeMockRecorder) GetPods(ctx, all interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) GetPods(ctx, all any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPods", reflect.TypeOf((*MockRuntime)(nil).GetPods), ctx, all)
}
@@ -267,7 +272,7 @@ func (m *MockRuntime) ImageFsInfo(ctx context.Context) (*v10.ImageFsInfoResponse
}
// ImageFsInfo indicates an expected call of ImageFsInfo.
func (mr *MockRuntimeMockRecorder) ImageFsInfo(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) ImageFsInfo(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImageFsInfo", reflect.TypeOf((*MockRuntime)(nil).ImageFsInfo), ctx)
}
@@ -282,7 +287,7 @@ func (m *MockRuntime) ImageStats(ctx context.Context) (*container.ImageStats, er
}
// ImageStats indicates an expected call of ImageStats.
func (mr *MockRuntimeMockRecorder) ImageStats(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) ImageStats(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImageStats", reflect.TypeOf((*MockRuntime)(nil).ImageStats), ctx)
}
@@ -296,7 +301,7 @@ func (m *MockRuntime) KillPod(ctx context.Context, pod *v1.Pod, runningPod conta
}
// KillPod indicates an expected call of KillPod.
func (mr *MockRuntimeMockRecorder) KillPod(ctx, pod, runningPod, gracePeriodOverride interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) KillPod(ctx, pod, runningPod, gracePeriodOverride any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KillPod", reflect.TypeOf((*MockRuntime)(nil).KillPod), ctx, pod, runningPod, gracePeriodOverride)
}
@@ -311,7 +316,7 @@ func (m *MockRuntime) ListImages(ctx context.Context) ([]container.Image, error)
}
// ListImages indicates an expected call of ListImages.
func (mr *MockRuntimeMockRecorder) ListImages(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) ListImages(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListImages", reflect.TypeOf((*MockRuntime)(nil).ListImages), ctx)
}
@@ -326,7 +331,7 @@ func (m *MockRuntime) ListMetricDescriptors(ctx context.Context) ([]*v10.MetricD
}
// ListMetricDescriptors indicates an expected call of ListMetricDescriptors.
func (mr *MockRuntimeMockRecorder) ListMetricDescriptors(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) ListMetricDescriptors(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListMetricDescriptors", reflect.TypeOf((*MockRuntime)(nil).ListMetricDescriptors), ctx)
}
@@ -341,7 +346,7 @@ func (m *MockRuntime) ListPodSandboxMetrics(ctx context.Context) ([]*v10.PodSand
}
// ListPodSandboxMetrics indicates an expected call of ListPodSandboxMetrics.
func (mr *MockRuntimeMockRecorder) ListPodSandboxMetrics(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) ListPodSandboxMetrics(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListPodSandboxMetrics", reflect.TypeOf((*MockRuntime)(nil).ListPodSandboxMetrics), ctx)
}
@@ -356,7 +361,7 @@ func (m *MockRuntime) PullImage(ctx context.Context, image container.ImageSpec,
}
// PullImage indicates an expected call of PullImage.
func (mr *MockRuntimeMockRecorder) PullImage(ctx, image, pullSecrets, podSandboxConfig interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) PullImage(ctx, image, pullSecrets, podSandboxConfig any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PullImage", reflect.TypeOf((*MockRuntime)(nil).PullImage), ctx, image, pullSecrets, podSandboxConfig)
}
@@ -370,7 +375,7 @@ func (m *MockRuntime) RemoveImage(ctx context.Context, image container.ImageSpec
}
// RemoveImage indicates an expected call of RemoveImage.
func (mr *MockRuntimeMockRecorder) RemoveImage(ctx, image interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) RemoveImage(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveImage", reflect.TypeOf((*MockRuntime)(nil).RemoveImage), ctx, image)
}
@@ -385,7 +390,7 @@ func (m *MockRuntime) Status(ctx context.Context) (*container.RuntimeStatus, err
}
// Status indicates an expected call of Status.
func (mr *MockRuntimeMockRecorder) Status(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) Status(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Status", reflect.TypeOf((*MockRuntime)(nil).Status), ctx)
}
@@ -399,7 +404,7 @@ func (m *MockRuntime) SyncPod(ctx context.Context, pod *v1.Pod, podStatus *conta
}
// SyncPod indicates an expected call of SyncPod.
func (mr *MockRuntimeMockRecorder) SyncPod(ctx, pod, podStatus, pullSecrets, backOff interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) SyncPod(ctx, pod, podStatus, pullSecrets, backOff any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncPod", reflect.TypeOf((*MockRuntime)(nil).SyncPod), ctx, pod, podStatus, pullSecrets, backOff)
}
@@ -427,7 +432,7 @@ func (m *MockRuntime) UpdatePodCIDR(ctx context.Context, podCIDR string) error {
}
// UpdatePodCIDR indicates an expected call of UpdatePodCIDR.
func (mr *MockRuntimeMockRecorder) UpdatePodCIDR(ctx, podCIDR interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) UpdatePodCIDR(ctx, podCIDR any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePodCIDR", reflect.TypeOf((*MockRuntime)(nil).UpdatePodCIDR), ctx, podCIDR)
}
@@ -442,7 +447,7 @@ func (m *MockRuntime) Version(ctx context.Context) (container.Version, error) {
}
// Version indicates an expected call of Version.
func (mr *MockRuntimeMockRecorder) Version(ctx interface{}) *gomock.Call {
func (mr *MockRuntimeMockRecorder) Version(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Version", reflect.TypeOf((*MockRuntime)(nil).Version), ctx)
}
@@ -480,7 +485,7 @@ func (m *MockStreamingRuntime) GetAttach(ctx context.Context, id container.Conta
}
// GetAttach indicates an expected call of GetAttach.
func (mr *MockStreamingRuntimeMockRecorder) GetAttach(ctx, id, stdin, stdout, stderr, tty interface{}) *gomock.Call {
func (mr *MockStreamingRuntimeMockRecorder) GetAttach(ctx, id, stdin, stdout, stderr, tty any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAttach", reflect.TypeOf((*MockStreamingRuntime)(nil).GetAttach), ctx, id, stdin, stdout, stderr, tty)
}
@@ -495,7 +500,7 @@ func (m *MockStreamingRuntime) GetExec(ctx context.Context, id container.Contain
}
// GetExec indicates an expected call of GetExec.
func (mr *MockStreamingRuntimeMockRecorder) GetExec(ctx, id, cmd, stdin, stdout, stderr, tty interface{}) *gomock.Call {
func (mr *MockStreamingRuntimeMockRecorder) GetExec(ctx, id, cmd, stdin, stdout, stderr, tty any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetExec", reflect.TypeOf((*MockStreamingRuntime)(nil).GetExec), ctx, id, cmd, stdin, stdout, stderr, tty)
}
@@ -510,7 +515,7 @@ func (m *MockStreamingRuntime) GetPortForward(ctx context.Context, podName, podN
}
// GetPortForward indicates an expected call of GetPortForward.
func (mr *MockStreamingRuntimeMockRecorder) GetPortForward(ctx, podName, podNamespace, podUID, ports interface{}) *gomock.Call {
func (mr *MockStreamingRuntimeMockRecorder) GetPortForward(ctx, podName, podNamespace, podUID, ports any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPortForward", reflect.TypeOf((*MockStreamingRuntime)(nil).GetPortForward), ctx, podName, podNamespace, podUID, ports)
}
@@ -548,7 +553,7 @@ func (m *MockImageService) GetImageRef(ctx context.Context, image container.Imag
}
// GetImageRef indicates an expected call of GetImageRef.
func (mr *MockImageServiceMockRecorder) GetImageRef(ctx, image interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) GetImageRef(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImageRef", reflect.TypeOf((*MockImageService)(nil).GetImageRef), ctx, image)
}
@@ -563,7 +568,7 @@ func (m *MockImageService) GetImageSize(ctx context.Context, image container.Ima
}
// GetImageSize indicates an expected call of GetImageSize.
func (mr *MockImageServiceMockRecorder) GetImageSize(ctx, image interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) GetImageSize(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImageSize", reflect.TypeOf((*MockImageService)(nil).GetImageSize), ctx, image)
}
@@ -578,7 +583,7 @@ func (m *MockImageService) ImageFsInfo(ctx context.Context) (*v10.ImageFsInfoRes
}
// ImageFsInfo indicates an expected call of ImageFsInfo.
func (mr *MockImageServiceMockRecorder) ImageFsInfo(ctx interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) ImageFsInfo(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImageFsInfo", reflect.TypeOf((*MockImageService)(nil).ImageFsInfo), ctx)
}
@@ -593,7 +598,7 @@ func (m *MockImageService) ImageStats(ctx context.Context) (*container.ImageStat
}
// ImageStats indicates an expected call of ImageStats.
func (mr *MockImageServiceMockRecorder) ImageStats(ctx interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) ImageStats(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImageStats", reflect.TypeOf((*MockImageService)(nil).ImageStats), ctx)
}
@@ -608,7 +613,7 @@ func (m *MockImageService) ListImages(ctx context.Context) ([]container.Image, e
}
// ListImages indicates an expected call of ListImages.
func (mr *MockImageServiceMockRecorder) ListImages(ctx interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) ListImages(ctx any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListImages", reflect.TypeOf((*MockImageService)(nil).ListImages), ctx)
}
@@ -623,7 +628,7 @@ func (m *MockImageService) PullImage(ctx context.Context, image container.ImageS
}
// PullImage indicates an expected call of PullImage.
func (mr *MockImageServiceMockRecorder) PullImage(ctx, image, pullSecrets, podSandboxConfig interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) PullImage(ctx, image, pullSecrets, podSandboxConfig any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PullImage", reflect.TypeOf((*MockImageService)(nil).PullImage), ctx, image, pullSecrets, podSandboxConfig)
}
@@ -637,7 +642,7 @@ func (m *MockImageService) RemoveImage(ctx context.Context, image container.Imag
}
// RemoveImage indicates an expected call of RemoveImage.
func (mr *MockImageServiceMockRecorder) RemoveImage(ctx, image interface{}) *gomock.Call {
func (mr *MockImageServiceMockRecorder) RemoveImage(ctx, image any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveImage", reflect.TypeOf((*MockImageService)(nil).RemoveImage), ctx, image)
}
@@ -674,7 +679,7 @@ func (m *MockAttacher) AttachContainer(ctx context.Context, id container.Contain
}
// AttachContainer indicates an expected call of AttachContainer.
func (mr *MockAttacherMockRecorder) AttachContainer(ctx, id, stdin, stdout, stderr, tty, resize interface{}) *gomock.Call {
func (mr *MockAttacherMockRecorder) AttachContainer(ctx, id, stdin, stdout, stderr, tty, resize any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttachContainer", reflect.TypeOf((*MockAttacher)(nil).AttachContainer), ctx, id, stdin, stdout, stderr, tty, resize)
}
@@ -712,7 +717,7 @@ func (m *MockCommandRunner) RunInContainer(ctx context.Context, id container.Con
}
// RunInContainer indicates an expected call of RunInContainer.
func (mr *MockCommandRunnerMockRecorder) RunInContainer(ctx, id, cmd, timeout interface{}) *gomock.Call {
func (mr *MockCommandRunnerMockRecorder) RunInContainer(ctx, id, cmd, timeout any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RunInContainer", reflect.TypeOf((*MockCommandRunner)(nil).RunInContainer), ctx, id, cmd, timeout)
}