@@ -26,8 +26,12 @@ import (
26
26
)
27
27
28
28
const (
29
- defaultVPCID = "vpc-xxxyyy"
30
- defaultClusterName = "testCluster"
29
+ defaultVPCID = "vpc-xxxyyy"
30
+ defaultClusterName = "testCluster"
31
+ defaultClusterTagPrefixKey = "elbv2.k8s.aws"
32
+ defaultBackendSGNamePrefix = "k8s-traffic"
33
+ defaultTagKeyK8sCluster = "elbv2.k8s.aws/cluster"
34
+ defaultTagKeyResource = "elbv2.k8s.aws/resource"
31
35
)
32
36
33
37
func Test_defaultBackendSGProvider_Get (t * testing.T ) {
@@ -42,12 +46,14 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
42
46
err error
43
47
}
44
48
type fields struct {
45
- backendSG string
46
- ingResources []* networking.Ingress
47
- svcResource * corev1.Service
48
- defaultTags map [string ]string
49
- describeSGCalls []describeSecurityGroupsAsListCall
50
- createSGCalls []createSecurityGroupWithContexCall
49
+ backendSG string
50
+ ingResources []* networking.Ingress
51
+ svcResource * corev1.Service
52
+ clusterTagPrefixKey string
53
+ backendSGNamePrefix string
54
+ defaultTags map [string ]string
55
+ describeSGCalls []describeSecurityGroupsAsListCall
56
+ createSGCalls []createSecurityGroupWithContexCall
51
57
}
52
58
defaultEC2Filters := []ec2types.Filter {
53
59
{
@@ -110,7 +116,8 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
110
116
},
111
117
},
112
118
},
113
- ingResources : []* networking.Ingress {ing , ing1 },
119
+ ingResources : []* networking.Ingress {ing , ing1 },
120
+ clusterTagPrefixKey : defaultClusterTagPrefixKey ,
114
121
},
115
122
want : "sg-autogen" ,
116
123
},
@@ -152,7 +159,9 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
152
159
},
153
160
},
154
161
},
155
- ingResources : []* networking.Ingress {ing , ing1 },
162
+ ingResources : []* networking.Ingress {ing , ing1 },
163
+ clusterTagPrefixKey : defaultClusterTagPrefixKey ,
164
+ backendSGNamePrefix : defaultBackendSGNamePrefix ,
156
165
},
157
166
want : "sg-newauto" ,
158
167
},
@@ -206,6 +215,8 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
206
215
},
207
216
},
208
217
},
218
+ clusterTagPrefixKey : defaultClusterTagPrefixKey ,
219
+ backendSGNamePrefix : defaultBackendSGNamePrefix ,
209
220
defaultTags : map [string ]string {
210
221
"zzzKey" : "value" ,
211
222
"KubernetesCluster" : defaultClusterName ,
@@ -226,7 +237,9 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
226
237
err : & smithy.GenericAPIError {Code : "Some.Other.Error" , Message : "describe security group as list error" },
227
238
},
228
239
},
229
- ingResources : []* networking.Ingress {ing },
240
+ ingResources : []* networking.Ingress {ing },
241
+ clusterTagPrefixKey : defaultClusterTagPrefixKey ,
242
+ backendSGNamePrefix : defaultBackendSGNamePrefix ,
230
243
},
231
244
wantErr : errors .New ("api error Some.Other.Error: describe security group as list error" ),
232
245
},
@@ -266,7 +279,9 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
266
279
err : & smithy.GenericAPIError {Code : "Create.Error" , Message : "unable to create security group" },
267
280
},
268
281
},
269
- ingResources : []* networking.Ingress {ing1 },
282
+ ingResources : []* networking.Ingress {ing1 },
283
+ clusterTagPrefixKey : defaultClusterTagPrefixKey ,
284
+ backendSGNamePrefix : defaultBackendSGNamePrefix ,
270
285
},
271
286
wantErr : errors .New ("api error Create.Error: unable to create security group" ),
272
287
},
@@ -285,7 +300,7 @@ func Test_defaultBackendSGProvider_Get(t *testing.T) {
285
300
}
286
301
k8sClient := mock_client .NewMockClient (ctrl )
287
302
sgProvider := NewBackendSGProvider (defaultClusterName , tt .fields .backendSG ,
288
- defaultVPCID , ec2Client , k8sClient , tt .fields .defaultTags , logr .New (& log.NullLogSink {}))
303
+ defaultVPCID , ec2Client , k8sClient , tt .fields .clusterTagPrefixKey , tt . fields . backendSGNamePrefix , tt . fields . defaultTags , logr .New (& log.NullLogSink {}))
289
304
290
305
resourceType := ResourceTypeIngress
291
306
var activeResources []types.NamespacedName
@@ -329,6 +344,8 @@ func Test_defaultBackendSGProvider_Release(t *testing.T) {
329
344
type fields struct {
330
345
autogenSG string
331
346
backendSG string
347
+ clusterTagPrefixKey string
348
+ backendSGNamePrefix string
332
349
defaultTags map [string ]string
333
350
listIngressCalls []listIngressCall
334
351
deleteSGCalls []deleteSecurityGroupWithContextCall
@@ -732,7 +749,7 @@ func Test_defaultBackendSGProvider_Release(t *testing.T) {
732
749
ec2Client := services .NewMockEC2 (ctrl )
733
750
k8sClient := mock_client .NewMockClient (ctrl )
734
751
sgProvider := NewBackendSGProvider (defaultClusterName , tt .fields .backendSG ,
735
- defaultVPCID , ec2Client , k8sClient , tt .fields .defaultTags , logr .New (& log.NullLogSink {}))
752
+ defaultVPCID , ec2Client , k8sClient , tt .fields .clusterTagPrefixKey , tt . fields . backendSGNamePrefix , tt . fields . defaultTags , logr .New (& log.NullLogSink {}))
736
753
if len (tt .fields .autogenSG ) > 0 {
737
754
sgProvider .backendSG = ""
738
755
sgProvider .autoGeneratedSG = tt .fields .autogenSG
0 commit comments