From 391c7f52201f2de7a461328b5d96b39a498f3a56 Mon Sep 17 00:00:00 2001 From: knanao Date: Thu, 17 Mar 2022 20:14:06 +0900 Subject: [PATCH 1/2] Fix codegen script --- dockers/codegen/DOCKER_BUILD | 2 +- dockers/codegen/codegen.sh | 2 +- .../kubernetes/providertest/provider.mock.go | 113 ++++++++++-------- 3 files changed, 63 insertions(+), 54 deletions(-) diff --git a/dockers/codegen/DOCKER_BUILD b/dockers/codegen/DOCKER_BUILD index 6624f31602..88e2fba548 100644 --- a/dockers/codegen/DOCKER_BUILD +++ b/dockers/codegen/DOCKER_BUILD @@ -1,2 +1,2 @@ -version: 0.6.0 +version: 0.7.0 registry: gcr.io/pipecd/codegen diff --git a/dockers/codegen/codegen.sh b/dockers/codegen/codegen.sh index b1ea455d30..d5bcb04664 100755 --- a/dockers/codegen/codegen.sh +++ b/dockers/codegen/codegen.sh @@ -118,7 +118,7 @@ mockInterfaces=( "Redis" "ProjectStore,PipedStore,ApplicationStore,DeploymentStore,CommandStore" "Store" - "Provider" + "Applier,Loader" "Getter,Putter,Deleter,Cache" "Repo" "Signer,Verifier" diff --git a/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go b/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go index db4210ff42..d3153ed5d9 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go +++ b/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes (interfaces: Provider) +// Source: github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes (interfaces: Applier,Loader) // Package providertest is a generated GoMock package. package providertest @@ -12,45 +12,31 @@ import ( kubernetes "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes" ) -// MockProvider is a mock of Provider interface. -type MockProvider struct { +// MockApplier is a mock of Applier interface. +type MockApplier struct { ctrl *gomock.Controller - recorder *MockProviderMockRecorder + recorder *MockApplierMockRecorder } -// MockProviderMockRecorder is the mock recorder for MockProvider. -type MockProviderMockRecorder struct { - mock *MockProvider +// MockApplierMockRecorder is the mock recorder for MockApplier. +type MockApplierMockRecorder struct { + mock *MockApplier } -// NewMockProvider creates a new mock instance. -func NewMockProvider(ctrl *gomock.Controller) *MockProvider { - mock := &MockProvider{ctrl: ctrl} - mock.recorder = &MockProviderMockRecorder{mock} +// NewMockApplier creates a new mock instance. +func NewMockApplier(ctrl *gomock.Controller) *MockApplier { + mock := &MockApplier{ctrl: ctrl} + mock.recorder = &MockApplierMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockProvider) EXPECT() *MockProviderMockRecorder { +func (m *MockApplier) EXPECT() *MockApplierMockRecorder { return m.recorder } -// Apply mocks base method. -func (m *MockProvider) Apply(arg0 context.Context) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Apply", arg0) - ret0, _ := ret[0].(error) - return ret0 -} - -// Apply indicates an expected call of Apply. -func (mr *MockProviderMockRecorder) Apply(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockProvider)(nil).Apply), arg0) -} - // ApplyManifest mocks base method. -func (m *MockProvider) ApplyManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { +func (m *MockApplier) ApplyManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ApplyManifest", arg0, arg1) ret0, _ := ret[0].(error) @@ -58,13 +44,13 @@ func (m *MockProvider) ApplyManifest(arg0 context.Context, arg1 kubernetes.Manif } // ApplyManifest indicates an expected call of ApplyManifest. -func (mr *MockProviderMockRecorder) ApplyManifest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockApplierMockRecorder) ApplyManifest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyManifest", reflect.TypeOf((*MockProvider)(nil).ApplyManifest), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyManifest", reflect.TypeOf((*MockApplier)(nil).ApplyManifest), arg0, arg1) } // CreateManifest mocks base method. -func (m *MockProvider) CreateManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { +func (m *MockApplier) CreateManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateManifest", arg0, arg1) ret0, _ := ret[0].(error) @@ -72,13 +58,13 @@ func (m *MockProvider) CreateManifest(arg0 context.Context, arg1 kubernetes.Mani } // CreateManifest indicates an expected call of CreateManifest. -func (mr *MockProviderMockRecorder) CreateManifest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockApplierMockRecorder) CreateManifest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateManifest", reflect.TypeOf((*MockProvider)(nil).CreateManifest), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateManifest", reflect.TypeOf((*MockApplier)(nil).CreateManifest), arg0, arg1) } // Delete mocks base method. -func (m *MockProvider) Delete(arg0 context.Context, arg1 kubernetes.ResourceKey) error { +func (m *MockApplier) Delete(arg0 context.Context, arg1 kubernetes.ResourceKey) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Delete", arg0, arg1) ret0, _ := ret[0].(error) @@ -86,36 +72,59 @@ func (m *MockProvider) Delete(arg0 context.Context, arg1 kubernetes.ResourceKey) } // Delete indicates an expected call of Delete. -func (mr *MockProviderMockRecorder) Delete(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockApplierMockRecorder) Delete(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockProvider)(nil).Delete), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockApplier)(nil).Delete), arg0, arg1) } -// LoadManifests mocks base method. -func (m *MockProvider) LoadManifests(arg0 context.Context) ([]kubernetes.Manifest, error) { +// ReplaceManifest mocks base method. +func (m *MockApplier) ReplaceManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LoadManifests", arg0) - ret0, _ := ret[0].([]kubernetes.Manifest) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret := m.ctrl.Call(m, "ReplaceManifest", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 } -// LoadManifests indicates an expected call of LoadManifests. -func (mr *MockProviderMockRecorder) LoadManifests(arg0 interface{}) *gomock.Call { +// ReplaceManifest indicates an expected call of ReplaceManifest. +func (mr *MockApplierMockRecorder) ReplaceManifest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadManifests", reflect.TypeOf((*MockProvider)(nil).LoadManifests), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceManifest", reflect.TypeOf((*MockApplier)(nil).ReplaceManifest), arg0, arg1) } -// ReplaceManifest mocks base method. -func (m *MockProvider) ReplaceManifest(arg0 context.Context, arg1 kubernetes.Manifest) error { +// MockLoader is a mock of Loader interface. +type MockLoader struct { + ctrl *gomock.Controller + recorder *MockLoaderMockRecorder +} + +// MockLoaderMockRecorder is the mock recorder for MockLoader. +type MockLoaderMockRecorder struct { + mock *MockLoader +} + +// NewMockLoader creates a new mock instance. +func NewMockLoader(ctrl *gomock.Controller) *MockLoader { + mock := &MockLoader{ctrl: ctrl} + mock.recorder = &MockLoaderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockLoader) EXPECT() *MockLoaderMockRecorder { + return m.recorder +} + +// LoadManifests mocks base method. +func (m *MockLoader) LoadManifests(arg0 context.Context) ([]kubernetes.Manifest, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReplaceManifest", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 + ret := m.ctrl.Call(m, "LoadManifests", arg0) + ret0, _ := ret[0].([]kubernetes.Manifest) + ret1, _ := ret[1].(error) + return ret0, ret1 } -// ReplaceManifest indicates an expected call of ReplaceManifest. -func (mr *MockProviderMockRecorder) ReplaceManifest(arg0, arg1 interface{}) *gomock.Call { +// LoadManifests indicates an expected call of LoadManifests. +func (mr *MockLoaderMockRecorder) LoadManifests(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceManifest", reflect.TypeOf((*MockProvider)(nil).ReplaceManifest), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadManifests", reflect.TypeOf((*MockLoader)(nil).LoadManifests), arg0) } From b2ecc6d158a96ebf47e801312e965f39697ea808 Mon Sep 17 00:00:00 2001 From: knanao Date: Thu, 17 Mar 2022 20:53:13 +0900 Subject: [PATCH 2/2] Fix some tests --- dockers/codegen/codegen.sh | 4 ++-- .../BUILD.bazel | 4 ++-- .../kubernetes.mock.go} | 4 ++-- pkg/app/piped/executor/kubernetes/BUILD.bazel | 2 +- .../piped/executor/kubernetes/canary_test.go | 14 ++++++------- .../executor/kubernetes/kubernetes_test.go | 20 +++++++++---------- .../piped/executor/kubernetes/primary_test.go | 16 +++++++-------- .../piped/executor/kubernetes/sync_test.go | 12 +++++------ 8 files changed, 38 insertions(+), 38 deletions(-) rename pkg/app/piped/cloudprovider/kubernetes/{providertest => kubernetestest}/BUILD.bazel (83%) rename pkg/app/piped/cloudprovider/kubernetes/{providertest/provider.mock.go => kubernetestest/kubernetes.mock.go} (98%) diff --git a/dockers/codegen/codegen.sh b/dockers/codegen/codegen.sh index d5bcb04664..55bd782ec6 100755 --- a/dockers/codegen/codegen.sh +++ b/dockers/codegen/codegen.sh @@ -88,7 +88,7 @@ mockPackageNames=( "redistest" "datastoretest" "filestoretest" - "providertest" + "kubernetestest" "cachetest" "gittest" "jwttest" @@ -98,7 +98,7 @@ mockDestinations=( "pkg/redis/redistest/redis.mock.go" "pkg/datastore/datastoretest/datastore.mock.go" "pkg/filestore/filestoretest/filestore.mock.go" - "pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go" + "pkg/app/piped/cloudprovider/kubernetes/kubernetestest/kubernetes.mock.go" "pkg/cache/cachetest/cache.mock.go" "pkg/git/gittest/git.mock.go" "pkg/jwt/jwttest/jwt.mock.go" diff --git a/pkg/app/piped/cloudprovider/kubernetes/providertest/BUILD.bazel b/pkg/app/piped/cloudprovider/kubernetes/kubernetestest/BUILD.bazel similarity index 83% rename from pkg/app/piped/cloudprovider/kubernetes/providertest/BUILD.bazel rename to pkg/app/piped/cloudprovider/kubernetes/kubernetestest/BUILD.bazel index 8144c10882..5742fe3e3d 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/providertest/BUILD.bazel +++ b/pkg/app/piped/cloudprovider/kubernetes/kubernetestest/BUILD.bazel @@ -2,8 +2,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", - srcs = ["provider.mock.go"], - importpath = "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/providertest", + srcs = ["kubernetes.mock.go"], + importpath = "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/kubernetestest", visibility = ["//visibility:public"], deps = [ "//pkg/app/piped/cloudprovider/kubernetes:go_default_library", diff --git a/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go b/pkg/app/piped/cloudprovider/kubernetes/kubernetestest/kubernetes.mock.go similarity index 98% rename from pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go rename to pkg/app/piped/cloudprovider/kubernetes/kubernetestest/kubernetes.mock.go index d3153ed5d9..94bd2d707b 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/providertest/provider.mock.go +++ b/pkg/app/piped/cloudprovider/kubernetes/kubernetestest/kubernetes.mock.go @@ -1,8 +1,8 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes (interfaces: Applier,Loader) -// Package providertest is a generated GoMock package. -package providertest +// Package kubernetestest is a generated GoMock package. +package kubernetestest import ( context "context" diff --git a/pkg/app/piped/executor/kubernetes/BUILD.bazel b/pkg/app/piped/executor/kubernetes/BUILD.bazel index 8cee630fe6..fbcea5788d 100644 --- a/pkg/app/piped/executor/kubernetes/BUILD.bazel +++ b/pkg/app/piped/executor/kubernetes/BUILD.bazel @@ -43,7 +43,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/app/piped/cloudprovider/kubernetes:go_default_library", - "//pkg/app/piped/cloudprovider/kubernetes/providertest:go_default_library", + "//pkg/app/piped/cloudprovider/kubernetes/kubernetestest:go_default_library", "//pkg/app/piped/executor:go_default_library", "//pkg/app/piped/metadatastore:go_default_library", "//pkg/cache:go_default_library", diff --git a/pkg/app/piped/executor/kubernetes/canary_test.go b/pkg/app/piped/executor/kubernetes/canary_test.go index 4a11d4f2b6..5365fdf0bf 100644 --- a/pkg/app/piped/executor/kubernetes/canary_test.go +++ b/pkg/app/piped/executor/kubernetes/canary_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" provider "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes" - "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/providertest" + "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/kubernetestest" "github.com/pipe-cd/pipecd/pkg/app/piped/executor" "github.com/pipe-cd/pipecd/pkg/cache" "github.com/pipe-cd/pipecd/pkg/cache/cachetest" @@ -92,7 +92,7 @@ func TestEnsureCanaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return(nil, fmt.Errorf("error")) return p }(), @@ -123,7 +123,7 @@ func TestEnsureCanaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{}, nil) return p }(), @@ -156,7 +156,7 @@ func TestEnsureCanaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -176,7 +176,7 @@ func TestEnsureCanaryRollout(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(fmt.Errorf("error")) return p }(), @@ -209,7 +209,7 @@ func TestEnsureCanaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -229,7 +229,7 @@ func TestEnsureCanaryRollout(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) return p }(), diff --git a/pkg/app/piped/executor/kubernetes/kubernetes_test.go b/pkg/app/piped/executor/kubernetes/kubernetes_test.go index 365c0505ba..879459d707 100644 --- a/pkg/app/piped/executor/kubernetes/kubernetes_test.go +++ b/pkg/app/piped/executor/kubernetes/kubernetes_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" provider "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes" - "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/providertest" + "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/kubernetestest" "github.com/pipe-cd/pipecd/pkg/app/piped/metadatastore" "github.com/pipe-cd/pipecd/pkg/config" ) @@ -312,7 +312,7 @@ func TestApplyManifests(t *testing.T) { { name: "unable to apply manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(errors.New("unexpected error")) return p }(), @@ -336,7 +336,7 @@ spec: { name: "unable to replace manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ReplaceManifest(gomock.Any(), gomock.Any()).Return(errors.New("unexpected error")) return p }(), @@ -362,7 +362,7 @@ spec: { name: "unable to create manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ReplaceManifest(gomock.Any(), gomock.Any()).Return(provider.ErrNotFound) p.EXPECT().CreateManifest(gomock.Any(), gomock.Any()).Return(errors.New("unexpected error")) return p @@ -389,7 +389,7 @@ spec: { name: "successfully apply manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) return p }(), @@ -413,7 +413,7 @@ spec: { name: "successfully replace manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ReplaceManifest(gomock.Any(), gomock.Any()).Return(nil) return p }(), @@ -439,7 +439,7 @@ spec: { name: "successfully create manifest", applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ReplaceManifest(gomock.Any(), gomock.Any()).Return(provider.ErrNotFound) p.EXPECT().CreateManifest(gomock.Any(), gomock.Any()).Return(nil) return p @@ -501,7 +501,7 @@ func TestDeleteResources(t *testing.T) { }, }, applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().Delete(gomock.Any(), gomock.Any()).Return(provider.ErrNotFound) return p }(), @@ -515,7 +515,7 @@ func TestDeleteResources(t *testing.T) { }, }, applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().Delete(gomock.Any(), gomock.Any()).Return(fmt.Errorf("unexpected error")) return p }(), @@ -529,7 +529,7 @@ func TestDeleteResources(t *testing.T) { }, }, applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().Delete(gomock.Any(), gomock.Any()).Return(nil) return p }(), diff --git a/pkg/app/piped/executor/kubernetes/primary_test.go b/pkg/app/piped/executor/kubernetes/primary_test.go index 7b0917b907..71aa753ba6 100644 --- a/pkg/app/piped/executor/kubernetes/primary_test.go +++ b/pkg/app/piped/executor/kubernetes/primary_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" provider "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes" - "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/providertest" + "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/kubernetestest" "github.com/pipe-cd/pipecd/pkg/app/piped/executor" "github.com/pipe-cd/pipecd/pkg/cache" "github.com/pipe-cd/pipecd/pkg/cache/cachetest" @@ -92,7 +92,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return(nil, fmt.Errorf("error")) return p }(), @@ -126,7 +126,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -138,7 +138,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) return p }(), @@ -172,7 +172,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -191,7 +191,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) return p @@ -231,7 +231,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -276,7 +276,7 @@ func TestEnsurePrimaryRollout(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", diff --git a/pkg/app/piped/executor/kubernetes/sync_test.go b/pkg/app/piped/executor/kubernetes/sync_test.go index 2c637ac3bd..ed5eea7a4b 100644 --- a/pkg/app/piped/executor/kubernetes/sync_test.go +++ b/pkg/app/piped/executor/kubernetes/sync_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" provider "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes" - "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/providertest" + "github.com/pipe-cd/pipecd/pkg/app/piped/cloudprovider/kubernetes/kubernetestest" "github.com/pipe-cd/pipecd/pkg/app/piped/executor" "github.com/pipe-cd/pipecd/pkg/cache" "github.com/pipe-cd/pipecd/pkg/cache/cachetest" @@ -63,7 +63,7 @@ func TestEnsureSync(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return(nil, fmt.Errorf("error")) return p }(), @@ -90,7 +90,7 @@ func TestEnsureSync(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -102,7 +102,7 @@ func TestEnsureSync(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(fmt.Errorf("error")) return p }(), @@ -134,7 +134,7 @@ func TestEnsureSync(t *testing.T) { Logger: zap.NewNop(), }, loader: func() provider.Loader { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockLoader(ctrl) p.EXPECT().LoadManifests(gomock.Any()).Return([]provider.Manifest{ provider.MakeManifest(provider.ResourceKey{ APIVersion: "apps/v1", @@ -146,7 +146,7 @@ func TestEnsureSync(t *testing.T) { return p }(), applier: func() provider.Applier { - p := providertest.NewMockProvider(ctrl) + p := kubernetestest.NewMockApplier(ctrl) p.EXPECT().ApplyManifest(gomock.Any(), gomock.Any()).Return(nil) return p }(),