Skip to content

Commit 35757f2

Browse files
pmalekrainest
pmalek
authored and
rainest
committed
chore(deps): bump dependencies versions in go.mod (#4454)
1 parent 2bdb057 commit 35757f2

File tree

14 files changed

+58
-95
lines changed

14 files changed

+58
-95
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ require (
174174
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
175175
go.uber.org/multierr v1.11.0 // indirect
176176
golang.org/x/crypto v0.12.0 // indirect
177-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
178-
golang.org/x/mod v0.10.0 // indirect
177+
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
178+
golang.org/x/mod v0.12.0 // indirect
179179
golang.org/x/oauth2 v0.11.0 // indirect
180180
golang.org/x/sync v0.3.0
181181
golang.org/x/sys v0.11.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,16 +455,16 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4
455455
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
456456
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
457457
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
458-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
459-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
458+
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
459+
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
460460
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
461461
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
462462
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
463463
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
464464
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
465465
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
466-
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
467-
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
466+
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
467+
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
468468
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
469469
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
470470
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

‎internal/dataplane/parser/parser_test.go‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,8 @@ func TestSecretConfigurationPlugin(t *testing.T) {
311311
Services: []*corev1.Service{
312312
{
313313
ObjectMeta: metav1.ObjectMeta{
314-
Name: "foo-svc",
315-
Namespace: "default",
316-
Annotations: map[string]string{},
314+
Name: "foo-svc",
315+
Namespace: "default",
317316
},
318317
},
319318
},
@@ -3802,9 +3801,8 @@ func TestPluginAnnotations(t *testing.T) {
38023801
services := []*corev1.Service{
38033802
{
38043803
ObjectMeta: metav1.ObjectMeta{
3805-
Name: "foo-svc",
3806-
Namespace: "default",
3807-
Annotations: map[string]string{},
3804+
Name: "foo-svc",
3805+
Namespace: "default",
38083806
},
38093807
},
38103808
}
@@ -3901,9 +3899,8 @@ func TestPluginAnnotations(t *testing.T) {
39013899
services := []*corev1.Service{
39023900
{
39033901
ObjectMeta: metav1.ObjectMeta{
3904-
Name: "foo-svc",
3905-
Namespace: "default",
3906-
Annotations: map[string]string{},
3902+
Name: "foo-svc",
3903+
Namespace: "default",
39073904
},
39083905
},
39093906
}
@@ -3991,9 +3988,8 @@ func TestPluginAnnotations(t *testing.T) {
39913988
services := []*corev1.Service{
39923989
{
39933990
ObjectMeta: metav1.ObjectMeta{
3994-
Name: "foo-svc",
3995-
Namespace: "default",
3996-
Annotations: map[string]string{},
3991+
Name: "foo-svc",
3992+
Namespace: "default",
39973993
},
39983994
},
39993995
}

‎internal/dataplane/parser/translate_httproute_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,7 @@ func HTTPMethodPointer(method gatewayv1beta1.HTTPMethod) *gatewayv1beta1.HTTPMet
14751475
}
14761476

14771477
func k8sObjectInfoOfHTTPRoute(route *gatewayv1beta1.HTTPRoute) util.K8sObjectInfo {
1478-
// parsers always provide the annotations map, even if route didn't have any
14791478
anotations := route.Annotations
1480-
if anotations == nil {
1481-
anotations = make(map[string]string)
1482-
}
14831479

14841480
return util.K8sObjectInfo{
14851481
Name: route.Name,

‎internal/dataplane/parser/translate_routes_helpers_test.go‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ func TestGenerateKongRoutesFromRouteRule_TCP(t *testing.T) {
4141
expected: []kongstate.Route{
4242
{
4343
Ingress: util.K8sObjectInfo{
44-
Name: "mytcproute-name",
45-
Namespace: "mynamespace",
46-
Annotations: map[string]string{},
44+
Name: "mytcproute-name",
45+
Namespace: "mynamespace",
4746
},
4847
Route: kong.Route{
4948
Name: lo.ToPtr("tcproute.mynamespace.mytcproute-name.0.0"),
@@ -106,9 +105,8 @@ func TestGenerateKongRoutesFromRouteRule_UDP(t *testing.T) {
106105
expected: []kongstate.Route{
107106
{
108107
Ingress: util.K8sObjectInfo{
109-
Name: "myudproute-name",
110-
Namespace: "mynamespace",
111-
Annotations: map[string]string{},
108+
Name: "myudproute-name",
109+
Namespace: "mynamespace",
112110
},
113111
Route: kong.Route{
114112
Name: lo.ToPtr("udproute.mynamespace.myudproute-name.0.0"),
@@ -169,9 +167,8 @@ func TestGenerateKongRoutesFromRouteRule_TLS(t *testing.T) {
169167
expected: []kongstate.Route{
170168
{
171169
Ingress: util.K8sObjectInfo{
172-
Name: "mytlsroute-name",
173-
Namespace: "mynamespace",
174-
Annotations: map[string]string{},
170+
Name: "mytlsroute-name",
171+
Namespace: "mynamespace",
175172
},
176173
Route: kong.Route{
177174
Name: lo.ToPtr("tlsroute.mynamespace.mytlsroute-name.0.0"),
@@ -203,9 +200,8 @@ func TestGenerateKongRoutesFromRouteRule_TLS(t *testing.T) {
203200
expected: []kongstate.Route{
204201
{
205202
Ingress: util.K8sObjectInfo{
206-
Name: "mytlsroute-name",
207-
Namespace: "mynamespace",
208-
Annotations: map[string]string{},
203+
Name: "mytlsroute-name",
204+
Namespace: "mynamespace",
209205
},
210206
Route: kong.Route{
211207
Name: lo.ToPtr("tlsroute.mynamespace.mytlsroute-name.0.0"),

‎internal/dataplane/parser/translate_utils_test.go‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ func TestGetPermittedForReferenceGrantFrom(t *testing.T) {
182182
grants := []*gatewayv1beta1.ReferenceGrant{
183183
{
184184
ObjectMeta: metav1.ObjectMeta{
185-
Name: uuid.NewString(),
186-
Annotations: map[string]string{},
187-
Namespace: "fitrat",
185+
Name: uuid.NewString(),
186+
Namespace: "fitrat",
188187
},
189188
Spec: gatewayv1beta1.ReferenceGrantSpec{
190189
From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -214,9 +213,8 @@ func TestGetPermittedForReferenceGrantFrom(t *testing.T) {
214213
},
215214
{
216215
ObjectMeta: metav1.ObjectMeta{
217-
Name: uuid.NewString(),
218-
Annotations: map[string]string{},
219-
Namespace: "cholpon",
216+
Name: uuid.NewString(),
217+
Namespace: "cholpon",
220218
},
221219
Spec: gatewayv1beta1.ReferenceGrantSpec{
222220
From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -332,9 +330,8 @@ func TestGenerateKongServiceFromBackendRef(t *testing.T) {
332330
grants := []*gatewayv1beta1.ReferenceGrant{
333331
{
334332
ObjectMeta: metav1.ObjectMeta{
335-
Name: uuid.NewString(),
336-
Annotations: map[string]string{},
337-
Namespace: "fitrat",
333+
Name: uuid.NewString(),
334+
Namespace: "fitrat",
338335
},
339336
Spec: gatewayv1beta1.ReferenceGrantSpec{
340337
From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -364,9 +361,8 @@ func TestGenerateKongServiceFromBackendRef(t *testing.T) {
364361
},
365362
{
366363
ObjectMeta: metav1.ObjectMeta{
367-
Name: uuid.NewString(),
368-
Annotations: map[string]string{},
369-
Namespace: "cholpon",
364+
Name: uuid.NewString(),
365+
Namespace: "cholpon",
370366
},
371367
Spec: gatewayv1beta1.ReferenceGrantSpec{
372368
From: []gatewayv1beta1.ReferenceGrantFrom{

‎internal/dataplane/parser/translators/grpcroute_atc_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ func TestGenerateKongExpressionRoutesFromGRPCRouteRule(t *testing.T) {
124124
Ingress: util.K8sObjectInfo{
125125
Name: "multiple-matches",
126126
Namespace: "default",
127-
Annotations: map[string]string{},
128127
GroupVersionKind: grpcRouteGVK,
129128
},
130129
ExpressionRoutes: true,
@@ -138,7 +137,6 @@ func TestGenerateKongExpressionRoutesFromGRPCRouteRule(t *testing.T) {
138137
Ingress: util.K8sObjectInfo{
139138
Name: "multiple-matches",
140139
Namespace: "default",
141-
Annotations: map[string]string{},
142140
GroupVersionKind: grpcRouteGVK,
143141
},
144142
ExpressionRoutes: true,

‎internal/dataplane/parser/translators/grpcroute_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ func TestGenerateKongRoutesFromGRPCRouteRule(t *testing.T) {
165165
Ingress: util.K8sObjectInfo{
166166
Name: "multiple-matches",
167167
Namespace: "default",
168-
Annotations: map[string]string{},
169168
GroupVersionKind: grpcRouteGVK,
170169
},
171170
Route: kong.Route{
@@ -182,7 +181,6 @@ func TestGenerateKongRoutesFromGRPCRouteRule(t *testing.T) {
182181
Ingress: util.K8sObjectInfo{
183182
Name: "multiple-matches",
184183
Namespace: "default",
185-
Annotations: map[string]string{},
186184
GroupVersionKind: grpcRouteGVK,
187185
},
188186
Route: kong.Route{

‎internal/util/objectmeta_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ func TestFromK8sObject(t *testing.T) {
2424
},
2525
},
2626
want: K8sObjectInfo{
27-
Name: "name",
28-
Namespace: "namespace",
29-
Annotations: map[string]string{},
27+
Name: "name",
28+
Namespace: "namespace",
3029
},
3130
},
3231
{

‎test/integration/tcproute_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ func TestTCPRouteEssentials(t *testing.T) {
133133
tcpPortDefault := gatewayv1alpha2.PortNumber(ktfkong.DefaultTCPServicePort)
134134
tcpRoute := &gatewayv1alpha2.TCPRoute{
135135
ObjectMeta: metav1.ObjectMeta{
136-
Name: uuid.NewString(),
137-
Annotations: map[string]string{},
136+
Name: uuid.NewString(),
138137
},
139138
Spec: gatewayv1alpha2.TCPRouteSpec{
140139
CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -515,8 +514,7 @@ func TestTCPRouteReferenceGrant(t *testing.T) {
515514
remoteNamespace := gatewayv1alpha2.Namespace(otherNs.Name)
516515
tcproute := &gatewayv1alpha2.TCPRoute{
517516
ObjectMeta: metav1.ObjectMeta{
518-
Name: uuid.NewString(),
519-
Annotations: map[string]string{},
517+
Name: uuid.NewString(),
520518
},
521519
Spec: gatewayv1alpha2.TCPRouteSpec{
522520
CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -560,8 +558,7 @@ func TestTCPRouteReferenceGrant(t *testing.T) {
560558
t.Logf("creating a ReferenceGrant that permits tcproute access from %s to services in %s", ns.Name, otherNs.Name)
561559
grant := &gatewayv1beta1.ReferenceGrant{
562560
ObjectMeta: metav1.ObjectMeta{
563-
Name: uuid.NewString(),
564-
Annotations: map[string]string{},
561+
Name: uuid.NewString(),
565562
},
566563
Spec: gatewayv1beta1.ReferenceGrantSpec{
567564
From: []gatewayv1beta1.ReferenceGrantFrom{

0 commit comments

Comments
 (0)