Skip to content

Commit dc7fcb0

Browse files
authored
Move mocks to mock packages (#120)
1 parent ab7e41b commit dc7fcb0

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
134134

135135
MOCKS_DESTINATION=mocks
136136
generate-mocks: mockgen
137-
$(MOCKGEN) --source pkg/cloudmap/client.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/client_mock.go --package cloudmap
138-
$(MOCKGEN) --source pkg/cloudmap/cache.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/cache_mock.go --package cloudmap
139-
$(MOCKGEN) --source pkg/cloudmap/operation_poller.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/operation_poller_mock.go --package cloudmap
140-
$(MOCKGEN) --source pkg/cloudmap/operation_collector.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/operation_collector_mock.go --package cloudmap
141-
$(MOCKGEN) --source pkg/cloudmap/api.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/api_mock.go --package cloudmap
142-
$(MOCKGEN) --source pkg/cloudmap/aws_facade.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/aws_facade_mock.go --package cloudmap
143-
$(MOCKGEN) --source integration/janitor/api.go --destination $(MOCKS_DESTINATION)/integration/janitor/api_mock.go --package janitor
144-
$(MOCKGEN) --source integration/janitor/aws_facade.go --destination $(MOCKS_DESTINATION)/integration/janitor/aws_facade_mock.go --package janitor
137+
$(MOCKGEN) --source pkg/cloudmap/client.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/client_mock.go --package cloudmap_mock
138+
$(MOCKGEN) --source pkg/cloudmap/cache.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/cache_mock.go --package cloudmap_mock
139+
$(MOCKGEN) --source pkg/cloudmap/operation_poller.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/operation_poller_mock.go --package cloudmap_mock
140+
$(MOCKGEN) --source pkg/cloudmap/operation_collector.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/operation_collector_mock.go --package cloudmap_mock
141+
$(MOCKGEN) --source pkg/cloudmap/api.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/api_mock.go --package cloudmap_mock
142+
$(MOCKGEN) --source pkg/cloudmap/aws_facade.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/aws_facade_mock.go --package cloudmap_mock
143+
$(MOCKGEN) --source integration/janitor/api.go --destination $(MOCKS_DESTINATION)/integration/janitor/api_mock.go --package janitor_mock
144+
$(MOCKGEN) --source integration/janitor/aws_facade.go --destination $(MOCKS_DESTINATION)/integration/janitor/aws_facade_mock.go --package janitor_mock
145145

146146

147147
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen

integration/janitor/api_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/integration/janitor"
7+
janitorMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/integration/janitor"
88
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
99
"github.com/aws/aws-sdk-go-v2/aws"
1010
sd "github.com/aws/aws-sdk-go-v2/service/servicediscovery"
@@ -20,7 +20,7 @@ func TestServiceDiscoveryJanitorApi_DeleteNamespace_HappyCase(t *testing.T) {
2020
mockController := gomock.NewController(t)
2121
defer mockController.Finish()
2222

23-
mocksdk := janitor.NewMockSdkJanitorFacade(mockController)
23+
mocksdk := janitorMock.NewMockSdkJanitorFacade(mockController)
2424
jApi := getJanitorApi(mocksdk)
2525

2626
mocksdk.EXPECT().DeleteNamespace(context.TODO(), &sd.DeleteNamespaceInput{Id: aws.String(test.NsId)}).
@@ -35,7 +35,7 @@ func TestServiceDiscoveryJanitorApi_DeleteService_HappyCase(t *testing.T) {
3535
mockController := gomock.NewController(t)
3636
defer mockController.Finish()
3737

38-
mocksdk := janitor.NewMockSdkJanitorFacade(mockController)
38+
mocksdk := janitorMock.NewMockSdkJanitorFacade(mockController)
3939
jApi := getJanitorApi(mocksdk)
4040

4141
mocksdk.EXPECT().DeleteService(context.TODO(), &sd.DeleteServiceInput{Id: aws.String(test.SvcId)}).
@@ -45,7 +45,7 @@ func TestServiceDiscoveryJanitorApi_DeleteService_HappyCase(t *testing.T) {
4545
assert.Nil(t, err, "No error for happy case")
4646
}
4747

48-
func getJanitorApi(sdk *janitor.MockSdkJanitorFacade) ServiceDiscoveryJanitorApi {
48+
func getJanitorApi(sdk *janitorMock.MockSdkJanitorFacade) ServiceDiscoveryJanitorApi {
4949
return &serviceDiscoveryJanitorApi{
5050
janitorFacade: sdk,
5151
}

integration/janitor/janitor_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/integration/janitor"
7+
janitorMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/integration/janitor"
88
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/model"
99
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
1010
"github.com/aws/aws-sdk-go-v2/aws"
@@ -15,7 +15,7 @@ import (
1515

1616
type testJanitor struct {
1717
janitor *cloudMapJanitor
18-
mockApi *janitor.MockServiceDiscoveryJanitorApi
18+
mockApi *janitorMock.MockServiceDiscoveryJanitorApi
1919
failed *bool
2020
close func()
2121
}
@@ -63,7 +63,7 @@ func TestCleanupNothingToClean(t *testing.T) {
6363

6464
func getTestJanitor(t *testing.T) *testJanitor {
6565
mockController := gomock.NewController(t)
66-
api := janitor.NewMockServiceDiscoveryJanitorApi(mockController)
66+
api := janitorMock.NewMockServiceDiscoveryJanitorApi(mockController)
6767
failed := false
6868
return &testJanitor{
6969
janitor: &cloudMapJanitor{

pkg/cloudmap/api_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
9+
cloudmapMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
1010
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
1111
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/model"
1212
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
@@ -27,7 +27,7 @@ func TestServiceDiscoveryApi_ListNamespaces_HappyCase(t *testing.T) {
2727
mockController := gomock.NewController(t)
2828
defer mockController.Finish()
2929

30-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
30+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
3131
sdApi := getServiceDiscoveryApi(t, awsFacade)
3232

3333
id, name := test.NsId, test.NsName
@@ -48,7 +48,7 @@ func TestServiceDiscoveryApi_ListNamespaces_SkipPublicDNSNotSupported(t *testing
4848
mockController := gomock.NewController(t)
4949
defer mockController.Finish()
5050

51-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
51+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
5252
sdApi := getServiceDiscoveryApi(t, awsFacade)
5353

5454
id, name := test.NsId, test.NsName
@@ -68,7 +68,7 @@ func TestServiceDiscoveryApi_ListServices_HappyCase(t *testing.T) {
6868
mockController := gomock.NewController(t)
6969
defer mockController.Finish()
7070

71-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
71+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
7272
sdApi := getServiceDiscoveryApi(t, awsFacade)
7373

7474
filter := types.ServiceFilter{
@@ -91,7 +91,7 @@ func TestServiceDiscoveryApi_DiscoverInstances_HappyCase(t *testing.T) {
9191
mockController := gomock.NewController(t)
9292
defer mockController.Finish()
9393

94-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
94+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
9595
sdApi := getServiceDiscoveryApi(t, awsFacade)
9696

9797
awsFacade.EXPECT().DiscoverInstances(context.TODO(),
@@ -119,7 +119,7 @@ func TestServiceDiscoveryApi_ListOperations_HappyCase(t *testing.T) {
119119
mockController := gomock.NewController(t)
120120
defer mockController.Finish()
121121

122-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
122+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
123123
sdApi := getServiceDiscoveryApi(t, awsFacade)
124124

125125
filters := make([]types.OperationFilter, 0)
@@ -139,7 +139,7 @@ func TestServiceDiscoveryApi_GetOperation_HappyCase(t *testing.T) {
139139
mockController := gomock.NewController(t)
140140
defer mockController.Finish()
141141

142-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
142+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
143143
sdApi := getServiceDiscoveryApi(t, awsFacade)
144144

145145
expectedOp := &types.Operation{Id: aws.String(test.OpId1), Status: types.OperationStatusPending}
@@ -155,7 +155,7 @@ func TestServiceDiscoveryApi_CreateHttNamespace_HappyCase(t *testing.T) {
155155
mockController := gomock.NewController(t)
156156
defer mockController.Finish()
157157

158-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
158+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
159159
sdApi := getServiceDiscoveryApi(t, awsFacade)
160160

161161
awsFacade.EXPECT().CreateHttpNamespace(context.TODO(), &sd.CreateHttpNamespaceInput{Name: aws.String(test.NsName)}).
@@ -170,7 +170,7 @@ func TestServiceDiscoveryApi_CreateService_CreateForHttpNamespace(t *testing.T)
170170
mockController := gomock.NewController(t)
171171
defer mockController.Finish()
172172

173-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
173+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
174174
sdApi := getServiceDiscoveryApi(t, awsFacade)
175175

176176
nsId, svcId, svcName := test.NsId, test.SvcId, test.SvcName
@@ -192,7 +192,7 @@ func TestServiceDiscoveryApi_CreateService_CreateForDnsNamespace(t *testing.T) {
192192
mockController := gomock.NewController(t)
193193
defer mockController.Finish()
194194

195-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
195+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
196196
sdApi := getServiceDiscoveryApi(t, awsFacade)
197197

198198
nsId, svcId, svcName := test.NsId, test.SvcId, test.SvcName
@@ -220,7 +220,7 @@ func TestServiceDiscoveryApi_CreateService_ThrowError(t *testing.T) {
220220
mockController := gomock.NewController(t)
221221
defer mockController.Finish()
222222

223-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
223+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
224224
sdApi := getServiceDiscoveryApi(t, awsFacade)
225225

226226
nsId, svcName := test.NsId, test.SvcName
@@ -241,7 +241,7 @@ func TestServiceDiscoveryApi_RegisterInstance_HappyCase(t *testing.T) {
241241

242242
attrs := map[string]string{"a": "b"}
243243

244-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
244+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
245245
awsFacade.EXPECT().RegisterInstance(context.TODO(),
246246
&sd.RegisterInstanceInput{
247247
ServiceId: aws.String(test.SvcId),
@@ -260,7 +260,7 @@ func TestServiceDiscoveryApi_RegisterInstance_Error(t *testing.T) {
260260
defer mockController.Finish()
261261

262262
sdkErr := errors.New("fail")
263-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
263+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
264264
awsFacade.EXPECT().RegisterInstance(context.TODO(), gomock.Any()).Return(nil, sdkErr)
265265

266266
sdApi := getServiceDiscoveryApi(t, awsFacade)
@@ -272,7 +272,7 @@ func TestServiceDiscoveryApi_DeregisterInstance_HappyCase(t *testing.T) {
272272
mockController := gomock.NewController(t)
273273
defer mockController.Finish()
274274

275-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
275+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
276276
awsFacade.EXPECT().DeregisterInstance(context.TODO(),
277277
&sd.DeregisterInstanceInput{
278278
ServiceId: aws.String(test.SvcId),
@@ -290,7 +290,7 @@ func TestServiceDiscoveryApi_DeregisterInstance_Error(t *testing.T) {
290290
defer mockController.Finish()
291291

292292
sdkErr := errors.New("fail")
293-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
293+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
294294
awsFacade.EXPECT().DeregisterInstance(context.TODO(), gomock.Any()).Return(nil, sdkErr)
295295

296296
sdApi := getServiceDiscoveryApi(t, awsFacade)
@@ -302,7 +302,7 @@ func TestServiceDiscoveryApi_PollNamespaceOperation_HappyCase(t *testing.T) {
302302
mockController := gomock.NewController(t)
303303
defer mockController.Finish()
304304

305-
awsFacade := cloudmap.NewMockAwsFacade(mockController)
305+
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
306306
awsFacade.EXPECT().GetOperation(context.TODO(), &sd.GetOperationInput{OperationId: aws.String(test.OpId1)}).
307307
Return(&sd.GetOperationOutput{Operation: &types.Operation{Status: types.OperationStatusPending}}, nil)
308308

@@ -317,7 +317,7 @@ func TestServiceDiscoveryApi_PollNamespaceOperation_HappyCase(t *testing.T) {
317317
assert.Equal(t, test.NsId, nsId)
318318
}
319319

320-
func getServiceDiscoveryApi(t *testing.T, awsFacade *cloudmap.MockAwsFacade) ServiceDiscoveryApi {
320+
func getServiceDiscoveryApi(t *testing.T, awsFacade *cloudmapMock.MockAwsFacade) ServiceDiscoveryApi {
321321
return &serviceDiscoveryApi{
322322
log: common.NewLoggerWithLogr(testingLogger.TestLogger{T: t}),
323323
awsFacade: awsFacade,

pkg/cloudmap/client_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
8+
cloudmapMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
99
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
1010
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/model"
1111
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
@@ -18,8 +18,8 @@ import (
1818

1919
type testSdClient struct {
2020
client *serviceDiscoveryClient
21-
mockApi cloudmap.MockServiceDiscoveryApi
22-
mockCache cloudmap.MockServiceDiscoveryClientCache
21+
mockApi cloudmapMock.MockServiceDiscoveryApi
22+
mockCache cloudmapMock.MockServiceDiscoveryClientCache
2323
close func()
2424
}
2525

@@ -354,8 +354,8 @@ func TestServiceDiscoveryClient_DeleteEndpoints(t *testing.T) {
354354

355355
func getTestSdClient(t *testing.T) *testSdClient {
356356
mockController := gomock.NewController(t)
357-
mockCache := cloudmap.NewMockServiceDiscoveryClientCache(mockController)
358-
mockApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
357+
mockCache := cloudmapMock.NewMockServiceDiscoveryClientCache(mockController)
358+
mockApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
359359
return &testSdClient{
360360
client: &serviceDiscoveryClient{
361361
log: common.NewLoggerWithLogr(testing2.TestLogger{T: t}),

pkg/cloudmap/operation_poller_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
10+
cloudmapMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
1111
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
1212
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
1313
"github.com/aws/aws-sdk-go-v2/service/servicediscovery/types"
@@ -20,7 +20,7 @@ func TestOperationPoller_HappyCases(t *testing.T) {
2020
mockController := gomock.NewController(t)
2121
defer mockController.Finish()
2222

23-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
23+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
2424

2525
pollerTypes := []struct {
2626
constructor func() OperationPoller
@@ -105,7 +105,7 @@ func TestOperationPoller_PollEmpty(t *testing.T) {
105105
mockController := gomock.NewController(t)
106106
defer mockController.Finish()
107107

108-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
108+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
109109

110110
p := NewRegisterInstancePoller(sdApi, test.SvcId, []string{}, test.OpStart)
111111
err := p.Poll(context.TODO())
@@ -116,7 +116,7 @@ func TestOperationPoller_PollFailure(t *testing.T) {
116116
mockController := gomock.NewController(t)
117117
defer mockController.Finish()
118118

119-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
119+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
120120

121121
p := NewRegisterInstancePoller(sdApi, test.SvcId, []string{test.OpId1, test.OpId2}, test.OpStart)
122122

@@ -134,7 +134,7 @@ func TestOperationPoller_PollOpFailure(t *testing.T) {
134134
mockController := gomock.NewController(t)
135135
defer mockController.Finish()
136136

137-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
137+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
138138

139139
p := NewRegisterInstancePoller(sdApi, test.SvcId, []string{test.OpId1, test.OpId2}, test.OpStart)
140140

@@ -160,7 +160,7 @@ func TestOperationPoller_PollOpFailureAndMessageFailure(t *testing.T) {
160160
mockController := gomock.NewController(t)
161161
defer mockController.Finish()
162162

163-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
163+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
164164

165165
p := NewRegisterInstancePoller(sdApi, test.SvcId, []string{test.OpId1, test.OpId2}, test.OpStart)
166166

@@ -184,7 +184,7 @@ func TestOperationPoller_PollTimeout(t *testing.T) {
184184
mockController := gomock.NewController(t)
185185
defer mockController.Finish()
186186

187-
sdApi := cloudmap.NewMockServiceDiscoveryApi(mockController)
187+
sdApi := cloudmapMock.NewMockServiceDiscoveryApi(mockController)
188188

189189
p := operationPoller{
190190
log: common.NewLoggerWithLogr(testing2.TestLogger{T: t}),

pkg/controllers/cloudmap_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
8+
cloudmapMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/pkg/cloudmap"
99
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/api/v1alpha1"
1010
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
1111
"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/model"
@@ -35,7 +35,7 @@ func TestCloudMapReconciler_Reconcile(t *testing.T) {
3535
mockController := gomock.NewController(t)
3636
defer mockController.Finish()
3737

38-
mockSDClient := cloudmap.NewMockServiceDiscoveryClient(mockController)
38+
mockSDClient := cloudmapMock.NewMockServiceDiscoveryClient(mockController)
3939
// The service model in the Cloudmap
4040
mockSDClient.EXPECT().ListServices(context.TODO(), test.NsName).
4141
Return([]*model.Service{test.GetTestServiceWithEndpoint([]*model.Endpoint{test.GetTestEndpoint1()})}, nil)
@@ -72,7 +72,7 @@ func TestCloudMapReconciler_Reconcile(t *testing.T) {
7272
assert.Equal(t, test.EndptIp1, endpointSlice.Endpoints[0].Addresses[0])
7373
}
7474

75-
func getReconciler(t *testing.T, mockSDClient *cloudmap.MockServiceDiscoveryClient, client client.Client) *CloudMapReconciler {
75+
func getReconciler(t *testing.T, mockSDClient *cloudmapMock.MockServiceDiscoveryClient, client client.Client) *CloudMapReconciler {
7676
return &CloudMapReconciler{
7777
Client: client,
7878
Cloudmap: mockSDClient,

0 commit comments

Comments
 (0)