Skip to content

Commit b75ae48

Browse files
astaticvoidastaticvoid
authored
Differentiate dns and http ns test constants (#123)
1 parent 3fa5d83 commit b75ae48

File tree

10 files changed

+145
-143
lines changed

10 files changed

+145
-143
lines changed

‎integration/janitor/api_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func TestServiceDiscoveryJanitorApi_DeleteNamespace_HappyCase(t *testing.T) {
2323
mocksdk := janitorMock.NewMockSdkJanitorFacade(mockController)
2424
jApi := getJanitorApi(mocksdk)
2525

26-
mocksdk.EXPECT().DeleteNamespace(context.TODO(), &sd.DeleteNamespaceInput{Id: aws.String(test.NsId)}).
26+
mocksdk.EXPECT().DeleteNamespace(context.TODO(), &sd.DeleteNamespaceInput{Id: aws.String(test.HttpNsId)}).
2727
Return(&sd.DeleteNamespaceOutput{OperationId: aws.String(test.OpId1)}, nil)
2828

29-
opId, err := jApi.DeleteNamespace(context.TODO(), test.NsId)
29+
opId, err := jApi.DeleteNamespace(context.TODO(), test.HttpNsId)
3030
assert.Nil(t, err, "No error for happy case")
3131
assert.Equal(t, test.OpId1, opId)
3232
}

‎integration/janitor/janitor_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ func TestCleanupHappyCase(t *testing.T) {
2929
defer tj.close()
3030

3131
tj.mockApi.EXPECT().ListNamespaces(context.TODO()).
32-
Return([]*model.Namespace{{Id: test.NsId, Name: test.NsName}}, nil)
33-
tj.mockApi.EXPECT().ListServices(context.TODO(), test.NsId).
32+
Return([]*model.Namespace{{Id: test.HttpNsId, Name: test.HttpNsName}}, nil)
33+
tj.mockApi.EXPECT().ListServices(context.TODO(), test.HttpNsId).
3434
Return([]*model.Resource{{Id: test.SvcId, Name: test.SvcName}}, nil)
35-
tj.mockApi.EXPECT().DiscoverInstances(context.TODO(), test.NsName, test.SvcName).
35+
tj.mockApi.EXPECT().DiscoverInstances(context.TODO(), test.HttpNsName, test.SvcName).
3636
Return([]types.HttpInstanceSummary{{InstanceId: aws.String(test.EndptId1)}}, nil)
3737

3838
tj.mockApi.EXPECT().DeregisterInstance(context.TODO(), test.SvcId, test.EndptId1).
@@ -41,12 +41,12 @@ func TestCleanupHappyCase(t *testing.T) {
4141
Return(map[string]types.OperationStatus{test.OpId1: types.OperationStatusSuccess}, nil)
4242
tj.mockApi.EXPECT().DeleteService(context.TODO(), test.SvcId).
4343
Return(nil)
44-
tj.mockApi.EXPECT().DeleteNamespace(context.TODO(), test.NsId).
44+
tj.mockApi.EXPECT().DeleteNamespace(context.TODO(), test.HttpNsId).
4545
Return(test.OpId2, nil)
4646
tj.mockApi.EXPECT().PollNamespaceOperation(context.TODO(), test.OpId2).
47-
Return(test.NsId, nil)
47+
Return(test.HttpNsId, nil)
4848

49-
tj.janitor.Cleanup(context.TODO(), test.NsName)
49+
tj.janitor.Cleanup(context.TODO(), test.HttpNsName)
5050
assert.False(t, *tj.failed)
5151
}
5252

@@ -57,7 +57,7 @@ func TestCleanupNothingToClean(t *testing.T) {
5757
tj.mockApi.EXPECT().ListNamespaces(context.TODO()).
5858
Return([]*model.Namespace{}, nil)
5959

60-
tj.janitor.Cleanup(context.TODO(), test.NsName)
60+
tj.janitor.Cleanup(context.TODO(), test.HttpNsName)
6161
assert.False(t, *tj.failed)
6262
}
6363

‎pkg/cloudmap/api_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestServiceDiscoveryApi_ListNamespaces_HappyCase(t *testing.T) {
3030
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
3131
sdApi := getServiceDiscoveryApi(t, awsFacade)
3232

33-
id, name := test.NsId, test.NsName
33+
id, name := test.DnsNsId, test.DnsNsName
3434
ns := types.NamespaceSummary{
3535
Name: &name,
3636
Id: &id,
@@ -51,7 +51,7 @@ func TestServiceDiscoveryApi_ListNamespaces_SkipPublicDNSNotSupported(t *testing
5151
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
5252
sdApi := getServiceDiscoveryApi(t, awsFacade)
5353

54-
id, name := test.NsId, test.NsName
54+
id, name := test.DnsNsId, test.DnsNsName
5555
ns := types.NamespaceSummary{
5656
Name: &name,
5757
Id: &id,
@@ -73,15 +73,15 @@ func TestServiceDiscoveryApi_ListServices_HappyCase(t *testing.T) {
7373

7474
filter := types.ServiceFilter{
7575
Name: types.ServiceFilterNameNamespaceId,
76-
Values: []string{test.NsId},
76+
Values: []string{test.HttpNsId},
7777
}
7878

7979
awsFacade.EXPECT().ListServices(context.TODO(), &sd.ListServicesInput{Filters: []types.ServiceFilter{filter}}).
8080
Return(&sd.ListServicesOutput{Services: []types.ServiceSummary{
8181
{Id: aws.String(test.SvcId), Name: aws.String(test.SvcName)},
8282
}}, nil)
8383

84-
svcs, err := sdApi.ListServices(context.TODO(), test.NsId)
84+
svcs, err := sdApi.ListServices(context.TODO(), test.HttpNsId)
8585
assert.Nil(t, err, "No error for happy case")
8686
assert.True(t, len(svcs) == 1)
8787
assert.Equal(t, svcs[0], &model.Resource{Id: test.SvcId, Name: test.SvcName})
@@ -96,7 +96,7 @@ func TestServiceDiscoveryApi_DiscoverInstances_HappyCase(t *testing.T) {
9696

9797
awsFacade.EXPECT().DiscoverInstances(context.TODO(),
9898
&sd.DiscoverInstancesInput{
99-
NamespaceName: aws.String(test.NsName),
99+
NamespaceName: aws.String(test.HttpNsName),
100100
ServiceName: aws.String(test.SvcName),
101101
HealthStatus: types.HealthStatusFilterAll,
102102
MaxResults: aws.Int32(1000),
@@ -108,7 +108,7 @@ func TestServiceDiscoveryApi_DiscoverInstances_HappyCase(t *testing.T) {
108108
},
109109
}, nil)
110110

111-
insts, err := sdApi.DiscoverInstances(context.TODO(), test.NsName, test.SvcName)
111+
insts, err := sdApi.DiscoverInstances(context.TODO(), test.HttpNsName, test.SvcName)
112112
assert.Nil(t, err, "No error for happy case")
113113
assert.True(t, len(insts) == 2)
114114
assert.Equal(t, test.EndptId1, *insts[0].InstanceId)
@@ -158,10 +158,10 @@ func TestServiceDiscoveryApi_CreateHttNamespace_HappyCase(t *testing.T) {
158158
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
159159
sdApi := getServiceDiscoveryApi(t, awsFacade)
160160

161-
awsFacade.EXPECT().CreateHttpNamespace(context.TODO(), &sd.CreateHttpNamespaceInput{Name: aws.String(test.NsName)}).
161+
awsFacade.EXPECT().CreateHttpNamespace(context.TODO(), &sd.CreateHttpNamespaceInput{Name: aws.String(test.HttpNsName)}).
162162
Return(&sd.CreateHttpNamespaceOutput{OperationId: aws.String(test.OpId1)}, nil)
163163

164-
opId, err := sdApi.CreateHttpNamespace(context.TODO(), test.NsName)
164+
opId, err := sdApi.CreateHttpNamespace(context.TODO(), test.HttpNsName)
165165
assert.Nil(t, err, "No error for happy case")
166166
assert.Equal(t, test.OpId1, opId)
167167
}
@@ -173,7 +173,7 @@ func TestServiceDiscoveryApi_CreateService_CreateForHttpNamespace(t *testing.T)
173173
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
174174
sdApi := getServiceDiscoveryApi(t, awsFacade)
175175

176-
nsId, svcId, svcName := test.NsId, test.SvcId, test.SvcName
176+
nsId, svcId, svcName := test.HttpNsId, test.SvcId, test.SvcName
177177
awsFacade.EXPECT().CreateService(context.TODO(), &sd.CreateServiceInput{
178178
Name: &svcName,
179179
NamespaceId: &nsId,
@@ -195,7 +195,7 @@ func TestServiceDiscoveryApi_CreateService_CreateForDnsNamespace(t *testing.T) {
195195
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
196196
sdApi := getServiceDiscoveryApi(t, awsFacade)
197197

198-
nsId, svcId, svcName := test.NsId, test.SvcId, test.SvcName
198+
nsId, svcId, svcName := test.DnsNsId, test.SvcId, test.SvcName
199199
awsFacade.EXPECT().CreateService(context.TODO(), &sd.CreateServiceInput{
200200
Name: &svcName,
201201
NamespaceId: &nsId,
@@ -223,7 +223,7 @@ func TestServiceDiscoveryApi_CreateService_ThrowError(t *testing.T) {
223223
awsFacade := cloudmapMock.NewMockAwsFacade(mockController)
224224
sdApi := getServiceDiscoveryApi(t, awsFacade)
225225

226-
nsId, svcName := test.NsId, test.SvcName
226+
nsId, svcName := test.HttpNsId, test.SvcName
227227
awsFacade.EXPECT().CreateService(context.TODO(), &sd.CreateServiceInput{
228228
Name: &svcName,
229229
NamespaceId: &nsId,
@@ -308,13 +308,13 @@ func TestServiceDiscoveryApi_PollNamespaceOperation_HappyCase(t *testing.T) {
308308

309309
awsFacade.EXPECT().GetOperation(context.TODO(), &sd.GetOperationInput{OperationId: aws.String(test.OpId1)}).
310310
Return(&sd.GetOperationOutput{Operation: &types.Operation{Status: types.OperationStatusSuccess,
311-
Targets: map[string]string{string(types.OperationTargetTypeNamespace): test.NsId}}}, nil)
311+
Targets: map[string]string{string(types.OperationTargetTypeNamespace): test.HttpNsId}}}, nil)
312312

313313
sdApi := getServiceDiscoveryApi(t, awsFacade)
314314

315315
nsId, err := sdApi.PollNamespaceOperation(context.TODO(), test.OpId1)
316316
assert.Nil(t, err)
317-
assert.Equal(t, test.NsId, nsId)
317+
assert.Equal(t, test.HttpNsId, nsId)
318318
}
319319

320320
func getServiceDiscoveryApi(t *testing.T, awsFacade *cloudmapMock.MockAwsFacade) ServiceDiscoveryApi {

‎pkg/cloudmap/cache_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@ func TestServiceDiscoveryClientCacheGetNamespace_Found(t *testing.T) {
3939
sdc := NewDefaultServiceDiscoveryClientCache()
4040
sdc.CacheNamespace(test.GetTestHttpNamespace())
4141

42-
ns, found := sdc.GetNamespace(test.NsName)
42+
ns, found := sdc.GetNamespace(test.HttpNsName)
4343
assert.True(t, found)
4444
assert.Equal(t, test.GetTestHttpNamespace(), ns)
4545
}
4646

4747
func TestServiceDiscoveryClientCacheGetNamespace_NotFound(t *testing.T) {
4848
sdc := NewDefaultServiceDiscoveryClientCache()
4949

50-
ns, found := sdc.GetNamespace(test.NsName)
50+
ns, found := sdc.GetNamespace(test.HttpNsName)
5151
assert.False(t, found)
5252
assert.Nil(t, ns)
5353
}
5454

5555
func TestServiceDiscoveryClientCacheGetNamespace_Nil(t *testing.T) {
5656
sdc := NewDefaultServiceDiscoveryClientCache()
57-
sdc.CacheNilNamespace(test.NsName)
57+
sdc.CacheNilNamespace(test.HttpNsName)
5858

59-
ns, found := sdc.GetNamespace(test.NsName)
59+
ns, found := sdc.GetNamespace(test.HttpNsName)
6060
assert.True(t, found)
6161
assert.Nil(t, ns)
6262
}
@@ -66,26 +66,26 @@ func TestServiceDiscoveryClientCacheGetNamespace_Corrupt(t *testing.T) {
6666
if !ok {
6767
t.Fatalf("failed to create cache")
6868
}
69-
sdc.cache.Add(sdc.buildNsKey(test.NsName), &model.Resource{}, time.Minute)
69+
sdc.cache.Add(sdc.buildNsKey(test.HttpNsName), &model.Resource{}, time.Minute)
7070

71-
ns, found := sdc.GetNamespace(test.NsName)
71+
ns, found := sdc.GetNamespace(test.HttpNsName)
7272
assert.False(t, found)
7373
assert.Nil(t, ns)
7474
}
7575

7676
func TestServiceDiscoveryClientCacheGetServiceId_Found(t *testing.T) {
7777
sdc := NewDefaultServiceDiscoveryClientCache()
78-
sdc.CacheServiceId(test.NsName, test.SvcName, test.SvcId)
78+
sdc.CacheServiceId(test.HttpNsName, test.SvcName, test.SvcId)
7979

80-
svcId, found := sdc.GetServiceId(test.NsName, test.SvcName)
80+
svcId, found := sdc.GetServiceId(test.HttpNsName, test.SvcName)
8181
assert.True(t, found)
8282
assert.Equal(t, test.SvcId, svcId)
8383
}
8484

8585
func TestServiceDiscoveryClientCacheGetServiceId_NotFound(t *testing.T) {
8686
sdc := NewDefaultServiceDiscoveryClientCache()
8787

88-
svcId, found := sdc.GetServiceId(test.NsName, test.SvcName)
88+
svcId, found := sdc.GetServiceId(test.HttpNsName, test.SvcName)
8989
assert.False(t, found)
9090
assert.Empty(t, svcId)
9191
}
@@ -95,25 +95,25 @@ func TestServiceDiscoveryClientCacheGetServiceId_Corrupt(t *testing.T) {
9595
if !ok {
9696
t.Fatalf("failed to create cache")
9797
}
98-
sdc.cache.Add(sdc.buildSvcKey(test.NsName, test.SvcName), &model.Resource{}, time.Minute)
99-
svcId, found := sdc.GetServiceId(test.NsName, test.SvcName)
98+
sdc.cache.Add(sdc.buildSvcKey(test.HttpNsName, test.SvcName), &model.Resource{}, time.Minute)
99+
svcId, found := sdc.GetServiceId(test.HttpNsName, test.SvcName)
100100
assert.False(t, found)
101101
assert.Empty(t, svcId)
102102
}
103103

104104
func TestServiceDiscoveryClientCacheGetEndpoints_Found(t *testing.T) {
105105
sdc := NewDefaultServiceDiscoveryClientCache()
106-
sdc.CacheEndpoints(test.NsName, test.SvcName, []*model.Endpoint{test.GetTestEndpoint1(), test.GetTestEndpoint2()})
106+
sdc.CacheEndpoints(test.HttpNsName, test.SvcName, []*model.Endpoint{test.GetTestEndpoint1(), test.GetTestEndpoint2()})
107107

108-
endpts, found := sdc.GetEndpoints(test.NsName, test.SvcName)
108+
endpts, found := sdc.GetEndpoints(test.HttpNsName, test.SvcName)
109109
assert.True(t, found)
110110
assert.Equal(t, []*model.Endpoint{test.GetTestEndpoint1(), test.GetTestEndpoint2()}, endpts)
111111
}
112112

113113
func TestServiceDiscoveryClientCacheGetEndpoints_NotFound(t *testing.T) {
114114
sdc := NewDefaultServiceDiscoveryClientCache()
115115

116-
endpts, found := sdc.GetEndpoints(test.NsName, test.SvcName)
116+
endpts, found := sdc.GetEndpoints(test.HttpNsName, test.SvcName)
117117
assert.False(t, found)
118118
assert.Nil(t, endpts)
119119
}
@@ -124,18 +124,18 @@ func TestServiceDiscoveryClientCacheGetEndpoints_Corrupt(t *testing.T) {
124124
t.Fatalf("failed to create cache")
125125
}
126126

127-
sdc.cache.Add(sdc.buildEndptsKey(test.NsName, test.SvcName), &model.Resource{}, time.Minute)
128-
endpts, found := sdc.GetEndpoints(test.NsName, test.SvcName)
127+
sdc.cache.Add(sdc.buildEndptsKey(test.HttpNsName, test.SvcName), &model.Resource{}, time.Minute)
128+
endpts, found := sdc.GetEndpoints(test.HttpNsName, test.SvcName)
129129
assert.False(t, found)
130130
assert.Nil(t, endpts)
131131
}
132132

133133
func TestServiceDiscoveryClientEvictEndpoints(t *testing.T) {
134134
sdc := NewDefaultServiceDiscoveryClientCache()
135-
sdc.CacheEndpoints(test.NsName, test.SvcName, []*model.Endpoint{test.GetTestEndpoint1(), test.GetTestEndpoint2()})
136-
sdc.EvictEndpoints(test.NsName, test.SvcName)
135+
sdc.CacheEndpoints(test.HttpNsName, test.SvcName, []*model.Endpoint{test.GetTestEndpoint1(), test.GetTestEndpoint2()})
136+
sdc.EvictEndpoints(test.HttpNsName, test.SvcName)
137137

138-
endpts, found := sdc.GetEndpoints(test.NsName, test.SvcName)
138+
endpts, found := sdc.GetEndpoints(test.HttpNsName, test.SvcName)
139139
assert.False(t, found)
140140
assert.Nil(t, endpts)
141141
}

0 commit comments

Comments
 (0)