Răsfoiți Sursa

github.com/golang/mock is deprecated

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 1 an în urmă
părinte
comite
74cc091225

+ 1 - 1
Makefile

@@ -89,7 +89,7 @@ build-and-e2e-compose-standalone: build e2e-compose-standalone ## Compile the co
 
 .PHONY: mocks
 mocks:
-	mockgen --version >/dev/null 2>&1 || go install github.com/golang/mock/[email protected].0
+	mockgen --version >/dev/null 2>&1 || go install go.uber.org/mock/[email protected].0
 	mockgen -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/cli/command Cli
 	mockgen -destination pkg/mocks/mock_docker_api.go -package mocks github.com/docker/docker/client APIClient
 	mockgen -destination pkg/mocks/mock_docker_compose_api.go -package mocks -source=./pkg/api/api.go Service

+ 1 - 1
cmd/compose/create_test.go

@@ -25,9 +25,9 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/mocks"
-	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 )
 
 func TestRunCreate(t *testing.T) {

+ 1 - 1
cmd/compose/ps_test.go

@@ -26,8 +26,8 @@ import (
 	"github.com/docker/cli/cli/streams"
 	"github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/mocks"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 )
 
 func TestPsTable(t *testing.T) {

+ 1 - 1
go.mod

@@ -18,7 +18,6 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.5.0
 	github.com/fsnotify/fsevents v0.1.1
-	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-version v1.6.0
@@ -44,6 +43,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
 	go.uber.org/goleak v1.3.0
+	go.uber.org/mock v0.3.0
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/sync v0.5.0
 	golang.org/x/sys v0.15.0

+ 2 - 6
go.sum

@@ -265,8 +265,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -580,7 +578,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -617,6 +614,8 @@ go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
+go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -663,7 +662,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -719,7 +717,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -834,7 +831,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=

+ 1 - 1
pkg/compose/convergence_test.go

@@ -26,7 +26,7 @@ import (
 	moby "github.com/docker/docker/api/types"
 	containerType "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
 	"github.com/docker/compose/v2/pkg/api"

+ 1 - 1
pkg/compose/down_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/errdefs"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
 	compose "github.com/docker/compose/v2/pkg/api"

+ 1 - 1
pkg/compose/kill_test.go

@@ -27,7 +27,7 @@ import (
 	containerType "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
 	compose "github.com/docker/compose/v2/pkg/api"

+ 1 - 1
pkg/compose/logs_test.go

@@ -28,9 +28,9 @@ import (
 	containerType "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
 	compose "github.com/docker/compose/v2/pkg/api"
 )

+ 1 - 1
pkg/compose/ps_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	containerType "github.com/docker/docker/api/types/container"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
 	compose "github.com/docker/compose/v2/pkg/api"

+ 1 - 1
pkg/compose/stop_test.go

@@ -30,7 +30,7 @@ import (
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 )
 

+ 1 - 1
pkg/compose/viz_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 
 	compose "github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/mocks"

+ 1 - 1
pkg/compose/watch_test.go

@@ -26,9 +26,9 @@ import (
 	"github.com/docker/compose/v2/pkg/mocks"
 	"github.com/docker/compose/v2/pkg/watch"
 	moby "github.com/docker/docker/api/types"
-	"github.com/golang/mock/gomock"
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 )
 

Fișier diff suprimat deoarece este prea mare
+ 123 - 117
pkg/mocks/mock_docker_api.go


+ 11 - 7
pkg/mocks/mock_docker_cli.go

@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/docker/cli/cli/command (interfaces: Cli)
-
+//
+// Generated by this command:
+//
+//	mockgen -destination pkg/mocks/mock_docker_cli.go -package mocks github.com/docker/cli/cli/command Cli
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -17,8 +21,8 @@ import (
 	streams "github.com/docker/cli/cli/streams"
 	trust "github.com/docker/cli/cli/trust"
 	client0 "github.com/docker/docker/client"
-	gomock "github.com/golang/mock/gomock"
 	client1 "github.com/theupdateframework/notary/client"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockCli is a mock of Cli interface.
@@ -47,7 +51,7 @@ func (m *MockCli) EXPECT() *MockCliMockRecorder {
 // Apply mocks base method.
 func (m *MockCli) Apply(arg0 ...command.DockerCliOption) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
+	varargs := []any{}
 	for _, a := range arg0 {
 		varargs = append(varargs, a)
 	}
@@ -57,7 +61,7 @@ func (m *MockCli) Apply(arg0 ...command.DockerCliOption) error {
 }
 
 // Apply indicates an expected call of Apply.
-func (mr *MockCliMockRecorder) Apply(arg0 ...interface{}) *gomock.Call {
+func (mr *MockCliMockRecorder) Apply(arg0 ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockCli)(nil).Apply), arg0...)
 }
@@ -241,7 +245,7 @@ func (m *MockCli) NotaryClient(arg0 trust.ImageRefAndAuth, arg1 []string) (clien
 }
 
 // NotaryClient indicates an expected call of NotaryClient.
-func (mr *MockCliMockRecorder) NotaryClient(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockCliMockRecorder) NotaryClient(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotaryClient", reflect.TypeOf((*MockCli)(nil).NotaryClient), arg0, arg1)
 }
@@ -269,7 +273,7 @@ func (m *MockCli) RegistryClient(arg0 bool) client.RegistryClient {
 }
 
 // RegistryClient indicates an expected call of RegistryClient.
-func (mr *MockCliMockRecorder) RegistryClient(arg0 interface{}) *gomock.Call {
+func (mr *MockCliMockRecorder) RegistryClient(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegistryClient", reflect.TypeOf((*MockCli)(nil).RegistryClient), arg0)
 }
@@ -295,7 +299,7 @@ func (m *MockCli) SetIn(arg0 *streams.In) {
 }
 
 // SetIn indicates an expected call of SetIn.
-func (mr *MockCliMockRecorder) SetIn(arg0 interface{}) *gomock.Call {
+func (mr *MockCliMockRecorder) SetIn(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetIn", reflect.TypeOf((*MockCli)(nil).SetIn), arg0)
 }

+ 41 - 37
pkg/mocks/mock_docker_compose_api.go

@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./pkg/api/api.go
-
+//
+// Generated by this command:
+//
+//	mockgen -destination pkg/mocks/mock_docker_compose_api.go -package mocks -source=./pkg/api/api.go Service
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -10,7 +14,7 @@ import (
 
 	types "github.com/compose-spec/compose-go/v2/types"
 	api "github.com/docker/compose/v2/pkg/api"
-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockService is a mock of Service interface.
@@ -45,7 +49,7 @@ func (m *MockService) Build(ctx context.Context, project *types.Project, options
 }
 
 // Build indicates an expected call of Build.
-func (mr *MockServiceMockRecorder) Build(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Build(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Build", reflect.TypeOf((*MockService)(nil).Build), ctx, project, options)
 }
@@ -60,7 +64,7 @@ func (m *MockService) Config(ctx context.Context, project *types.Project, option
 }
 
 // Config indicates an expected call of Config.
-func (mr *MockServiceMockRecorder) Config(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Config(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Config", reflect.TypeOf((*MockService)(nil).Config), ctx, project, options)
 }
@@ -74,7 +78,7 @@ func (m *MockService) Copy(ctx context.Context, projectName string, options api.
 }
 
 // Copy indicates an expected call of Copy.
-func (mr *MockServiceMockRecorder) Copy(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Copy(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Copy", reflect.TypeOf((*MockService)(nil).Copy), ctx, projectName, options)
 }
@@ -88,7 +92,7 @@ func (m *MockService) Create(ctx context.Context, project *types.Project, option
 }
 
 // Create indicates an expected call of Create.
-func (mr *MockServiceMockRecorder) Create(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Create(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockService)(nil).Create), ctx, project, options)
 }
@@ -102,7 +106,7 @@ func (m *MockService) Down(ctx context.Context, projectName string, options api.
 }
 
 // Down indicates an expected call of Down.
-func (mr *MockServiceMockRecorder) Down(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Down(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Down", reflect.TypeOf((*MockService)(nil).Down), ctx, projectName, options)
 }
@@ -117,7 +121,7 @@ func (m *MockService) DryRunMode(ctx context.Context, dryRun bool) (context.Cont
 }
 
 // DryRunMode indicates an expected call of DryRunMode.
-func (mr *MockServiceMockRecorder) DryRunMode(ctx, dryRun interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) DryRunMode(ctx, dryRun any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DryRunMode", reflect.TypeOf((*MockService)(nil).DryRunMode), ctx, dryRun)
 }
@@ -131,7 +135,7 @@ func (m *MockService) Events(ctx context.Context, projectName string, options ap
 }
 
 // Events indicates an expected call of Events.
-func (mr *MockServiceMockRecorder) Events(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Events(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Events", reflect.TypeOf((*MockService)(nil).Events), ctx, projectName, options)
 }
@@ -146,7 +150,7 @@ func (m *MockService) Exec(ctx context.Context, projectName string, options api.
 }
 
 // Exec indicates an expected call of Exec.
-func (mr *MockServiceMockRecorder) Exec(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Exec(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockService)(nil).Exec), ctx, projectName, options)
 }
@@ -161,7 +165,7 @@ func (m *MockService) Images(ctx context.Context, projectName string, options ap
 }
 
 // Images indicates an expected call of Images.
-func (mr *MockServiceMockRecorder) Images(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Images(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Images", reflect.TypeOf((*MockService)(nil).Images), ctx, projectName, options)
 }
@@ -175,7 +179,7 @@ func (m *MockService) Kill(ctx context.Context, projectName string, options api.
 }
 
 // Kill indicates an expected call of Kill.
-func (mr *MockServiceMockRecorder) Kill(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Kill(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Kill", reflect.TypeOf((*MockService)(nil).Kill), ctx, projectName, options)
 }
@@ -190,7 +194,7 @@ func (m *MockService) List(ctx context.Context, options api.ListOptions) ([]api.
 }
 
 // List indicates an expected call of List.
-func (mr *MockServiceMockRecorder) List(ctx, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) List(ctx, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockService)(nil).List), ctx, options)
 }
@@ -204,7 +208,7 @@ func (m *MockService) Logs(ctx context.Context, projectName string, consumer api
 }
 
 // Logs indicates an expected call of Logs.
-func (mr *MockServiceMockRecorder) Logs(ctx, projectName, consumer, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Logs(ctx, projectName, consumer, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logs", reflect.TypeOf((*MockService)(nil).Logs), ctx, projectName, consumer, options)
 }
@@ -216,7 +220,7 @@ func (m *MockService) MaxConcurrency(parallel int) {
 }
 
 // MaxConcurrency indicates an expected call of MaxConcurrency.
-func (mr *MockServiceMockRecorder) MaxConcurrency(parallel interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) MaxConcurrency(parallel any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MaxConcurrency", reflect.TypeOf((*MockService)(nil).MaxConcurrency), parallel)
 }
@@ -230,7 +234,7 @@ func (m *MockService) Pause(ctx context.Context, projectName string, options api
 }
 
 // Pause indicates an expected call of Pause.
-func (mr *MockServiceMockRecorder) Pause(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Pause(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Pause", reflect.TypeOf((*MockService)(nil).Pause), ctx, projectName, options)
 }
@@ -246,7 +250,7 @@ func (m *MockService) Port(ctx context.Context, projectName, service string, por
 }
 
 // Port indicates an expected call of Port.
-func (mr *MockServiceMockRecorder) Port(ctx, projectName, service, port, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Port(ctx, projectName, service, port, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Port", reflect.TypeOf((*MockService)(nil).Port), ctx, projectName, service, port, options)
 }
@@ -261,7 +265,7 @@ func (m *MockService) Ps(ctx context.Context, projectName string, options api.Ps
 }
 
 // Ps indicates an expected call of Ps.
-func (mr *MockServiceMockRecorder) Ps(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Ps(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ps", reflect.TypeOf((*MockService)(nil).Ps), ctx, projectName, options)
 }
@@ -275,7 +279,7 @@ func (m *MockService) Publish(ctx context.Context, project *types.Project, repos
 }
 
 // Publish indicates an expected call of Publish.
-func (mr *MockServiceMockRecorder) Publish(ctx, project, repository, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Publish(ctx, project, repository, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Publish", reflect.TypeOf((*MockService)(nil).Publish), ctx, project, repository, options)
 }
@@ -289,7 +293,7 @@ func (m *MockService) Pull(ctx context.Context, project *types.Project, options
 }
 
 // Pull indicates an expected call of Pull.
-func (mr *MockServiceMockRecorder) Pull(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Pull(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Pull", reflect.TypeOf((*MockService)(nil).Pull), ctx, project, options)
 }
@@ -303,7 +307,7 @@ func (m *MockService) Push(ctx context.Context, project *types.Project, options
 }
 
 // Push indicates an expected call of Push.
-func (mr *MockServiceMockRecorder) Push(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Push(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Push", reflect.TypeOf((*MockService)(nil).Push), ctx, project, options)
 }
@@ -317,7 +321,7 @@ func (m *MockService) Remove(ctx context.Context, projectName string, options ap
 }
 
 // Remove indicates an expected call of Remove.
-func (mr *MockServiceMockRecorder) Remove(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Remove(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Remove", reflect.TypeOf((*MockService)(nil).Remove), ctx, projectName, options)
 }
@@ -331,7 +335,7 @@ func (m *MockService) Restart(ctx context.Context, projectName string, options a
 }
 
 // Restart indicates an expected call of Restart.
-func (mr *MockServiceMockRecorder) Restart(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Restart(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Restart", reflect.TypeOf((*MockService)(nil).Restart), ctx, projectName, options)
 }
@@ -346,7 +350,7 @@ func (m *MockService) RunOneOffContainer(ctx context.Context, project *types.Pro
 }
 
 // RunOneOffContainer indicates an expected call of RunOneOffContainer.
-func (mr *MockServiceMockRecorder) RunOneOffContainer(ctx, project, opts interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) RunOneOffContainer(ctx, project, opts any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RunOneOffContainer", reflect.TypeOf((*MockService)(nil).RunOneOffContainer), ctx, project, opts)
 }
@@ -360,7 +364,7 @@ func (m *MockService) Scale(ctx context.Context, project *types.Project, options
 }
 
 // Scale indicates an expected call of Scale.
-func (mr *MockServiceMockRecorder) Scale(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Scale(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scale", reflect.TypeOf((*MockService)(nil).Scale), ctx, project, options)
 }
@@ -374,7 +378,7 @@ func (m *MockService) Start(ctx context.Context, projectName string, options api
 }
 
 // Start indicates an expected call of Start.
-func (mr *MockServiceMockRecorder) Start(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Start(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockService)(nil).Start), ctx, projectName, options)
 }
@@ -388,7 +392,7 @@ func (m *MockService) Stop(ctx context.Context, projectName string, options api.
 }
 
 // Stop indicates an expected call of Stop.
-func (mr *MockServiceMockRecorder) Stop(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Stop(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockService)(nil).Stop), ctx, projectName, options)
 }
@@ -403,7 +407,7 @@ func (m *MockService) Top(ctx context.Context, projectName string, services []st
 }
 
 // Top indicates an expected call of Top.
-func (mr *MockServiceMockRecorder) Top(ctx, projectName, services interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Top(ctx, projectName, services any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Top", reflect.TypeOf((*MockService)(nil).Top), ctx, projectName, services)
 }
@@ -417,7 +421,7 @@ func (m *MockService) UnPause(ctx context.Context, projectName string, options a
 }
 
 // UnPause indicates an expected call of UnPause.
-func (mr *MockServiceMockRecorder) UnPause(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) UnPause(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnPause", reflect.TypeOf((*MockService)(nil).UnPause), ctx, projectName, options)
 }
@@ -431,7 +435,7 @@ func (m *MockService) Up(ctx context.Context, project *types.Project, options ap
 }
 
 // Up indicates an expected call of Up.
-func (mr *MockServiceMockRecorder) Up(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Up(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Up", reflect.TypeOf((*MockService)(nil).Up), ctx, project, options)
 }
@@ -446,7 +450,7 @@ func (m *MockService) Viz(ctx context.Context, project *types.Project, options a
 }
 
 // Viz indicates an expected call of Viz.
-func (mr *MockServiceMockRecorder) Viz(ctx, project, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Viz(ctx, project, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Viz", reflect.TypeOf((*MockService)(nil).Viz), ctx, project, options)
 }
@@ -461,7 +465,7 @@ func (m *MockService) Wait(ctx context.Context, projectName string, options api.
 }
 
 // Wait indicates an expected call of Wait.
-func (mr *MockServiceMockRecorder) Wait(ctx, projectName, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Wait(ctx, projectName, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Wait", reflect.TypeOf((*MockService)(nil).Wait), ctx, projectName, options)
 }
@@ -475,7 +479,7 @@ func (m *MockService) Watch(ctx context.Context, project *types.Project, service
 }
 
 // Watch indicates an expected call of Watch.
-func (mr *MockServiceMockRecorder) Watch(ctx, project, services, options interface{}) *gomock.Call {
+func (mr *MockServiceMockRecorder) Watch(ctx, project, services, options any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockService)(nil).Watch), ctx, project, services, options)
 }
@@ -510,7 +514,7 @@ func (m *MockLogConsumer) Err(containerName, message string) {
 }
 
 // Err indicates an expected call of Err.
-func (mr *MockLogConsumerMockRecorder) Err(containerName, message interface{}) *gomock.Call {
+func (mr *MockLogConsumerMockRecorder) Err(containerName, message any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Err", reflect.TypeOf((*MockLogConsumer)(nil).Err), containerName, message)
 }
@@ -522,7 +526,7 @@ func (m *MockLogConsumer) Log(containerName, message string) {
 }
 
 // Log indicates an expected call of Log.
-func (mr *MockLogConsumerMockRecorder) Log(containerName, message interface{}) *gomock.Call {
+func (mr *MockLogConsumerMockRecorder) Log(containerName, message any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Log", reflect.TypeOf((*MockLogConsumer)(nil).Log), containerName, message)
 }
@@ -534,7 +538,7 @@ func (m *MockLogConsumer) Register(container string) {
 }
 
 // Register indicates an expected call of Register.
-func (mr *MockLogConsumerMockRecorder) Register(container interface{}) *gomock.Call {
+func (mr *MockLogConsumerMockRecorder) Register(container any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockLogConsumer)(nil).Register), container)
 }
@@ -546,7 +550,7 @@ func (m *MockLogConsumer) Status(container, msg string) {
 }
 
 // Status indicates an expected call of Status.
-func (mr *MockLogConsumerMockRecorder) Status(container, msg interface{}) *gomock.Call {
+func (mr *MockLogConsumerMockRecorder) Status(container, msg any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Status", reflect.TypeOf((*MockLogConsumer)(nil).Status), container, msg)
 }

+ 1 - 1
pkg/prompt/prompt_mock.go

@@ -7,7 +7,7 @@ package prompt
 import (
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockUI is a mock of UI interface

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff